sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

git:master: make: excluded modules with radius dependency

by Nils Ohlmeier

Module: sip-router Branch: master Commit: 61ecd1118194f5cdbf718fb6072498cabd7bbcd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61ecd11… Author: Nils Ohlmeier <nils(a)iptel.org> Committer: Nils Ohlmeier <nils(a)iptel.org> Date: Tue May 19 02:07:13 2009 +0200 make: excluded modules with radius dependency - excluded and moved misc_radius and peering modules to the radius module group to allow to build the basic set of modules without dependency on radius library being installed. --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 160f1c4..ca97f78 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ module_group_mysql=acc_db auth_db avp_db db_ops uri_db domain lcr msilo mysql\ speeddial # For radius -module_group_radius=acc_radius auth_radius avp_radius +module_group_radius=acc_radius auth_radius avp_radius misc_radius peering # For presence module_group_presence=dialog pa presence_b2b rls xcap @@ -190,7 +190,7 @@ else db_unixodbc memcached mi_xmlrpc \ nat_traversal perlvdb purple seas siptrace \ snmpstats uac_redirect xmpp \ - carrierroute + carrierroute misc_radius peering # excluded because they do not compile (remove them only after they are # fixed) -- andrei exclude_modules+= avpops bdb dbtext iptrtpproxy pa rls

15 years, 7 months

git:master: core: bug fix in PV printing related to static buffer

by Henning Westerholt

Module: sip-router Branch: master Commit: 103ffecf7e6a7bf84da10a3917e3df81b6964e4b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=103ffec… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 18 19:29:30 2009 +0200 core: bug fix in PV printing related to static buffer fix a bug in the PV printing (for k). The code allocated a static buffer, but failed to proper initialize it with zero. Thus in certain cases old data from previous PV evaluation is returned. is returned --- sr_module.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index a3e51e6..1ab8868 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1360,6 +1360,7 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) avp_t* avp; pv_value_t pv_val; static char pve_buf[256]; /* ugly hack needed for PVE */ + memset(pve_buf, 0, sizeof(pve_buf)); switch(param->type) { case FPARAM_REGEX:

15 years, 7 months

git:master: test: further portings to sr and small extensions

by Henning Westerholt

Module: sip-router Branch: master Commit: 19f5d9800f49c47de0a83cf9bc4fbadb1643d78c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19f5d98… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 18 15:41:29 2009 +0200 test: further portings to sr and small extensions --- test/unit/16.sh | 4 ++-- test/unit/17.sh | 12 +++++------- test/unit/2.cfg | 6 +++--- test/unit/26.cfg | 43 ++++++++++++++++++++----------------------- test/unit/26.sh | 23 +++++++++++------------ test/unit/30.cfg | 19 ++++++++++--------- test/unit/30.sh | 6 ++---- test/unit/37.sh | 10 +++------- test/unit/42.sh | 8 +++----- test/unit/include/common | 7 ++++--- 10 files changed, 63 insertions(+), 75 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=19f…

15 years, 7 months

git:master: test: port dbtext default modules load and cr on postgres

by Henning Westerholt

Module: sip-router Branch: master Commit: 33c24da95f38c5fee6b8ad129c953a6a924064cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33c24da… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 16:51:40 2009 +0200 test: port dbtext default modules load and cr on postgres --- test/unit/15.sh | 6 +++--- test/unit/23.sh | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/test/unit/15.sh b/test/unit/15.sh index bb5e8c0..3938e98 100755 --- a/test/unit/15.sh +++ b/test/unit/15.sh @@ -28,11 +28,11 @@ if ! (check_kamailio); then exit 0 fi ; -echo "loadmodule \"../modules/db_text/db_text.so\"" >> $CFG +echo "loadmodule \"../../modules_k/db_text/db_text.so\"" >> $CFG cat 2.cfg >> $CFG -echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../scripts/dbtext/kamailio\")" >> $CFG +echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../scripts/dbtext/kamailio\")" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 diff --git a/test/unit/23.sh b/test/unit/23.sh index e19a719..9bddb9a 100755 --- a/test/unit/23.sh +++ b/test/unit/23.sh @@ -32,7 +32,7 @@ CFG=13.cfg cp $CFG $CFG.bak # setup config -echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG +echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG echo "modparam(\"carrierroute\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG @@ -51,17 +51,15 @@ insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('20','2','','10','1','0','host6'); insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('21','3','','10','1','0','premium.host.local');" -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 -cd ../scripts - TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` if [ "$ret" -eq 0 ] ; then - ./$CTL fifo cr_dump_routes > $TMPFILE + $CTL fifo cr_dump_routes > $TMPFILE ret=$? fi ; @@ -100,8 +98,6 @@ delete from carrierroute where carrier=1; delete from carrierroute where carrier=2; delete from carrierroute where carrier=3;" -cd ../test - mv $CFG.bak $CFG rm $TMPFILE

15 years, 7 months

misc_radius and peering module

by Nils Ohlmeier

Hello, when I call 'make modules' as described in the wiki on a current copy of the GIT repository the build process tries to build the misc_radius and peering modules from the modules directory. But both of them fail to build because of the missing radiusclient-ng.h header on my system (recent Gentoo Linux). Is this a bug in the build system, or is it now with sip-router intended behavior that modules with external dependencies are tried to build? Thanks Nils

15 years, 7 months

kamailio and/or ser 3.0 with sip router core

by Daniel-Constantin Mierla

Hello, long awaited period of SIP Router integration phase is more and more approaching the end. Apart of 4 modules that are not integrated yet from Kamailio - seas, siptrace, uac_redirect and nat_traversal (work being undertaken) -- the rest of 88 modules are ready for http://sip-router.org core. I have created a page to collect guidelines for the default Kamailio configuration file used with sip-router. I invite all of you to test it, not only this one, but your private configs as well. http://sip-router.org/wiki/migration/kamailio-3.0-config Feel free to add to the wiki page or post questions about it to sr-users(a)lists.sip-router.org. This is a new list created for users of sip-router project, you can subscribe to it at: http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users At this stage, sip router can be used with modules from both Kamailio (OpenSER) and SER projects, mixed in same instance at the same time. Therefore you can choose the best ones that fit your needs. For Kamailio (OpenSER) users there is a page that tries to collect new features they got from SER side (still a lot to add there, hope ser developers will contribute what they find missing). Another page collects links for ser and kamailio users to find what the other project brings: http://sip-router.org/wiki/migration/new-features-for-k-users http://sip-router.org/wiki/features/inherited-features It was not only integration work in the past months, sip router has quite a bunch of brand new feature. The wiki page to collect the summary is available at: http://sip-router.org/wiki/features/new-in-devel Jan just set online documentation portal, available for web browsing: http://sip-router.org/docbook/sip-router/branch/master/ Common modules are located in directory 'modules' while kamailio and ser specific modules can be found under module_k and modules_s. Project's wiki portal got also good content and it is under heavy work -- note that everyone can contribute to wiki: http://sip-router.org/wiki Couple of core and tm features are not yet integrated or not exactly as they were in Kamailio. Please report the ones you are missing in your config at: http://sip-router.org/wiki/devel/kamailio-integration#tm_and_core_extensions It is the place that should set the priority rank for integration. I hope that in 1-2 months time frame to get into beta stage and prepare a stable release. Many thanks for those that allocated resources to make things evolve to this stage and many thanks in advance for those that will start testing and help improving the sip router project. Beware that is still very early stage and not recommended for production. Cheers, Daniel PS. Codename 3.0 refers to Kamailio (OpenSER) or SER using sip router core, there is not a stable release yet. -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 8 months

git:master: pv: propagation of assignment with $null

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 44056bf12de08624ef57812b36d12c055cd7f0b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44056bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 15 14:57:31 2009 +0300 pv: propagation of assignment with $null --- modules_k/pv/pv_core.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 6571876..9103d81 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1581,7 +1581,7 @@ int pv_set_scriptvar(struct sip_msg* msg, pv_param_t *param, LM_ERR("error - cannot find svar\n"); goto error; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { avp_val.n = 0; set_var_value((script_var_t*)param->pvn.u.dname, &avp_val, 0); @@ -1616,7 +1616,7 @@ int pv_set_dsturi(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { reset_dst_uri(msg); return 1; @@ -1642,7 +1642,7 @@ int pv_set_ruri(struct sip_msg* msg, pv_param_t *param, struct run_act_ctx h; char backup; - if(msg==NULL || param==NULL || val==NULL) + if(msg==NULL || param==NULL || val==NULL || (val->flags&PV_VAL_NULL)) { LM_ERR("bad parameters\n"); return -1; @@ -1687,7 +1687,7 @@ int pv_set_ruri_user(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { memset(&act, 0, sizeof(act)); act.type = SET_USER_T; @@ -1735,7 +1735,7 @@ int pv_set_ruri_host(struct sip_msg* msg, pv_param_t *param, struct run_act_ctx h; char backup; - if(msg==NULL || param==NULL || val==NULL) + if(msg==NULL || param==NULL || val==NULL || (val->flags&PV_VAL_NULL)) { LM_ERR("bad parameters\n"); return -1; @@ -1780,7 +1780,7 @@ int pv_set_ruri_port(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { memset(&act, 0, sizeof(act)); act.type = SET_PORT_T; @@ -1824,7 +1824,7 @@ error: int pv_set_branch(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { - if(msg==NULL || param==NULL || val==NULL) + if(msg==NULL || param==NULL || val==NULL || (val->flags&PV_VAL_NULL)) { LM_ERR("bad parameters\n"); return -1; @@ -1862,7 +1862,7 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val==NULL) + if(val==NULL || (val->flags&PV_VAL_NULL)) { msg->force_send_socket = NULL; return 0; @@ -1906,7 +1906,7 @@ int pv_set_mflags(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { msg->flags = 0; return 0; @@ -1932,7 +1932,7 @@ int pv_set_sflags(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { setsflagsval(0); return 0; @@ -1959,7 +1959,7 @@ int pv_set_bflags(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { setbflagsval(0, 0); return 0;

15 years, 8 months

git:master: pv: assignment with $null deletes the avp

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e6fef16a0438edbb00b88a752f0f340e2d6b9e52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6fef16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 15 14:42:21 2009 +0300 pv: assignment with $null deletes the avp - $avp(x) = $null; - equivalent of $avp(x) = null; in K - $(avp(x)[*]) = $null; - equivalent of $avp(x) := null; in K --- modules_k/pv/pv_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 2d9c914..6571876 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1536,7 +1536,7 @@ int pv_set_avp(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) destroy_avps(name_type, avp_name, 1);

15 years, 8 months

git:master: @ruri forces parsing the URI.

by Miklos Tirpak

Module: sip-router Branch: master Commit: 3e004ccaddd1d9a671dac012021116c7bda2c733 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e004cc… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri May 15 10:04:50 2009 +0200 @ruri forces parsing the URI. The entire RURI value is rearly used as it is, rather its subparts are important. The result of this patch is that for example @ruri.user and @ruri.host cause one parsing instead of two when the RURI has not been parsed yet. --- select_core.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/select_core.c b/select_core.c index 8f7c0f5..0ecd1c9 100644 --- a/select_core.c +++ b/select_core.c @@ -69,6 +69,16 @@ int select_ruri(str* res, select_t* s, struct sip_msg* msg) { + /* Parse the RURI even if it is not needed right now + * because the nested select calls can access the + * parsed URI in this case. + * Go ahead even if the parsing fails, so the + * value of the broken RURI can be accessed at least. + * Subsequent select calls will fail when they try to parse + * the URI anyway. (Miklos) + */ + parse_sip_msg_uri(msg); + if (msg->parsed_uri_ok) select_uri_p = &msg->parsed_uri;

15 years, 8 months

git:master: Avoid parsing the Request URI when it is not necessary.

by Miklos Tirpak

Module: sip-router Branch: master Commit: 8321667b05da5c3f71b9835f993efcea66e88147 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8321667… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri May 15 09:42:29 2009 +0200 Avoid parsing the Request URI when it is not necessary. When @ruri.user was executed, the first select call set the value of the URI in str format regardless of whether or not it had already been parsed. The second function call took the str value, and parsed the URI to get its user part. This patch introduces a global pointer variable that can be set to the already parsed URI being processed. Any nested select function can check this pointer and access the parsed URI if possible. --- select.c | 10 ++++ select.h | 7 +++ select_core.c | 138 ++++++++++++++++++++++++++++++++++++--------------------- 3 files changed, 104 insertions(+), 51 deletions(-) diff --git a/select.c b/select.c index 13c6dc7..1593c64 100644 --- a/select.c +++ b/select.c @@ -60,6 +60,13 @@ static select_table_t *select_list = &select_core_table; */ int select_level = 0; +/* pointer to the SIP uri beeing processed. + * Nested function calls can pass information to each + * other using this pointer. Only for performace reasons. + * (Miklos) + */ +struct sip_uri *select_uri_p = NULL; + /** parse a select identifier (internal version) * Parse select string into select structure s * moves pointer p to the first unused char. @@ -399,6 +406,9 @@ int run_select(str* res, select_t* s, struct sip_msg* msg) } DBG("Calling SELECT %p \n", s->f); + /* reset the uri pointer */ + select_uri_p = NULL; + /* save and restore the original select_level * because of the nested selects */ orig_level = select_level; diff --git a/select.h b/select.h index 23f4fa7..5b784eb 100644 --- a/select.h +++ b/select.h @@ -149,6 +149,13 @@ typedef struct select_table { */ extern int select_level; +/* pointer to the SIP uri beeing processed. + * Nested function calls can pass information to each + * other using this pointer. Only for performace reasons. + * (Miklos) + */ +extern struct sip_uri *select_uri_p; + /* * Lookup corresponding select function based on * the select parameters diff --git a/select_core.c b/select_core.c index 79b49ca..8f7c0f5 100644 --- a/select_core.c +++ b/select_core.c @@ -69,6 +69,9 @@ int select_ruri(str* res, select_t* s, struct sip_msg* msg) { + if (msg->parsed_uri_ok) + select_uri_p = &msg->parsed_uri; + if (msg->first_line.type==SIP_REQUEST) { if(msg->new_uri.s) { RETURN0_res(msg->new_uri); @@ -94,9 +97,15 @@ int select_next_hop(str* res, select_t* s, struct sip_msg* msg) RETURN0_res(msg->dst_uri); } else if(msg->new_uri.s) { + if (msg->parsed_uri_ok) + select_uri_p = &msg->parsed_uri; RETURN0_res(msg->new_uri); } else { + if (msg->parsed_uri_ok) + select_uri_p = &msg->parsed_uri; + else if (msg->parsed_orig_ruri_ok) + select_uri_p = &msg->parsed_orig_ruri; RETURN0_res(msg->first_line.u.request.uri); } } @@ -691,30 +700,36 @@ static struct sip_uri uri; int select_uri_type(str* res, select_t* s, struct sip_msg* msg) { - trim(res); - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + trim(res); + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (uri.type==ERROR_URI_T) + if (select_uri_p->type==ERROR_URI_T) return -1; - uri_type_to_str(uri.type, res); + uri_type_to_str(select_uri_p->type, res); return 0; } int select_uri_user(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (uri.flags & URI_USER_NORMALIZE) { - if (!(res->s=get_static_buffer(uri.user.len))) + if (select_uri_p->flags & URI_USER_NORMALIZE) { + if (!(res->s=get_static_buffer(select_uri_p->user.len))) return -1; - if ((res->len=normalize_tel_user(res->s, (&uri.user)))==0) + if ((res->len=normalize_tel_user(res->s, (&select_uri_p->user)))==0) return 1; return 0; } - RETURN0_res(uri.user); + RETURN0_res(select_uri_p->user); } /* search for a parameter with "name" @@ -757,23 +772,26 @@ int select_uri_rn_user(str* res, select_t* s, struct sip_msg* msg) int ret; str val; - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } /* search for the "rn" parameter */ - if ((ret = search_param(&uri.params, "rn", 2, &val)) != 0) + if ((ret = search_param(&select_uri_p->params, "rn", 2, &val)) != 0) goto done; - if (uri.sip_params.s != uri.params.s) { + if (select_uri_p->sip_params.s != select_uri_p->params.s) { /* check also the original sip: URI parameters */ - if ((ret = search_param(&uri.sip_params, "rn", 2, &val)) != 0) + if ((ret = search_param(&select_uri_p->sip_params, "rn", 2, &val)) != 0) goto done; } - if ((uri.flags & URI_USER_NORMALIZE) == 0) - RETURN0_res(uri.user); + if ((select_uri_p->flags & URI_USER_NORMALIZE) == 0) + RETURN0_res(select_uri_p->user); /* else normalize the user name */ - val = uri.user; + val = select_uri_p->user; done: if (ret < 0) return -1; /* error */ @@ -787,26 +805,35 @@ done: int select_uri_pwd(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - RETURN0_res(uri.passwd); + RETURN0_res(select_uri_p->passwd); } int select_uri_host(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - RETURN0_res(uri.host); + RETURN0_res(select_uri_p->host); } int select_uri_port(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - RETURN0_res(uri.port); + RETURN0_res(select_uri_p->port); } int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) @@ -814,31 +841,34 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) char* p; int size; - if (parse_uri(res->s,res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (!uri.host.len) + if (!select_uri_p->host.len) return -1; - if (uri.port.len) { - res->s=uri.host.s; - res->len=uri.host.len+uri.port.len+1; + if (select_uri_p->port.len) { + res->s=select_uri_p->host.s; + res->len=select_uri_p->host.len+select_uri_p->port.len+1; return 0; } - size=uri.host.len+5; + size=select_uri_p->host.len+5; if (!(p = get_static_buffer(size))) return -1; - strncpy(p, uri.host.s, uri.host.len); - switch (uri.type) { + strncpy(p, select_uri_p->host.s, select_uri_p->host.len); + switch (select_uri_p->type) { case SIPS_URI_T: case TELS_URI_T: - strncpy(p+uri.host.len, ":5061", 5); + strncpy(p+select_uri_p->host.len, ":5061", 5); break; case SIP_URI_T: case TEL_URI_T: - strncpy(p+uri.host.len, ":5060", 5); + strncpy(p+select_uri_p->host.len, ":5060", 5); break; case ERROR_URI_T: return -1; @@ -850,13 +880,16 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) int select_uri_proto(str* res, select_t* s, struct sip_msg* msg) { - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } - if (uri.proto != PROTO_NONE) { - proto_type_to_str(uri.proto, res); + if (select_uri_p->proto != PROTO_NONE) { + proto_type_to_str(select_uri_p->proto, res); } else { - switch (uri.type) { + switch (select_uri_p->type) { case SIPS_URI_T: case TELS_URI_T: proto_type_to_str(PROTO_TLS, res); @@ -879,20 +912,23 @@ int select_uri_params(str* res, select_t* s, struct sip_msg* msg) return select_any_params(res, s, msg); } - if (parse_uri(res->s, res->len, &uri)<0) - return -1; + if (select_uri_p == NULL) { + if (parse_uri(res->s, res->len, &uri)<0) + return -1; + select_uri_p = &uri; + } if (s->param_offset[select_level+1]-s->param_offset[select_level]==1) - RETURN0_res(uri.params); + RETURN0_res(select_uri_p->params); - *res=uri.params; + *res=select_uri_p->params; ret = select_any_params(res, s, msg); if ((ret < 0) - && (uri.sip_params.s != NULL) - && (uri.sip_params.s != uri.params.s) + && (select_uri_p->sip_params.s != NULL) + && (select_uri_p->sip_params.s != select_uri_p->params.s) ) { /* Search also in the original sip: uri parameters. */ - *res = uri.sip_params; + *res = select_uri_p->sip_params; ret = select_any_params(res, s, msg); } return ret;

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