sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
249 discussions

git:master:8e955bad: dmq: check for duplicate nodes when multi_notify enabled
by Charles Chance 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 8e955bad80bbc8d05ed71dca00f51dbad684f1ae URL: https://github.com/kamailio/kamailio/commit/8e955bad80bbc8d05ed71dca00f51db… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-04-21T22:22:58+01:00 dmq: check for duplicate nodes when multi_notify enabled - also avoids adding self if we are one of the resolved IPs --- Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/8e955bad80bbc8d05ed71dca00f51db… Patch: https://github.com/kamailio/kamailio/commit/8e955bad80bbc8d05ed71dca00f51db… --- diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 416b6e1..3abefde 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -315,9 +315,11 @@ dmq_node_t* add_server_and_notify(str *paddr) for (index = 0; index < host_cnt; index++) { pstr->s = puri_list [index]; pstr->len = strlen (puri_list [index]); - pnode = add_dmq_node (node_list, pstr); - if (pnode && !pfirst) - { pfirst = pnode; } + if (!find_dmq_node_uri(node_list, pstr)) { // check for duplicates + pnode = add_dmq_node (node_list, pstr); + if (pnode && !pfirst) + { pfirst = pnode; } + } } }

1 0

git:master:8ac3d00f: dmq: regenerate readme
by Charles Chance 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 8ac3d00f64f9bcd011be3ce088010d9f6e18cd1f URL: https://github.com/kamailio/kamailio/commit/8ac3d00f64f9bcd011be3ce088010d9… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-04-21T22:22:58+01:00 dmq: regenerate readme --- Modified: modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/8ac3d00f64f9bcd011be3ce088010d9… Patch: https://github.com/kamailio/kamailio/commit/8ac3d00f64f9bcd011be3ce088010d9…

1 0

git:master:c55ec2ba: dmq: resolve multiple IPv4/IPv6 addresses for a single notification address
by Charles Chance 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: c55ec2ba2dcbcfda504339bfd8070b000c9bee52 URL: https://github.com/kamailio/kamailio/commit/c55ec2ba2dcbcfda504339bfd8070b0… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-04-21T22:22:58+01:00 dmq: resolve multiple IPv4/IPv6 addresses for a single notification address - optionally enabled by new parameter "multi_notify" - includes addresses from DNS SRV records, A and AAAA records - patch provided by Robert Boisvert on sr-dev list --- Modified: modules/dmq/dmq.c Modified: modules/dmq/dmq.h Modified: modules/dmq/doc/dmq_admin.xml Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/c55ec2ba2dcbcfda504339bfd8070b0… Patch: https://github.com/kamailio/kamailio/commit/c55ec2ba2dcbcfda504339bfd8070b0…

1 0

git:master:ca1358f2: core: added global parameter run_dir
by Daniel-Constantin Mierla 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: ca1358f21efab04146eaf438daac160cd901f19d URL: https://github.com/kamailio/kamailio/commit/ca1358f21efab04146eaf438daac160… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-21T21:20:10+02:00 core: added global parameter run_dir - to be used to build the path for runtime files (fifo, ctl) --- Modified: cfg.lex Modified: cfg.y Modified: globals.h Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/ca1358f21efab04146eaf438daac160… Patch: https://github.com/kamailio/kamailio/commit/ca1358f21efab04146eaf438daac160… --- diff --git a/cfg.lex b/cfg.lex index de18d62..95edfdb 100644 --- a/cfg.lex +++ b/cfg.lex @@ -417,6 +417,7 @@ USER "user"|"uid" GROUP "group"|"gid" CHROOT "chroot" WDIR "workdir"|"wdir" +RUNDIR "rundir"|"run_dir" MHOMED mhomed DISABLE_TCP "disable_tcp" TCP_CHILDREN "tcp_children" @@ -821,6 +822,7 @@ IMPORTFILE "import_file" <INITIAL>{GROUP} { count(); yylval.strval=yytext; return GROUP; } <INITIAL>{CHROOT} { count(); yylval.strval=yytext; return CHROOT; } <INITIAL>{WDIR} { count(); yylval.strval=yytext; return WDIR; } +<INITIAL>{RUNDIR} { count(); yylval.strval=yytext; return RUNDIR; } <INITIAL>{MHOMED} { count(); yylval.strval=yytext; return MHOMED; } <INITIAL>{DISABLE_TCP} { count(); yylval.strval=yytext; return DISABLE_TCP; } <INITIAL>{TCP_CHILDREN} { count(); yylval.strval=yytext; return TCP_CHILDREN; } diff --git a/cfg.y b/cfg.y index c302d5e..85e69a6 100644 --- a/cfg.y +++ b/cfg.y @@ -468,6 +468,7 @@ extern char *default_routename; %token GROUP %token CHROOT %token WDIR +%token RUNDIR %token MHOMED %token DISABLE_TCP %token TCP_ACCEPT_ALIASES @@ -999,6 +1000,9 @@ assign_stm: | WDIR EQUAL STRING { working_dir=$3; } | WDIR EQUAL ID { working_dir=$3; } | WDIR EQUAL error { yyerror("string value expected"); } + | RUNDIR EQUAL STRING { runtime_dir=$3; } + | RUNDIR EQUAL ID { runtime_dir=$3; } + | RUNDIR EQUAL error { yyerror("string value expected"); } | MHOMED EQUAL NUMBER { mhomed=$3; } | MHOMED EQUAL error { yyerror("boolean value expected"); } | DISABLE_TCP EQUAL NUMBER { diff --git a/globals.h b/globals.h index 03937a2..60ffd25 100644 --- a/globals.h +++ b/globals.h @@ -128,6 +128,7 @@ extern int sock_gid; extern int sock_mode; extern char* chroot_dir; extern char* working_dir; +extern char* runtime_dir; extern int sr_auto_aliases; extern int sr_msg_time; extern str version_table; diff --git a/main.c b/main.c index 8451e97..1ff7f6a 100644 --- a/main.c +++ b/main.c @@ -353,6 +353,7 @@ int received_dns = 0; int sr_auto_aliases=1; char* working_dir = 0; char* chroot_dir = 0; +char* runtime_dir = "" RUN_DIR; char* user=0; char* group=0; int uid = 0;

