sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: siptrace: don't attempt to get reply reason for ack

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f7630be368c10bb1901acd6968211ee4ec41c922 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7630be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 13 13:04:14 2010 +0200 siptrace: don't attempt to get reply reason for ack - for sl filtered ack, execution of sl callback attempted to set the len of reply reason, which does not exist in this case - reported by MÉSZÁROS Mihály --- modules/sl/sl_funcs.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c index 0dc771a..67a2836 100644 --- a/modules/sl/sl_funcs.c +++ b/modules/sl/sl_funcs.c @@ -397,7 +397,10 @@ void sl_run_callbacks(unsigned int type, struct sip_msg *req, param.req = req; param.code = code; sreason.s = reason; - sreason.len = strlen(reason); + if(reason) + sreason.len = strlen(reason); + else + sreason.len = 0; param.reason = &sreason; param.reply = reply; param.dst = dst;

14 years, 4 months

git:3.1: debian: fix radius build depends

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: f9915e21508accbe2d2e24af518089e746ea33a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9915e2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 13 08:06:10 2010 +0200 debian: fix radius build depends (cherry picked from commit 8864b0586d34c82f015efdc5e3d0b05adc87c338) --- pkg/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/debian/control b/pkg/debian/control index 8bfd895..1931d1b 100644 --- a/pkg/debian/control +++ b/pkg/debian/control @@ -2,7 +2,7 @@ Source: ser Section: net Priority: optional Maintainer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> -Build-Depends: debhelper (>= 4), libmysqlclient-dev | libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient12-dev, libexpat1-dev, libradius-ng-dev | libradiusclient-ng-dev | libradius1-dev, libxml2-dev, libpq-dev | postgresql-dev, libcurl3-dev, libssl-dev, libreadline5-dev, libpcre3-dev, bison, flex, docbook2x, +Build-Depends: debhelper (>= 4), libmysqlclient-dev | libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient12-dev, libexpat1-dev, libradius-ng-dev | libradiusclient-ng-dev, libxml2-dev, libpq-dev | postgresql-dev, libcurl3-dev, libssl-dev, libreadline5-dev, libpcre3-dev, bison, flex, docbook2x, xsltproc, lynx Standards-Version: 3.5.2

14 years, 4 months

git:3.1: registrar(s): support for disabled aor_attr and server_id_attr

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: 9747285971a598365ea941ee553a0a7a15259751 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9747285… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 6 18:53:14 2010 +0200 registrar(s): support for disabled aor_attr and server_id_attr If aor_attr or server_id_attr are empty ("") don't try to use them. (cherry picked from commit 5f94dececcbf709f92b9a4b022731d4ee17e7e42) --- modules_s/registrar/save.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/modules_s/registrar/save.c b/modules_s/registrar/save.c index a491526..045e139 100644 --- a/modules_s/registrar/save.c +++ b/modules_s/registrar/save.c @@ -697,10 +697,12 @@ static int get_server_id(void) int sid; - name.s.s = server_id_attr.s + 1; /* Skip the 1st char which is $ */ - name.s.len = server_id_attr.len - 1; - if (search_first_avp(AVP_TRACK_FROM | AVP_NAME_STR, name, &val, 0)) { - if (str2sint(&val.s, &sid) == 0) return sid; + if (server_id_attr.len && server_id_attr.s) { + name.s.s = server_id_attr.s + 1; /* Skip the 1st char which is $ */ + name.s.len = server_id_attr.len - 1; + if (search_first_avp(AVP_TRACK_FROM | AVP_NAME_STR, name, &val, 0)) { + if (str2sint(&val.s, &sid) == 0) return sid; + } } /* No server_id attribute found or the attribute doesn't have @@ -721,12 +723,16 @@ static inline int contacts(struct sip_msg* _m, contact_t* _c, udomain_t* _d, str str* aor; int_str name, val; - name.s.s = aor_attr.s + 1; /* Skip the 1st char which is $ */ - name.s.len = aor_attr.len - 1; - if (search_first_avp(AVP_TRACK_TO | AVP_NAME_STR, name, &val, 0)) { - aor = &val.s; + if (aor_attr.len && aor_attr.s) { + name.s.s = aor_attr.s + 1; /* Skip the 1st char which is $ */ + name.s.len = aor_attr.len - 1; + if (search_first_avp(AVP_TRACK_TO | AVP_NAME_STR, name, &val, 0)) { + aor = &val.s; + } else { + aor = &get_to(_m)->uri; + } } else { - aor = &get_to(_m)->uri; + aor = &get_to(_m)->uri; } sid = get_server_id();

14 years, 4 months

git:3.1: registrar(s): doc - fix reply_reason_attr name

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: cb9965009f51dda3c0ecb6ae810a4b6ee94980a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb99650… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 12 19:31:07 2010 +0200 registrar(s): doc - fix reply_reason_attr name The docs used reply_code_reason_attr instead of reply_reason_attr. (cherry picked from commit 50eb81b1287292238aa4b194cfcdba2afa8b4f89) --- modules_s/registrar/README | 4 ++-- modules_s/registrar/doc/params.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_s/registrar/README b/modules_s/registrar/README index ba553ea..53dd93b 100644 --- a/modules_s/registrar/README +++ b/modules_s/registrar/README @@ -32,7 +32,7 @@ Jan Janak 1.6.14. trust_received_flag (flagname or integer) 1.6.15. received_to_uri (boolean) 1.6.16. reply_code_attr (avp name) - 1.6.17. reply_code_reason_attr (avp name) + 1.6.17. reply_reason_attr (avp name) 1.6.18. contact_attr (avp name) 1.6.19. aor_attr (avp name) 1.6.20. server_id_attr (avp name) @@ -525,7 +525,7 @@ route{ ... } -1.6.17. reply_code_reason_attr (avp name) +1.6.17. reply_reason_attr (avp name) See reply_code_attr above. diff --git a/modules_s/registrar/doc/params.xml b/modules_s/registrar/doc/params.xml index d580386..3835b7b 100644 --- a/modules_s/registrar/doc/params.xml +++ b/modules_s/registrar/doc/params.xml @@ -463,8 +463,8 @@ route{ </example> </section> - <section id="reply_code_reason_attr"> - <title><varname>reply_code_reason_attr</varname> (avp name)</title> + <section id="reply_reason_attr"> + <title><varname>reply_reason_attr</varname> (avp name)</title> <para> See <varname>reply_code_attr</varname> above. </para>

14 years, 4 months

git:3.1: registrar(s): support for disabled code, reason and contact AVPs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: c34fea16c38a2338e27a49c33dc595948128d4d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c34fea1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 6 19:06:42 2010 +0200 registrar(s): support for disabled code, reason and contact AVPs reply_code_attr, reply_reason_attr and contact_attr modparams can now be set to "" to disable setting the corresponding AVPs when a save*_noreply() is used (speed-up if not needed). (cherry picked from commit fb021d55b09bfbb5503d5879a902f968f1bcabfd) --- modules_s/registrar/reg_mod.c | 70 +++++++++++++++++++++++------------------ modules_s/registrar/reg_mod.h | 1 + modules_s/registrar/reply.c | 48 ++++++++++++++++------------ 3 files changed, 67 insertions(+), 52 deletions(-) diff --git a/modules_s/registrar/reg_mod.c b/modules_s/registrar/reg_mod.c index f623d1b..b21039d 100644 --- a/modules_s/registrar/reg_mod.c +++ b/modules_s/registrar/reg_mod.c @@ -174,42 +174,50 @@ static int parse_attr_params(void) { str tmp; - tmp = reply_code_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_code) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (reply_code_attr.len) { + tmp = reply_code_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_code) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - tmp = reply_reason_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_reason) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (reply_reason_attr.len) { + tmp = reply_reason_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_reason) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - tmp = contact_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_contact) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (contact_attr.len) { + tmp = contact_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_contact) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - return 0; } diff --git a/modules_s/registrar/reg_mod.h b/modules_s/registrar/reg_mod.h index 6b61c29..027a571 100644 --- a/modules_s/registrar/reg_mod.h +++ b/modules_s/registrar/reg_mod.h @@ -57,6 +57,7 @@ extern usrloc_api_t ul; /* Structure containing pointers to usrloc functions */ extern sl_api_t slb; +extern str reply_code_attr, reply_reason_attr, contact_attr; extern avp_ident_t avpid_code, avpid_reason, avpid_contact; #endif /* REG_MOD_H */ diff --git a/modules_s/registrar/reply.c b/modules_s/registrar/reply.c index 9661bdb..7e65596 100644 --- a/modules_s/registrar/reply.c +++ b/modules_s/registrar/reply.c @@ -349,40 +349,46 @@ int setup_attrs(struct sip_msg* msg) str reason, c; avp_value_t val; - reason.s = NULL; - reason.len = 0; code = codes[rerrno]; - switch(code) { - case 200: reason.s = MSG_200; reason.len = sizeof(MSG_200) - 1; break; - case 400: reason.s = MSG_400; reason.len = sizeof(MSG_400) - 1; break; - case 500: reason.s = MSG_500; reason.len = sizeof(MSG_500) - 1; break; - case 503: reason.s = MSG_503; reason.len = sizeof(MSG_503) - 1; break; - } - val.n = code; - if (add_avp(avpid_code.flags, avpid_code.name, val) < 0) { - ERR("Error while creating reply code attribute\n"); - return -1; + if (reply_code_attr.len) { + val.n = code; + if (add_avp(avpid_code.flags, avpid_code.name, val) < 0) { + ERR("Error while creating reply code attribute\n"); + return -1; + } } - val.s = reason; - if (add_avp(avpid_reason.flags | AVP_VAL_STR, avpid_reason.name, val) < 0) { - ERR("Error while creating reply reason attribute\n"); - return -1; - } + if (reply_reason_attr.len) { + reason.s = NULL; + reason.len = 0; + switch(code) { + case 200: reason.s = MSG_200; reason.len = sizeof(MSG_200) - 1; break; + case 400: reason.s = MSG_400; reason.len = sizeof(MSG_400) - 1; break; + case 500: reason.s = MSG_500; reason.len = sizeof(MSG_500) - 1; break; + case 503: reason.s = MSG_503; reason.len = sizeof(MSG_503) - 1; break; + } + val.s = reason; + if (add_avp(avpid_reason.flags | AVP_VAL_STR, avpid_reason.name, val) + < 0) { + ERR("Error while creating reply reason attribute\n"); + return -1; + } + } - if (contact.data_len > 0) { + if (contact_attr.len && contact.data_len > 0) { c.s = contact.buf; c.len = contact.data_len; val.s = c; - if (add_avp(avpid_contact.flags | AVP_VAL_STR, avpid_contact.name, val) < 0) { + if (add_avp(avpid_contact.flags | AVP_VAL_STR, avpid_contact.name, val) + < 0) { ERR("Error while creating contact attribute\n"); return -1; - } + } contact.data_len = 0; - } + } return 0; }

14 years, 4 months

[www|proxy]_challenge changes

by Alex Balashov

Regarding commit c53bc97968e4ac2ddf5b8a23af44942e8d50e7b3: The commit annotation did not mention that the 'nid_pool_no' modparam to 'auth' was removed. I had written a new configuration against the tarball of v3.1.0 that I downloaded on Friday and it took me quite some time to figure out why 'nid_pool_no' caused 'auth' to break when I downloaded the 3.1.0 tarball again today. Secondly, the option is still in the production documentation: http://www.kamailio.org/docs/modules/3.1.x/modules/auth.html#nid_pool_no I have two questions: 1. Why was it removed? What relation does it have to the substance of this change? 2. If something like that is changed, is it much to ask to make a note of it in the commit message at least? And if it's going to be backported into the 3.1.0 branch and put into a new tarball, is it much to ask that the official documentation on the web site be updated to also reflect it? Thanks! -- Alex Balashov - Principal Evariste Systems LLC 1170 Peachtree Street 12th Floor, Suite 1200 Atlanta, GA 30309 Tel: +1-678-954-0670 Fax: +1-404-961-1892 Web: http://www.evaristesys.com/

14 years, 4 months

git:master: auth: restore deleted nid_pool_no parameter

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 62d7bf1af574e1bea650a96ec6a2b2a5fc67d883 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62d7bf1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 13 08:13:51 2010 +0200 auth: restore deleted nid_pool_no parameter In commit c53bc97968e4ac2ddf5b8a23af44942e8d50e7b3 the nid_pool_no parameter was removed by mistake. Reported-by: Alex Balashov abalashov evaristesys com --- modules/auth/auth_mod.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index b30f6b8..96f8d49 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -172,6 +172,7 @@ static param_export_t params[] = { {"one_time_nonce" , PARAM_INT, &otn_enabled }, {"otn_in_flight_no", PARAM_INT, &otn_in_flight_no }, {"otn_in_flight_order", PARAM_INT, &otn_in_flight_k }, + {"nid_pool_no", PARAM_INT, &nid_pool_no }, {"force_stateless_reply", PARAM_INT, &force_stateless_reply }, {0, 0, 0} };

14 years, 4 months

git:master: registrar(s): doc - fix reply_reason_attr name

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 50eb81b1287292238aa4b194cfcdba2afa8b4f89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50eb81b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 12 19:31:07 2010 +0200 registrar(s): doc - fix reply_reason_attr name The docs used reply_code_reason_attr instead of reply_reason_attr. --- modules_s/registrar/README | 4 ++-- modules_s/registrar/doc/params.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_s/registrar/README b/modules_s/registrar/README index ba553ea..53dd93b 100644 --- a/modules_s/registrar/README +++ b/modules_s/registrar/README @@ -32,7 +32,7 @@ Jan Janak 1.6.14. trust_received_flag (flagname or integer) 1.6.15. received_to_uri (boolean) 1.6.16. reply_code_attr (avp name) - 1.6.17. reply_code_reason_attr (avp name) + 1.6.17. reply_reason_attr (avp name) 1.6.18. contact_attr (avp name) 1.6.19. aor_attr (avp name) 1.6.20. server_id_attr (avp name) @@ -525,7 +525,7 @@ route{ ... } -1.6.17. reply_code_reason_attr (avp name) +1.6.17. reply_reason_attr (avp name) See reply_code_attr above. diff --git a/modules_s/registrar/doc/params.xml b/modules_s/registrar/doc/params.xml index d580386..3835b7b 100644 --- a/modules_s/registrar/doc/params.xml +++ b/modules_s/registrar/doc/params.xml @@ -463,8 +463,8 @@ route{ </example> </section> - <section id="reply_code_reason_attr"> - <title><varname>reply_code_reason_attr</varname> (avp name)</title> + <section id="reply_reason_attr"> + <title><varname>reply_reason_attr</varname> (avp name)</title> <para> See <varname>reply_code_attr</varname> above. </para>

14 years, 4 months

git:master: debian: fix radius build depends

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8864b0586d34c82f015efdc5e3d0b05adc87c338 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8864b05… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 13 08:06:10 2010 +0200 debian: fix radius build depends --- pkg/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/debian/control b/pkg/debian/control index 8bfd895..1931d1b 100644 --- a/pkg/debian/control +++ b/pkg/debian/control @@ -2,7 +2,7 @@ Source: ser Section: net Priority: optional Maintainer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> -Build-Depends: debhelper (>= 4), libmysqlclient-dev | libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient12-dev, libexpat1-dev, libradius-ng-dev | libradiusclient-ng-dev | libradius1-dev, libxml2-dev, libpq-dev | postgresql-dev, libcurl3-dev, libssl-dev, libreadline5-dev, libpcre3-dev, bison, flex, docbook2x, +Build-Depends: debhelper (>= 4), libmysqlclient-dev | libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient12-dev, libexpat1-dev, libradius-ng-dev | libradiusclient-ng-dev, libxml2-dev, libpq-dev | postgresql-dev, libcurl3-dev, libssl-dev, libreadline5-dev, libpcre3-dev, bison, flex, docbook2x, xsltproc, lynx Standards-Version: 3.5.2

14 years, 4 months

git:master: registrar(s): support for disabled code, reason and contact AVPs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: fb021d55b09bfbb5503d5879a902f968f1bcabfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb021d5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 6 19:06:42 2010 +0200 registrar(s): support for disabled code, reason and contact AVPs reply_code_attr, reply_reason_attr and contact_attr modparams can now be set to "" to disable setting the corresponding AVPs when a save*_noreply() is used (speed-up if not needed). --- modules_s/registrar/reg_mod.c | 70 +++++++++++++++++++++++------------------ modules_s/registrar/reg_mod.h | 1 + modules_s/registrar/reply.c | 48 ++++++++++++++++------------ 3 files changed, 67 insertions(+), 52 deletions(-) diff --git a/modules_s/registrar/reg_mod.c b/modules_s/registrar/reg_mod.c index f623d1b..b21039d 100644 --- a/modules_s/registrar/reg_mod.c +++ b/modules_s/registrar/reg_mod.c @@ -174,42 +174,50 @@ static int parse_attr_params(void) { str tmp; - tmp = reply_code_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_code) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (reply_code_attr.len) { + tmp = reply_code_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_code) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - tmp = reply_reason_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_reason) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (reply_reason_attr.len) { + tmp = reply_reason_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_reason) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - tmp = contact_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_contact) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (contact_attr.len) { + tmp = contact_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_contact) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - return 0; } diff --git a/modules_s/registrar/reg_mod.h b/modules_s/registrar/reg_mod.h index 6b61c29..027a571 100644 --- a/modules_s/registrar/reg_mod.h +++ b/modules_s/registrar/reg_mod.h @@ -57,6 +57,7 @@ extern usrloc_api_t ul; /* Structure containing pointers to usrloc functions */ extern sl_api_t slb; +extern str reply_code_attr, reply_reason_attr, contact_attr; extern avp_ident_t avpid_code, avpid_reason, avpid_contact; #endif /* REG_MOD_H */ diff --git a/modules_s/registrar/reply.c b/modules_s/registrar/reply.c index 9661bdb..7e65596 100644 --- a/modules_s/registrar/reply.c +++ b/modules_s/registrar/reply.c @@ -349,40 +349,46 @@ int setup_attrs(struct sip_msg* msg) str reason, c; avp_value_t val; - reason.s = NULL; - reason.len = 0; code = codes[rerrno]; - switch(code) { - case 200: reason.s = MSG_200; reason.len = sizeof(MSG_200) - 1; break; - case 400: reason.s = MSG_400; reason.len = sizeof(MSG_400) - 1; break; - case 500: reason.s = MSG_500; reason.len = sizeof(MSG_500) - 1; break; - case 503: reason.s = MSG_503; reason.len = sizeof(MSG_503) - 1; break; - } - val.n = code; - if (add_avp(avpid_code.flags, avpid_code.name, val) < 0) { - ERR("Error while creating reply code attribute\n"); - return -1; + if (reply_code_attr.len) { + val.n = code; + if (add_avp(avpid_code.flags, avpid_code.name, val) < 0) { + ERR("Error while creating reply code attribute\n"); + return -1; + } } - val.s = reason; - if (add_avp(avpid_reason.flags | AVP_VAL_STR, avpid_reason.name, val) < 0) { - ERR("Error while creating reply reason attribute\n"); - return -1; - } + if (reply_reason_attr.len) { + reason.s = NULL; + reason.len = 0; + switch(code) { + case 200: reason.s = MSG_200; reason.len = sizeof(MSG_200) - 1; break; + case 400: reason.s = MSG_400; reason.len = sizeof(MSG_400) - 1; break; + case 500: reason.s = MSG_500; reason.len = sizeof(MSG_500) - 1; break; + case 503: reason.s = MSG_503; reason.len = sizeof(MSG_503) - 1; break; + } + val.s = reason; + if (add_avp(avpid_reason.flags | AVP_VAL_STR, avpid_reason.name, val) + < 0) { + ERR("Error while creating reply reason attribute\n"); + return -1; + } + } - if (contact.data_len > 0) { + if (contact_attr.len && contact.data_len > 0) { c.s = contact.buf; c.len = contact.data_len; val.s = c; - if (add_avp(avpid_contact.flags | AVP_VAL_STR, avpid_contact.name, val) < 0) { + if (add_avp(avpid_contact.flags | AVP_VAL_STR, avpid_contact.name, val) + < 0) { ERR("Error while creating contact attribute\n"); return -1; - } + } contact.data_len = 0; - } + } return 0; }

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev