sr-dev

sr-dev@lists.kamailio.org

12 participants
44184 discussions

git:master: generate README for bdb module

by Henning Westerholt

Module: sip-router Branch: master Commit: c90d02e608c048a3bbcf263daadb024c829bded2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c90d02e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 30 18:54:26 2009 +0200 generate README for bdb module --- modules_s/bdb/README | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 199 insertions(+), 0 deletions(-) diff --git a/modules_s/bdb/README b/modules_s/bdb/README new file mode 100644 index 0000000..4817972 --- /dev/null +++ b/modules_s/bdb/README @@ -0,0 +1,199 @@ +1. BDB Module + + Sippy Software, Inc. + + Copyright � 2006 Sippy Software, Inc. + Revision History + Revision $Revision$ $Date$ + __________________________________________________________________ + + 1.1. Overview + + 1.1.1. Design of DBD Engine + + 1.2. Dependencies + + 1.2.1. External libraries or applications + + 1.3. Exported parameters + + 1.3.1. describe_table (string) + + 1.4. Constrains and limitations + 1.5. Installation and running + + 1.5.1. Using BDB With Basic SER Configuration + +1.1. Overview + + The SER (SIP Express Router) supports several different persistent + storage backends (flatfile, dbtext and several SQL servers). However, + in certain cases those existing backends don't satisfy conditions. + Particularly, SQL server-based backends typically provide good + performance and scalability, but at the same time require considerable + efforts to configure and manage and also have significant memory and + on-disk footprint, while simpler storage backends (flatfile, dbtext) + are lighter and simpler to setup and manage, but scale poorly and don't + provide sufficient performance. For certain types of applications (i.e. + embedded SIP applications, SIP load balancing farms etc), different + solution that would combine some of the non-overlapping properties of + those two existing classes of backends is necessary. + + Berkeley DB is widely regarded as industry-leading open source, + embeddable database engine that provides developers with fast, + reliable, local persistence with almost zero administration. + +1.1.1. Design of DBD Engine + + The dbtext database system architecture: + * A database is represented by a directory in the local file system + where BDB environment is located. + +Note + When using BDB driver in SER, the database URL for modules must be + the path to the directory where the BDB environment is located, + prefixed by "bdb://", e.g., "bdb:///var/db/ser". If there is no "/" + after "bdb://" then "CFG_DIR/" (the OS-specific path defined at + SER's compile time) is inserted at the beginning of the database + path automatically. So that, either an absolute path to database + directory, or one relative to "CFG_DIR" directory should be + provided in the URL. + * The individual tables internaly are represented by binary files + inside environment directory. + +Note + The BDB driver uses BTree access method. + On-disk storage format has been developed to be as simple as + possible, while meeting performance requirements set forth above. + It is not compatible with on-disk format of any other BDB-based DB + engine (e.g. MySQL's BDB table handler). + +1.2. Dependencies + +1.2.1. External libraries or applications + + The next libraries or applications must be installed before running SER + with this module: + * Berkeley DB 4.X + +1.3. Exported parameters + +1.3.1. describe_table (string) + + Define the table and its structure. Each table that will be used by + other modules has to be defined. The format of the parameter is: + table_name:column_name_1(column_type_1)[column_name_2(column_type_2)[.. + . column_name_N(column_type_N)]] + + The names of table and columns must not include white spaces. + + The first column in definition is used as index. + + Between name of table and name of first column must be ":". + + Between two columns definitions must be exactly one white space. + + Type of column has to be enclosed into parentheses. + + Supported column types are: + * int + * float + * double + * string + * str + * datetime + * blob + * bitmap + +1.4. Constrains and limitations + + Use of indexes: + * Effective SELECT, UPDATE and DELETE operations on a structured + storage that contains any more or less decent number of records are + impossible without using some kind of indexing scheme. Since + Berkley DB is relatively simple storage engine it provides only + basic support for indexing, nearly not as rich as usually expected + by an average SQL user. Therefore, it has been decided to limit + number of indexes supported to one per table. This is sufficient + for most of the uses in the SER (for example: usrloc, auth_db etc). + * SELECT/UPDATE/DELETE records matching criteria. Due to its + simplicity, Berkley DB only supports exact match on indexed field. + In order to support <, >, <= and >= operations mandated by the SIP + DB API it is necessary to fall back to sequental scan of the index + values, which obviously has significant negative impact on + performance. Fortunately those advanced records matching criterias + are not required neither by the usrloc module nor by auth_db + module. + * BDB driver uses index only if key column appears in search clause + at least once and records matching operator associated with it is + '='. + * It is not allowed to set index value to NULL or an empty string. + * It is not allowed to update index value. The DELETE followed by + INSERT should be used instead. + + BDB driver does not support db_raw_query() method. + + BDB driver does not support ORDER BY clause of db_query() method. + +1.5. Installation and running + + Compile the module and load it instead of mysql or other DB modules. + + Example 1. Load the bdb module +... +loadmodule "/path/to/ser/modules/dbb.so" +... +modparam("module_name", "db_url", "bdb:///path/to/bdb/database") +... + + Example 2. definition of the standard version table +... +modparam("bdb", "describe_table", "version:table_name(str) table_version(int)") +... + +1.5.1. Using BDB With Basic SER Configuration + + Here are the definitions for tables used by usrloc module as well as a + part of basic configuration file to use BDB driver with SER. The table + structures may change in future releases, so that some adjustment to + example below may be necessary. That example corresponds to SER v0.9.4 + + According to the configuration file below, the table files will be + placed in the //var/db/ser/ directory. + + The table version should be populated manually before the SER is + started. To do this version.dump file located in the directotry of BDB + driver sources and db_load utility from Berkeley BD distribution should + be used as follows: + + Example 3. Population of version table +$ db_load -h /var/db/ser -f version.dump version + + Example 4. Configuration file +# ---------- global configuration parameters ------------------------ + +# [skip] + +# ---------- module loading ----------------------------------------- + +loadmodule "/usr/local/lib/ser/modules/usrloc.so" +loadmodule "/usr/local/lib/ser/modules/bdb.so" + +# ---------- module-specific configuration parameteres -------------- + +modparam("usrloc", "db_mode", 2) +modparam("usrloc", "timer_interval", 3) +modparam("usrloc", "db_url", "bdb:///var/db/ser") + +modparam("bdb", "describe_table", "version:table_name(str) table_version(int)") + +modparam("bdb", "describe_table", "location:username(str) domain(str) contact(st +r) i_env(int) expires(datetime) q(double) callid(str) cseq(int) method(str) flag +s(int) user_agent(str) received(str)") +modparam("bdb", "describe_table", "aliases:username(str) domain(str) contact(str +) i_env(int) expires(datetime) q(double) callid(str) cseq(int) method(str) flags +(int) user_agent(str) received(str)") + +# ---------- request routing logic ---------------------------------- + +# [skip]

15 years, 8 months

git:master: core expr eval: fix script functions failure check

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f8a33b329085731db4a00aead676f044cd27b939 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8a33b3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 4 10:41:07 2009 +0200 core expr eval: fix script functions failure check script/module functions integer/boolean evaluation did not respect the module return convention (>0 success, <0 failure). Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- rvalue.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rvalue.c b/rvalue.c index 897fb4d..f75c6e9 100644 --- a/rvalue.c +++ b/rvalue.c @@ -693,8 +693,8 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - *i=run_actions(h, rv->v.action, msg); - else + *i=(run_actions(h, rv->v.action, msg)>0); + else *i=0; break; case RV_SEL: @@ -796,8 +796,8 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - i=run_actions(h, rv->v.action, msg); - else + i=(run_actions(h, rv->v.action, msg)>0); + else i=0; tmpv->s=int2str(i, &tmpv->len); break;

15 years, 8 months

git:master: tm: which cancel exported via TM API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d8d0b92dfed5e41b8952325da1509d91bfa611cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8d0b92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 15:18:21 2009 +0200 tm: which cancel exported via TM API --- modules/tm/t_cancel.h | 1 + modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 2ae96f2..d3ff20a 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -84,6 +84,7 @@ typedef int(*cancel_uacs_f)( struct cell *t, branch_bm_t cancel_bm, int flags ); typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); +typedef void (*which_cancel_f)(struct cell *t, branch_bm_t *cancel_bm ); /* diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 13b9f23..22e1782 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -234,6 +234,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_lookup_request = t_lookup_request; tmb->t_check = t_check; tmb->unref_cell = unref_cell; + tmb->which_cancel = which_cancel; #ifdef WITH_TM_CTX tmb->tm_ctx_get = tm_ctx_get; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 22e7201..54c0b9a 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -141,6 +141,7 @@ struct tm_binds { tlookup_request_f t_lookup_request; tcheck_f t_check; unref_cell_f unref_cell; + which_cancel_f which_cancel; #ifdef WITH_TM_CTX tm_ctx_get_f tm_ctx_get; #else

15 years, 8 months

git:master: tmx: added t_cancel_branches()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a6c25ed122ea00542af390a7b9222700c7846a14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6c25ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 15:19:25 2009 +0200 tmx: added t_cancel_branches() --- modules_k/tmx/tmx_mod.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index ddcd45c..711e966 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -44,6 +44,9 @@ struct tm_binds _tmx_tmb; static int mod_init(void); void destroy(void); +static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2); +static int fixup_cancel_branches(void** param, int param_no); + /* statistic variables */ stat_var *tm_rcv_rpls; stat_var *tm_rld_rpls; @@ -101,6 +104,8 @@ static mi_export_t mi_cmds [] = { static cmd_export_t cmds[]={ + {"t_cancel_branches", (cmd_function)t_cancel_branches, 1, + fixup_cancel_branches, 0, ONREPLY_ROUTE }, {0,0,0,0,0,0} }; @@ -163,4 +168,70 @@ void destroy(void) return; } +static int fixup_cancel_branches(void** param, int param_no) +{ + char *val; + int n = 0; + + if (param_no==1) { + val = (char*)*param; + if (strcasecmp(val,"all")==0) { + n = 0; + } else if (strcasecmp(val,"others")==0) { + n = 1; + } else if (strcasecmp(val,"this")==0) { + n = 2; + } else { + LM_ERR("invalid param \"%s\"\n", val); + return E_CFG; + } + pkg_free(*param); + *param=(void*)(long)n; + } else { + LM_ERR("called with parameter != 1\n"); + return E_BUG; + } + return 0; +} + +static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) +{ + branch_bm_t cb = 0; + struct cell *t = 0; + tm_ctx_t *tcx = 0; + int n=0; + int idx = 0; + t=_tmx_tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED || !is_invite(t)) + return -1; + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx != NULL) + idx = tcx->branch_index; + n = (int)k; + switch(n) { + case 1: + LOCK_REPLIES(t); + _tmx_tmb.which_cancel(t, &cb); + if(t->uac[idx].local_cancel.buffer==BUSY_BUFFER) + t->uac[idx].local_cancel.buffer=NULL; + UNLOCK_REPLIES(t); + cb &= ~(1<<idx); + case 2: + if(msg->first_line.u.reply.statuscode>=200) + break; + cb = 1<<idx; + break; + default: + LOCK_REPLIES(t); + _tmx_tmb.which_cancel(t, &cb); + UNLOCK_REPLIES(t); + if (msg->first_line.u.reply.statuscode>=200) + cb &= ~(1<<idx); + } + LM_DBG("canceling %d/%d\n", n, (int)cb); + if(cb==0) + return -1; + _tmx_tmb.cancel_uacs(t, cb, 0); + return 1; +}

