sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
236 discussions

git:master: mtree: make log message on not maching character a debug instead of error
by Daniel-Constantin Mierla 11 Jun '13

11 Jun '13

Module: sip-router Branch: master Commit: 862e267267ccd58e096f267ac5aab03cee042b7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=862e267… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 11 18:47:54 2013 +0200 mtree: make log message on not maching character a debug instead of error --- modules/mtree/mtree.c | 284 ++++++++++++++++++++++---------------------- modules/mtree/mtree_mod.c | 180 ++++++++++++++-------------- 2 files changed, 232 insertions(+), 232 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=862…

1 0

git:master: registrar: readme regenerated
by Daniel-Constantin Mierla 11 Jun '13

11 Jun '13

Module: sip-router Branch: master Commit: 407608dfef8e80ef0beaefc61df96e40060b952f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=407608d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 11 18:41:05 2013 +0200 registrar: readme regenerated --- modules/registrar/README | 80 +++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/modules/registrar/README b/modules/registrar/README index b4970dd..e209380 100644 --- a/modules/registrar/README +++ b/modules/registrar/README @@ -16,7 +16,7 @@ Edited by Bogdan-Andre Iancu - Copyright (c) 2003 FhG FOKUS + Copyright � 2003 FhG FOKUS __________________________________________________________________ Table of Contents @@ -626,7 +626,7 @@ modparam("registrar", "xavp_cfg", "reg") Example 1.21. Set xavp_rcd parameter ... -modparam("registrar", "xavp_cfg", "ulrcd") +modparam("registrar", "xavp_rcd", "ulrcd") ... 3.23. gruu_enabled (integer) @@ -725,7 +725,7 @@ modparam("registrar", "flow_timer", 25) 4.7. reg_fetch_contacts(domain, uri, profile) 4.8. reg_free_contacts(profile) -4.1. save(domain, [, flags [, uri]]) +4.1. save(domain, [, flags [, uri]]) The function processes a REGISTER message. It can add, remove or modify usrloc records depending on Contact and Expires HFs in the REGISTER @@ -769,7 +769,7 @@ save("location", "0x01"); save("location", "0x00", "sip:test@kamailio.org"); ... -4.2. lookup(domain [, uri]) +4.2. lookup(domain [, uri]) The function extracts username from Request-URI and tries to find all contacts for the username in usrloc. If there are no such contacts, -1 @@ -809,7 +809,7 @@ switch ($retcode) { }; ... -4.3. lookup_branches(domain) +4.3. lookup_branches(domain) The function performs lookup(domain) on r-uri and additional branches (only branches that have no other attributes set than uri). @@ -826,7 +826,7 @@ switch ($retcode) { lookup_branches("location"); ... -4.4. registered(domain [, uri]) +4.4. registered(domain [, uri]) The function returns true if the AOR in the Request-URI is registered, false otherwise. The function does not modify the message being @@ -848,7 +848,7 @@ if (registered("location")) { }; ... -4.5. add_sock_hdr(hdr_name) +4.5. add_sock_hdr(hdr_name) Adds to the current REGISTER request a new header with "hdr_name" which contains the description of the received socket (proto:ip:port) @@ -865,7 +865,7 @@ if (registered("location")) { add_sock_hdr("Sock-Info"); ... -4.6. unregister(domain, uri[, ruid]) +4.6. unregister(domain, uri[, ruid]) The function removes contacts associated with 'uri'. If 'ruid' is provided a specific contact is removed, if 'ruid' is not provided all @@ -891,7 +891,7 @@ unregister("location", "$ru", "$ulc(caller=>ruid)"); unregister("location", "", "$ruid"); ... -4.7. reg_fetch_contacts(domain, uri, profile) +4.7. reg_fetch_contacts(domain, uri, profile) The function fetches the contacts for 'uri' from table 'domain' to pseudo-variable $ulc(profile). @@ -913,7 +913,7 @@ reg_fetch_contacts("location", "$ru", "callee"); reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); ... -4.8. reg_free_contacts(profile) +4.8. reg_free_contacts(profile) The function frees the contacts from pseudo-variable $ulc(profile). Should be called to release the content of a profile. Anyhow, fetching @@ -1056,60 +1056,60 @@ Chapter 2. Frequently Asked Questions 2.1. - What happend with the old "nat_flag" module parameter? + What happend with the old "nat_flag" module parameter? - In was removed, as the module internally loads this value from the - "USRLOC" module (see the "nat_bflag" USRLOC parameter). + In was removed, as the module internally loads this value from the + "USRLOC" module (see the "nat_bflag" USRLOC parameter). 2.2. - What happend with the old "use_domain" module parameter? + What happend with the old "use_domain" module parameter? - In was removed, as the module internally loads this option from the - "USRLOC" module. This was done in order to simplify the configuration. + In was removed, as the module internally loads this option from the + "USRLOC" module. This was done in order to simplify the configuration. 2.3. - What happend with the old "save_noreply" and "save_memory" functions? + What happend with the old "save_noreply" and "save_memory" functions? - There functions were merged into the new "save(domain,flags)" - functions. If a reply should be sent or if the DB should be updated - also is controlled via the flags. + There functions were merged into the new "save(domain,flags)" + functions. If a reply should be sent or if the DB should be updated + also is controlled via the flags. 2.4. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at http://www.kamailio.org/. + Take a look at http://www.kamailio.org/. 2.5. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.sip-router.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.sip-router.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.sip-router.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.sip-router.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.sip-router.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.sip-router.org>. 2.6. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - http://sip-router.org/tracker. + Please follow the guidelines provided at: + http://sip-router.org/tracker. 2.7. - What happened to the desc_time_order parameter? + What happened to the desc_time_order parameter? - It was removed, as its functionality was migrated into usrloc module, - were there is a parameter with the same name. + It was removed, as its functionality was migrated into usrloc module, + were there is a parameter with the same name.

1 0

git:master: registrar: fixed typo in example of xavp_rcd parameter
by Daniel-Constantin Mierla 11 Jun '13

11 Jun '13

Module: sip-router Branch: master Commit: c228851e068a080050c79107c760f8ab5ffae967 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c228851… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 11 18:39:31 2013 +0200 registrar: fixed typo in example of xavp_rcd parameter --- modules/registrar/doc/registrar_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index 4cddfec..36ef882 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -689,7 +689,7 @@ modparam("registrar", "xavp_cfg", "reg") <title>Set <varname>xavp_rcd</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("registrar", "xavp_cfg", "ulrcd") +modparam("registrar", "xavp_rcd", "ulrcd") ... </programlisting> </example>

1 0

git:master: registrar: more debug messages when adding ruid xavp
by Daniel-Constantin Mierla 11 Jun '13

11 Jun '13

Module: sip-router Branch: master Commit: 9589466916305146fb4f982542c3f3a51126dcef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9589466… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 11 18:37:32 2013 +0200 registrar: more debug messages when adding ruid xavp - free local ruid xavp if cannot be added to root list --- modules/registrar/reply.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index b692ef0..28588fa 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -342,7 +342,9 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = c->ruid; - xavp_add_value(&xname, &xval, &xavp); + if(xavp_add_value(&xname, &xval, &xavp)==NULL) { + LM_ERR("cannot add ruid value to xavp\n"); + } } } @@ -352,12 +354,15 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) /* add xavp with details of the record (ruid, ...) */ if(reg_xavp_rcd.s!=NULL) { - if(list==NULL) + if(list==NULL && xavp!=NULL) { /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; xval.v.xavp = xavp; - xavp_add_value(&reg_xavp_rcd, &xval, NULL); + if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { + LM_ERR("cannot add ruid xavp to root list\n"); + xavp_destroy_list(&xavp); + } } }

1 0

git:4.0: modules/ims_isc: several safety checks
by Camille Oudot 11 Jun '13

11 Jun '13

Module: sip-router Branch: 4.0 Commit: 56ba8ea8b1f1f26ccc36dfb073e1559eca4d77b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56ba8ea… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: Tue Jun 11 16:34:49 2013 +0200 modules/ims_isc: several safety checks - fixed potential buffer overflow - fixed potential crash if regcomp fails --- modules/ims_isc/checker.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/ims_isc/checker.c b/modules/ims_isc/checker.c index fd44f06..31921a4 100644 --- a/modules/ims_isc/checker.c +++ b/modules/ims_isc/checker.c @@ -57,15 +57,32 @@ static int isc_check_headers(ims_spt *spt, struct hdr_field *headers) { char buf[256]; regex_t header_comp, content_comp; i = headers; + + if (spt->sip_header.header.len >= sizeof(buf)) { + LM_ERR("Header name \"%.*s\" is to long to be processed (max %d bytes)\n", spt->sip_header.header.len, spt->sip_header.header.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + if (spt->sip_header.content.len >= sizeof(buf)) { + LM_ERR("Header content \"%.*s\" is to long to be processed (max %d bytes)\n", spt->sip_header.content.len, spt->sip_header.content.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + /* compile the regex for header name */ memcpy(buf, spt->sip_header.header.s, spt->sip_header.header.len); buf[spt->sip_header.header.len] = 0; - regcomp(&(header_comp), buf, REG_ICASE | REG_EXTENDED); + if (regcomp(&(header_comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + LM_ERR("Error compiling the following regexp for header name: %.*s\n", spt->sip_header.header.len, spt->sip_header.header.s); + return FALSE; + } /* compile the regex for content */ memcpy(buf, spt->sip_header.content.s, spt->sip_header.content.len); buf[spt->sip_header.content.len] = 0; - regcomp(&(content_comp), buf, REG_ICASE | REG_EXTENDED); + if(regcomp(&(content_comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + LM_ERR("Error compiling the following regexp for header content: %.*s\n", spt->sip_header.content.len, spt->sip_header.content.s); + regfree(&(header_comp)); + return FALSE; + } LM_DBG("isc_check_headers: Looking for Header[%.*s(%d)] %.*s \n", spt->sip_header.header.len, spt->sip_header.header.s, spt->sip_header.type, spt->sip_header.content.len, spt->sip_header.content.s);

1 0

git:master: modules/ims_isc: several safety checks
by Camille Oudot 11 Jun '13

11 Jun '13

Module: sip-router Branch: master Commit: 106916abc67d2badc43eac03ef175efbbac4f6d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=106916a… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: Tue Jun 11 16:34:49 2013 +0200 modules/ims_isc: several safety checks - fixed potential buffer overflow - fixed potential crash if regcomp fails --- modules/ims_isc/checker.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/ims_isc/checker.c b/modules/ims_isc/checker.c index fd44f06..31921a4 100644 --- a/modules/ims_isc/checker.c +++ b/modules/ims_isc/checker.c @@ -57,15 +57,32 @@ static int isc_check_headers(ims_spt *spt, struct hdr_field *headers) { char buf[256]; regex_t header_comp, content_comp; i = headers; + + if (spt->sip_header.header.len >= sizeof(buf)) { + LM_ERR("Header name \"%.*s\" is to long to be processed (max %d bytes)\n", spt->sip_header.header.len, spt->sip_header.header.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + if (spt->sip_header.content.len >= sizeof(buf)) { + LM_ERR("Header content \"%.*s\" is to long to be processed (max %d bytes)\n", spt->sip_header.content.len, spt->sip_header.content.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + /* compile the regex for header name */ memcpy(buf, spt->sip_header.header.s, spt->sip_header.header.len); buf[spt->sip_header.header.len] = 0; - regcomp(&(header_comp), buf, REG_ICASE | REG_EXTENDED); + if (regcomp(&(header_comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + LM_ERR("Error compiling the following regexp for header name: %.*s\n", spt->sip_header.header.len, spt->sip_header.header.s); + return FALSE; + } /* compile the regex for content */ memcpy(buf, spt->sip_header.content.s, spt->sip_header.content.len); buf[spt->sip_header.content.len] = 0; - regcomp(&(content_comp), buf, REG_ICASE | REG_EXTENDED); + if(regcomp(&(content_comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + LM_ERR("Error compiling the following regexp for header content: %.*s\n", spt->sip_header.content.len, spt->sip_header.content.s); + regfree(&(header_comp)); + return FALSE; + } LM_DBG("isc_check_headers: Looking for Header[%.*s(%d)] %.*s \n", spt->sip_header.header.len, spt->sip_header.header.s, spt->sip_header.type, spt->sip_header.content.len, spt->sip_header.content.s);

1 0

git:master: modules/ims_isc: fix several compiler warnings
by Camille Oudot 11 Jun '13

11 Jun '13

Module: sip-router Branch: master Commit: bddb9a5bf38d4904a9e18dc187fc8c0507001ab5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bddb9a5… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: Tue Jun 11 16:24:15 2013 +0200 modules/ims_isc: fix several compiler warnings --- modules/ims_isc/mark.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ims_isc/mark.c b/modules/ims_isc/mark.c index c879604..e13593b 100644 --- a/modules/ims_isc/mark.c +++ b/modules/ims_isc/mark.c @@ -338,7 +338,7 @@ int isc_mark_write_psu(struct sip_msg *msg, isc_mark *mark) { hlen = psu_hdr_s.len - /* 3 "%.*s" */ 12 + mark->aor.len + regstate->len + sescase->len + 1; hstr = pkg_malloc(hlen); if (hstr == NULL) { - LM_ERR("isc_mark_write_psu: could not allocate %d bytes\n", hlen); + LM_ERR("isc_mark_write_psu: could not allocate %zu bytes\n", hlen); return 0; } @@ -347,14 +347,14 @@ int isc_mark_write_psu(struct sip_msg *msg, isc_mark *mark) { sescase->len, sescase->s, regstate->len, regstate->s); if (ret >= hlen) { - LM_ERR("isc_mark_write_psu: invalid string buffer size: %d, required: %d\n", hlen, ret); + LM_ERR("isc_mark_write_psu: invalid string buffer size: %zu, required: %d\n", hlen, ret); pkg_free(hstr); return 0; } - LM_DBG("isc_mark_write_psu: %.*s\n", hlen - 3 /* don't print \r\n\0 */, hstr); + LM_DBG("isc_mark_write_psu: %.*s\n", (int)hlen - 3 /* don't print \r\n\0 */, hstr); if (append_new_lump(&l, hstr, hlen - 1, HDR_OTHER_T) == 0) { - LM_ERR("isc_mark_write_psu: append_new_lump(%p, \"%.*s\\\r\\n\", %d, 0) failed\n", &l, hlen - 3 /* don't print \r\n\0 */, hstr, hlen - 1); + LM_ERR("isc_mark_write_psu: append_new_lump(%p, \"%.*s\\\r\\n\", %zu, 0) failed\n", &l, (int)hlen - 3 /* don't print \r\n\0 */, hstr, hlen - 1); pkg_free(hstr); return 0; }

1 0

[tracker] Comment added: Patch to Add s.urlencode.param
by sip-router 11 Jun '13

11 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#311 - Patch to Add s.urlencode.param User who did this - Josh (JoshE) ---------- You are right. I didn't get the whole patch in there. I'm also adding a decode function, since it now appears that I need that as well. Will have an update on this out shortly. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=311#comment946 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache (Attachment added)
by sip-router 10 Jun '13

10 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#307 - modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache User who did this - Víctor Seva (linuxmaniac) ---------- - used lib/srutils/srjson instead external lib - check spec->trans for detect transformations on var ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=307#comment945 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: DNS failover bugs
by sip-router 10 Jun '13

10 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#313 - DNS failover bugs User who did this - Daniel-Constantin Mierla (miconda) ---------- Do you have a multi-homed environment (many network interfaces with no routes between them)? Can you attach the patch? It is easier to review and apply the changes. If you used sources downloaded from git, just do: git diff >/tmp/filename.patch If you use tarballs: diff -u oldfile newfile >/tmp/filename.patch ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=313#comment944 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013