1 0

git:master:0d4d530e: core: added core parameter dns_cache_rec_pref
by Daniel-Constantin Mierla 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 0d4d530ef0140eac7c85d404257171ae868b30bc URL: https://github.com/kamailio/kamailio/commit/0d4d530ef0140eac7c85d404257171a… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-21T21:08:24+02:00 core: added core parameter dns_cache_rec_pref --- Modified: cfg.lex Modified: cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/0d4d530ef0140eac7c85d404257171a… Patch: https://github.com/kamailio/kamailio/commit/0d4d530ef0140eac7c85d404257171a… --- diff --git a/cfg.lex b/cfg.lex index 3eb79dc..de18d62 100644 --- a/cfg.lex +++ b/cfg.lex @@ -378,6 +378,7 @@ DNS_CACHE_MAX_TTL dns_cache_max_ttl DNS_CACHE_MEM dns_cache_mem DNS_CACHE_GC_INT dns_cache_gc_interval DNS_CACHE_DEL_NONEXP dns_cache_del_nonexp|dns_cache_delete_nonexpired +DNS_CACHE_REC_PREF dns_cache_rec_pref /* ipv6 auto bind */ AUTO_BIND_IPV6 auto_bind_ipv6 /* blacklist */ @@ -778,6 +779,8 @@ IMPORTFILE "import_file" return DNS_CACHE_GC_INT; } <INITIAL>{DNS_CACHE_DEL_NONEXP} { count(); yylval.strval=yytext; return DNS_CACHE_DEL_NONEXP; } +<INITIAL>{DNS_CACHE_REC_PREF} { count(); yylval.strval=yytext; + return DNS_CACHE_REC_PREF; } <INITIAL>{AUTO_BIND_IPV6} { count(); yylval.strval=yytext; return AUTO_BIND_IPV6; } <INITIAL>{DST_BLST_INIT} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index cd3d317..c302d5e 100644 --- a/cfg.y +++ b/cfg.y @@ -425,6 +425,7 @@ extern char *default_routename; %token DNS_CACHE_MEM %token DNS_CACHE_GC_INT %token DNS_CACHE_DEL_NONEXP +%token DNS_CACHE_REC_PREF /* ipv6 auto bind */ %token AUTO_BIND_IPV6 @@ -899,6 +900,8 @@ assign_stm: | DNS_CACHE_GC_INT error { yyerror("boolean value expected"); } | DNS_CACHE_DEL_NONEXP EQUAL NUMBER { IF_DNS_CACHE(default_core_cfg.dns_cache_del_nonexp=$3); } | DNS_CACHE_DEL_NONEXP error { yyerror("boolean value expected"); } + | DNS_CACHE_REC_PREF EQUAL NUMBER { IF_DNS_CACHE(default_core_cfg.dns_cache_rec_pref=$3); } + | DNS_CACHE_REC_PREF error { yyerror("boolean value expected"); } | AUTO_BIND_IPV6 EQUAL NUMBER {IF_AUTO_BIND_IPV6(auto_bind_ipv6 = $3);} | AUTO_BIND_IPV6 error { yyerror("boolean value expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLACKLIST(dst_blacklist_init=$3); }

1 0

[kamailio] ERLANG module (#132)
by Seudin Kasumovic 21 Apr '15

21 Apr '15

This module provides interact with Erlang node. The module allows sending, receiving Erlang messages and RPC calls between each other. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/132 -- Commit Summary -- * ERLANG module -- File Changes -- A modules/erlang/Makefile (18) A modules/erlang/README (762) A modules/erlang/cnode.c (514) A modules/erlang/cnode.h (106) A modules/erlang/doc/Makefile (4) A modules/erlang/doc/erlang.xml (38) A modules/erlang/doc/erlang_admin.xml (622) A modules/erlang/doc/erlang_devel.xml (159) A modules/erlang/doc/erlang_use.xml (95) A modules/erlang/epmd.c (150) A modules/erlang/epmd.h (61) A modules/erlang/erl_api.c (258) A modules/erlang/erl_api.h (92) A modules/erlang/erl_helpers.c (401) A modules/erlang/erl_helpers.h (153) A modules/erlang/handle_emsg.c (783) A modules/erlang/handle_emsg.h (32) A modules/erlang/handle_rpc.c (1484) A modules/erlang/handle_rpc.h (102) A modules/erlang/mod_erlang.c (1067) A modules/erlang/mod_erlang.h (77) A modules/erlang/pv_atom.c (396) A modules/erlang/pv_atom.h (35) A modules/erlang/pv_list.c (392) A modules/erlang/pv_list.h (36) A modules/erlang/pv_tuple.c (393) A modules/erlang/pv_tuple.h (37) A modules/erlang/pv_xbuff.c (1153) A modules/erlang/pv_xbuff.h (100) A modules/erlang/worker.c (356) A modules/erlang/worker.h (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/132.patch https://github.com/kamailio/kamailio/pull/132.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/132

3 5

git:master:69ebc551: usrloc: get_all_db_ucontacts use new field keepalive to filter
by Victor Seva 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 69ebc551a5303c04cc7cf5fee3f1f61308d80902 URL: https://github.com/kamailio/kamailio/commit/69ebc551a5303c04cc7cf5fee3f1f61… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-21T19:51:10+02:00 usrloc: get_all_db_ucontacts use new field keepalive to filter This is WIP: - TODO: use part_idx and part_max --- Modified: modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/69ebc551a5303c04cc7cf5fee3f1f61… Patch: https://github.com/kamailio/kamailio/commit/69ebc551a5303c04cc7cf5fee3f1f61… --- diff --git a/modules/usrloc/dlist.c b/modules/usrloc/dlist.c index ddc9305..76aa6c8 100644 --- a/modules/usrloc/dlist.c +++ b/modules/usrloc/dlist.c @@ -71,12 +71,6 @@ static inline int find_dlist(str* _n, dlist_t** _d) return 1; } -extern int ul_db_raw_fetch_type; - -#define UL_DB_RAW_FETCH_COMMON "select %.*s, %.*s, %.*s, %.*s, %.*s, %.*s from %s where %.*s > %.*s and %.*s & %d = %d and id %% %u = %u" - -#define UL_DB_RAW_FETCH_ORACLE "select %.*s, %.*s, %.*s, %.*s, %.*s, %.*s from %s where %.*s > %.*s and bitand(%.*s, %d) = %d and mod(id, %u) = %u" - /*! * \brief Get all contacts from the database, in partitions if wanted * \see get_all_ucontacts @@ -90,16 +84,13 @@ extern int ul_db_raw_fetch_type; static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, unsigned int part_idx, unsigned int part_max) { - static char query_buf[512]; - static str query_str; - struct socket_info *sock; unsigned int dbflags; db1_res_t* res = NULL; db_row_t *row; dlist_t *dom; + str now; char now_s[25]; - int now_len; int port, proto; char *p; str addr; @@ -111,11 +102,11 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, int i; void *cp; int shortage, needed; - - if(ul_dbf.raw_query==NULL) { - LM_WARN("DB raw query support is required, but not implemented\n"); - return -1; - } + db_key_t keys1[2]; /* where */ + db_val_t vals1[2]; + db_op_t ops[2]; + db_key_t keys2[6]; /* select */ + int n[2] = {1,6}; /* number of dynamic values used on key1/key2 */ cp = buf; shortage = 0; @@ -123,37 +114,48 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, len -= sizeof(addr.len); /* get the current time in DB format */ - now_len = 25; - if (db_time2str( time(0), now_s, &now_len)!=0) { + now.len = 25; + now.s = now_s; + if (db_time2str( time(0), now.s, &now.len)!=0) { LM_ERR("failed to print now time\n"); return -1; } aorhash = 0; + /* select fields */ + keys2[0] = &received_col; + keys2[1] = &contact_col; + keys2[2] = &sock_col; + keys2[3] = &cflags_col; + keys2[4] = &path_col; + keys2[5] = &ruid_col; + + /* where fields */ + keys1[0] = &expires_col; + ops[0] = OP_GT; + vals1[0].type = DB1_STR; + vals1[0].nul = 0; + vals1[0].val.str_val = now; + + if (flags & nat_bflag) { + keys1[n[0]] = &keepalive_col; + ops[n[0]] = OP_EQ; + vals1[n[0]].type = DB1_INT; + vals1[n[0]].nul = 0; + vals1[n[0]].val.int_val = 1; + n[0]++; + } + + /* TODO: use part_idx and part_max on keys1 */ + for (dom = root; dom!=NULL ; dom=dom->next) { - /* build query */ - i = snprintf( query_buf, sizeof(query_buf), - (ul_db_raw_fetch_type==1)? - UL_DB_RAW_FETCH_ORACLE:UL_DB_RAW_FETCH_COMMON, - received_col.len, received_col.s, - contact_col.len, contact_col.s, - sock_col.len, sock_col.s, - cflags_col.len, cflags_col.s, - path_col.len, path_col.s, - ruid_col.len, ruid_col.s, - dom->d->name->s, - expires_col.len, expires_col.s, - now_len, now_s, - cflags_col.len, cflags_col.s, - flags, flags, part_max, part_idx); - if ( i>=sizeof(query_buf) ) { - LM_ERR("DB query too long\n"); + if (ul_dbf.use_table(ul_dbh, dom->d->name) < 0) { + LM_ERR("sql use_table failed\n"); return -1; } - query_str.s = query_buf; - query_str.len = i; - if ( ul_dbf.raw_query( ul_dbh, &query_str, &res)<0 ) { - LM_ERR("raw_query failed\n"); + if (ul_dbf.query(ul_dbh, keys1,ops, vals1, keys2, + n[0], n[1], NULL, &res) <0 ) { + LM_ERR("query error\n"); return -1; } if( RES_ROW_N(res)==0 ) {

1 0

git:master:bc5ac8ca: textopsx: fixed clang compile warning on comparing bool with char
by Daniel-Constantin Mierla 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: bc5ac8caee55f8d197992fb00b4cb098eeb69843 URL: https://github.com/kamailio/kamailio/commit/bc5ac8caee55f8d197992fb00b4cb09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-21T19:10:01+02:00 textopsx: fixed clang compile warning on comparing bool with char --- Modified: modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/bc5ac8caee55f8d197992fb00b4cb09… Patch: https://github.com/kamailio/kamailio/commit/bc5ac8caee55f8d197992fb00b4cb09… --- diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index 7e85013..6e21242 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -863,7 +863,7 @@ static int find_hf_value2_param(struct hname_data* hname, str* param_area, str* while (i<param_area->len && is_space(param_area->s[i])) i++; } else { - while (i<param_area->len && !is_space(param_area->s[i]) && !param_area->s[i]!=',') i++; + while (i<param_area->len && !is_space(param_area->s[i]) && !(param_area->s[i]!=',')) i++; } } lump_del->s = param_area->s + i;

1 0

git:master:23c6328b: Makefile.groups: added group for erlang module
by Daniel-Constantin Mierla 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 23c6328b45115fb59797a15f0923e7f854fa4421 URL: https://github.com/kamailio/kamailio/commit/23c6328b45115fb59797a15f0923e7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-21T19:09:04+02:00 Makefile.groups: added group for erlang module - not compiled by default --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/23c6328b45115fb59797a15f0923e7f… Patch: https://github.com/kamailio/kamailio/commit/23c6328b45115fb59797a15f0923e7f… --- diff --git a/Makefile.groups b/Makefile.groups index 999e0fd..c1fd1eb 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -180,6 +180,9 @@ mod_list_mongodb=db_mongodb ndb_mongodb # - modules depending on redis and event library mod_list_cnxcc=cnxcc +# - modules depending on erlang library +mod_list_erlang=erlang + # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ @@ -205,7 +208,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_gzcompress) $(mod_list_uuid) \ $(mod_list_ev) $(mod_list_kazoo) \ $(mod_list_mongodb) $(mod_list_cnxcc) \ - $(mod_list_jansson) $(mod_list_geoip2)) + $(mod_list_jansson) $(mod_list_geoip2) \ + $(mod_list_erlang)) @@ -387,6 +391,9 @@ module_group_kmongodb=$(mod_list_mongodb) # pkg cnxcc module module_group_kcnxcc=$(mod_list_cnxcc) +# pkg erlang module +module_group_kerlang=$(mod_list_erlang) + # list of static modules # static_modules:=

1 0

git:master:0f8da174: pv: new config var - $sbranch(key)
by Daniel-Constantin Mierla 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 0f8da1746e79066a423b0808195c061701bb29da URL: https://github.com/kamailio/kamailio/commit/0f8da1746e79066a423b0808195c061… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-21T19:03:32+02:00 pv: new config var - $sbranch(key) - a static branch structure that can be used for config operations - the key can be like for $branch(key) - the static branch is not used for outbound routing, it is just a local container --- Modified: modules/pv/pv.c Modified: modules/pv/pv_branch.c Modified: modules/pv/pv_branch.h --- Diff: https://github.com/kamailio/kamailio/commit/0f8da1746e79066a423b0808195c061… Patch: https://github.com/kamailio/kamailio/commit/0f8da1746e79066a423b0808195c061… --- diff --git a/modules/pv/pv.c b/modules/pv/pv.c index d969adc..fb122a0 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -68,6 +68,9 @@ static pv_export_t mod_pvs[] = { { {"branch", sizeof("branch")-1}, /* branch attributes */ PVT_CONTEXT, pv_get_branchx, pv_set_branchx, pv_parse_branchx_name, pv_parse_index, 0, 0 }, + { {"sbranch", sizeof("sbranch")-1}, /* static branch attributes */ + PVT_CONTEXT, pv_get_sbranch, pv_set_sbranch, + pv_parse_branchx_name, 0, 0, 0 }, { {"mi", (sizeof("mi")-1)}, /* message id */ PVT_OTHER, pv_get_msgid, 0, 0, 0, 0, 0}, diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index 24e22a6..521e4b9 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -27,22 +27,27 @@ #include "pv_core.h" #include "pv_branch.h" -int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res) +static branch_t _pv_sbranch = {0}; + +int pv_get_branchx_helper(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res, int btype) { int idx = 0; int idxf = 0; branch_t *br; - /* get the index */ - if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) - { - LM_ERR("invalid index\n"); - return pv_get_null(msg, param, res); + if(btype==1) { + br = &_pv_sbranch; + } else { + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) + { + LM_ERR("invalid index\n"); + return pv_get_null(msg, param, res); + } + br = get_sip_branch(idx); } - br = get_sip_branch(idx); - /* branch(count) doesn't need a valid branch, everything else does */ if(br->len == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) { @@ -88,8 +93,14 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, return 0; } -int pv_set_branchx(struct sip_msg* msg, pv_param_t *param, - int op, pv_value_t *val) +int pv_get_branchx(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_branchx_helper(msg, param, res, 0); +} + +int pv_set_branchx_helper(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val, int btype) { int idx = 0; int idxf = 0; @@ -105,15 +116,18 @@ int pv_set_branchx(struct sip_msg* msg, pv_param_t *param, return -1; } - /* get the index */ - if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) - { - LM_ERR("invalid index\n"); - return -1; + if(btype==1) { + br = &_pv_sbranch; + } else { + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) + { + LM_ERR("invalid index\n"); + return -1; + } + br = get_sip_branch(idx); } - br = get_sip_branch(idx); - if(br==NULL) { LM_DBG("no branch to operate on\n"); @@ -283,6 +297,12 @@ int pv_set_branchx(struct sip_msg* msg, pv_param_t *param, return 0; } +int pv_set_branchx(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_branchx_helper(msg, param, op, val, 0); +} + int pv_parse_branchx_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) @@ -339,6 +359,18 @@ int pv_parse_branchx_name(pv_spec_p sp, str *in) return -1; } +int pv_get_sbranch(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res) +{ + return pv_get_branchx_helper(msg, param, res, 1); +} + +int pv_set_sbranch(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val) +{ + return pv_set_branchx_helper(msg, param, op, val, 1); +} + int pv_get_sndfrom(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules/pv/pv_branch.h b/modules/pv/pv_branch.h index 8ef5c2c..d9c3fc6 100644 --- a/modules/pv/pv_branch.h +++ b/modules/pv/pv_branch.h @@ -29,6 +29,11 @@ int pv_set_branchx(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); int pv_parse_branchx_name(pv_spec_p sp, str *in); +int pv_get_sbranch(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); +int pv_set_sbranch(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val); + int pv_get_sndto(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_sndfrom(struct sip_msg *msg, pv_param_t *param,

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015