15 years, 8 months

git:master: pv: doc updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 941c2ca3e031a1ad100ed92ce4e7447c0dfe3ea1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=941c2ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 14:47:21 2009 +0200 pv: doc updated --- modules_k/pv/README | 31 +++++++++++++++++++++++-------- modules_k/pv/doc/pv_admin.xml | 19 +++++++++++++++++++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/modules_k/pv/README b/modules_k/pv/README index 9c6ef99..6b9b892 100644 --- a/modules_k/pv/README +++ b/modules_k/pv/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. shvset (string) 3.2. varset (string) + 3.3. avp_aliases (string) 4. Exported Functions @@ -43,10 +44,11 @@ Daniel-Constantin Mierla 1.1. shvset parameter usage 1.2. varset parameter usage - 1.3. pv_isset usage - 1.4. pv_unset usage - 1.5. shv_set usage - 1.6. shv_get usage + 1.3. avp_aliases parameter usage + 1.4. pv_isset usage + 1.5. pv_unset usage + 1.6. shv_set usage + 1.7. shv_get usage Chapter 1. Admin Guide @@ -62,6 +64,7 @@ Chapter 1. Admin Guide 3.1. shvset (string) 3.2. varset (string) + 3.3. avp_aliases (string) 4. Exported Functions @@ -99,6 +102,7 @@ Chapter 1. Admin Guide 3.1. shvset (string) 3.2. varset (string) + 3.3. avp_aliases (string) 3.1. shvset (string) @@ -142,6 +146,17 @@ modparam("pv", "varset", "init=i:1") modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") ... +3.3. avp_aliases (string) + + Define aliases for PV AVP names. + + Default value is NULL. + + Example 1.3. avp_aliases parameter usage +... +modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") +... + 4. Exported Functions 4.1. pv_isset(pvar) @@ -156,7 +171,7 @@ modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") This function can be used from ANY_ROUTE. - Example 1.3. pv_isset usage + Example 1.4. pv_isset usage ... if(pv_isset("$avp("s:x")")) { @@ -173,7 +188,7 @@ if(pv_isset("$avp("s:x")")) This function can be used from ANY_ROUTE. - Example 1.4. pv_unset usage + Example 1.5. pv_unset usage ... pv_unset("$avp("s:x")"); ... @@ -201,7 +216,7 @@ pv_unset("$avp("s:x")"); _value_ _empty_line_ - Example 1.5. shv_set usage + Example 1.6. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... @@ -219,7 +234,7 @@ $ kamctl fifo shv_set debug int 0 _name_ _empty_line_ - Example 1.6. shv_get usage + Example 1.7. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get diff --git a/modules_k/pv/doc/pv_admin.xml b/modules_k/pv/doc/pv_admin.xml index f8b50ad..f6d42cf 100644 --- a/modules_k/pv/doc/pv_admin.xml +++ b/modules_k/pv/doc/pv_admin.xml @@ -124,6 +124,25 @@ modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") </programlisting> </example> </section> + <section> + <title><varname>avp_aliases</varname> (string)</title> + <para> + Define aliases for PV AVP names. + </para> + <para> + <emphasis> + Default value is NULL. + </emphasis> + </para> + <example> + <title><varname>avp_aliases</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") +... + </programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title>

15 years, 8 months

git:master: pv: avp_aliases parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4fd57899f54333e729c41fae9187142bf25a7fac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fd5789… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 13:42:56 2009 +0200 pv: avp_aliases parameter - avp_aliases parameter from K core - pv module is the only one exporting $avp(...) PV, so without it this parameter makes no sense --- modules_k/pv/pv.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 9d7078a..596b618 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -359,9 +359,12 @@ static pv_export_t mod_pvs[] = { { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; +static int add_avp_aliases(modparam_t type, void* val); + static param_export_t params[]={ {"shvset", STR_PARAM|USE_FUNC_PARAM, (void*)param_set_shvar }, {"varset", STR_PARAM|USE_FUNC_PARAM, (void*)param_set_var }, + {"avp_aliases", STR_PARAM|USE_FUNC_PARAM, (void*)add_avp_aliases }, {0,0,0} }; @@ -455,3 +458,14 @@ static int pv_unset(struct sip_msg* msg, char* pvid, char *foo) return 1; } +static int add_avp_aliases(modparam_t type, void* val) +{ + if (val!=0 && ((char*)val)[0]!=0) + { + if ( add_avp_galias_str((char*)val)!=0 ) + return -1; + } + + return 0; +} +

15 years, 8 months

git:master: core: auto_aliases to control rev DNS aliases

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bb4cd6b04928615d02ec9b1c6f8c64a157e1fe3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb4cd6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 3 13:04:49 2009 +0200 core: auto_aliases to control rev DNS aliases - parameter takes boolean value - if set, rev dns results are added to aliases list - default is set --- cfg.lex | 3 +++ cfg.y | 3 +++ globals.h | 1 + main.c | 2 ++ socket_info.c | 9 +++++---- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cfg.lex b/cfg.lex index b1f9c55..21d30b9 100644 --- a/cfg.lex +++ b/cfg.lex @@ -273,6 +273,7 @@ LOGSTDERROR log_stderror LOGFACILITY log_facility LISTEN listen ALIAS alias +SR_AUTO_ALIASES auto_aliases DNS dns REV_DNS rev_dns DNS_TRY_IPV6 dns_try_ipv6 @@ -550,6 +551,8 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{LOGFACILITY} { yylval.strval=yytext; return LOGFACILITY; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ALIAS} { count(); yylval.strval=yytext; return ALIAS; } +<INITIAL>{SR_AUTO_ALIASES} { count(); yylval.strval=yytext; + return SR_AUTO_ALIASES; } <INITIAL>{DNS} { count(); yylval.strval=yytext; return DNS; } <INITIAL>{REV_DNS} { count(); yylval.strval=yytext; return REV_DNS; } <INITIAL>{DNS_TRY_IPV6} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index a281052..622e880 100644 --- a/cfg.y +++ b/cfg.y @@ -333,6 +333,7 @@ static int case_check_default(struct case_stms* stms); %token LOGFACILITY %token LISTEN %token ALIAS +%token SR_AUTO_ALIASES %token DNS %token REV_DNS %token DNS_TRY_IPV6 @@ -1272,6 +1273,8 @@ assign_stm: free_socket_id_lst($3); } | ALIAS EQUAL error { yyerror(" hostname expected"); } + | SR_AUTO_ALIASES EQUAL NUMBER { sr_auto_aliases=$3; } + | SR_AUTO_ALIASES EQUAL error { yyerror("boolean value expected"); } | ADVERTISED_ADDRESS EQUAL listen_id { default_global_address.s=$3; default_global_address.len=strlen($3); diff --git a/globals.h b/globals.h index 734c370..f7ef9f8 100644 --- a/globals.h +++ b/globals.h @@ -117,6 +117,7 @@ extern int sock_gid; extern int sock_mode; extern char* chroot_dir; extern char* working_dir; +extern int sr_auto_aliases; #ifdef USE_MCAST extern int mcast_loopback; diff --git a/main.c b/main.c index 4f0169b..4d7fd1f 100644 --- a/main.c +++ b/main.c @@ -348,6 +348,8 @@ int mhomed=0; /* use dns and/or rdns or to see if we need to add a ;received=x.x.x.x to via: */ int received_dns = 0; +/* add or not the rev dns names to aliases list */ +int sr_auto_aliases=1; char* working_dir = 0; char* chroot_dir = 0; char* user=0; diff --git a/socket_info.c b/socket_info.c index 8fa909b..ac2c82f 100644 --- a/socket_info.c +++ b/socket_info.c @@ -822,7 +822,8 @@ static int fix_hostname(str* name, struct ip_addr* address, str* address_str, } /* check if we got the official name */ if (strcasecmp(he->h_name, name->s)!=0){ - if (add_alias(name->s, name->len, s->port_no, s->proto)<0){ + if (sr_auto_aliases && + add_alias(name->s, name->len, s->port_no, s->proto)<0){ LOG(L_ERR, "ERROR: fix_hostname: add_alias failed\n"); } /* change the official name */ @@ -836,9 +837,9 @@ static int fix_hostname(str* name, struct ip_addr* address, str* address_str, strncpy(name->s, he->h_name, name->len+1); } /* add the aliases*/ - for(h=he->h_aliases; h && *h; h++) + for(h=he->h_aliases; sr_auto_aliases && h && *h; h++) if (add_alias(*h, strlen(*h), s->port_no, s->proto)<0){ - LOG(L_ERR, "ERROR: fix_hostname: add_alias failed\n"); + LOG(L_ERR, "ERROR: fix_hostname: add_alias failed\n"); } hostent2ip_addr(address, he, 0); /*convert to ip_addr format*/ if (type_flags){ @@ -853,7 +854,7 @@ static int fix_hostname(str* name, struct ip_addr* address, str* address_str, strncpy(address_str->s, tmp, strlen(tmp)+1); /* set is_ip (1 if name is an ip address, 0 otherwise) */ address_str->len=strlen(tmp); - if ((address_str->len==name->len) && + if (sr_auto_aliases && (address_str->len==name->len) && (strncasecmp(address_str->s, name->s, address_str->len)==0)){ *flags|=SI_IS_IP; /* do rev. DNS on it (for aliases)*/

15 years, 8 months

git:master: presence_xml: link to kmi lib

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5ace95bfa7746c6b78627adc44bec87beec91c61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ace95b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 1 23:23:51 2009 +0200 presence_xml: link to kmi lib --- modules_k/presence_xml/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_xml/Makefile b/modules_k/presence_xml/Makefile index 9ae2c1b..451811d 100644 --- a/modules_k/presence_xml/Makefile +++ b/modules_k/presence_xml/Makefile @@ -18,4 +18,5 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kmi/kmi include ../../Makefile.modules

15 years, 8 months

git:master: tm: define tm_ctx_get() to NULL if no WITH_TM_CTX

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c40ade61c41e33db7e7038a255a9561b60cd1693 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c40ade6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 1 14:01:26 2009 +0200 tm: define tm_ctx_get() to NULL if no WITH_TM_CTX --- modules/tm/t_lookup.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index 070add5..a9a98e6 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -141,7 +141,7 @@ void tm_ctx_set_branch_index(int v); #else -#define tm_ctx_get() +#define tm_ctx_get() NULL #define tm_ctx_init() #define tm_ctx_set_branch_index(v)

15 years, 8 months

git:master: tm: added tm_ctx to collect K extension requirements

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ded63f919ba33f6ddc6c4170166e247bd52cf96a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ded63f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 1 13:40:33 2009 +0200 tm: added tm_ctx to collect K extension requirements - it holds now branch index value used by $T_branch_index - added function in TM API to access tm_ctx --- modules/tm/t_fwd.c | 3 ++- modules/tm/t_lookup.c | 21 +++++++++++++++++++++ modules/tm/t_lookup.h | 24 ++++++++++++++++++++++++ modules/tm/t_reply.c | 2 ++ modules/tm/tm_load.c | 4 ++++ modules/tm/tm_load.h | 5 +++++ 6 files changed, 58 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 46ddbfb..97b36c2 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -190,10 +190,11 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, if (unlikely(branch_route)) { /* run branch_route actions if provided */ set_route_type(BRANCH_ROUTE); - + tm_ctx_set_branch_index(branch+1); if (run_top_route(branch_rt.rlist[branch_route], i_req) < 0) { LOG(L_ERR, "ERROR: print_uac_request: Error in run_top_route\n"); } + tm_ctx_set_branch_index(0); } /* run the specific callbacks for this transaction */ diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index 8f59e8a..c8e1c9d 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1869,3 +1869,24 @@ int t_reset_max_lifetime() return 1; } +#ifdef WITH_TM_CTX + +tm_ctx_t _tm_ctx; + +tm_ctx_t* tm_ctx_get(void) +{ + return &_tm_ctx; +} + +void tm_ctx_init(void) +{ + memset(&_tm_ctx, 0, sizeof(tm_ctx_t)); +} + +void tm_ctx_set_branch_index(int v) +{ + _tm_ctx.branch_index = v; +} + +#endif + diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index cb21048..070add5 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -123,4 +123,28 @@ typedef int (*t_get_canceled_ident_f)(struct sip_msg *msg, unsigned int *hash_index, unsigned int *label); #endif /* WITH_AS_SUPPORT */ +/** + * required by TMX (K/O extensions) + */ +#define WITH_TM_CTX +#ifdef WITH_TM_CTX + +typedef struct _tm_ctx { + int branch_index; +} tm_ctx_t; + +typedef tm_ctx_t* (*tm_ctx_get_f)(void); + +tm_ctx_t* tm_ctx_get(void); +void tm_ctx_init(void); +void tm_ctx_set_branch_index(int v); + +#else + +#define tm_ctx_get() +#define tm_ctx_init() +#define tm_ctx_set_branch_index(v) + +#endif /* WITH_TM_CTX */ + #endif diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index e51142c..848cebb 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1833,6 +1833,7 @@ int reply_received( struct sip_msg *p_msg ) if ( (t==0)||(t==T_UNDEFINED)) goto trans_not_found; + tm_ctx_set_branch_index(branch); cancel_bitmap=0; msg_status=p_msg->REPLY_STATUS; @@ -2070,6 +2071,7 @@ int reply_received( struct sip_msg *p_msg ) } /* provisional replies */ done: + tm_ctx_set_branch_index(0); /* we are done with the transaction, so unref it - the reference * was incremented by t_check() function -bogdan*/ t_unref(p_msg); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 6f8bba5..afb5e30 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -233,5 +233,9 @@ int load_tm( struct tm_binds *tmb) tmb->generate_fromtag = generate_fromtag; tmb->t_lookup_request = t_lookup_request; tmb->t_check = t_check; + +#ifdef WITH_TM_CTX + tmb->tm_ctx_get = tm_ctx_get; +#endif return 1; } diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index e3640b7..ec84143 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -140,6 +140,11 @@ struct tm_binds { generate_fromtag_f generate_fromtag; tlookup_request_f t_lookup_request; tcheck_f t_check; +#ifdef WITH_TM_CTX + tm_ctx_get_f tm_ctx_get; +#else + void* reserved5; +#endif }; extern int tm_init;

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev