sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:4.1: app_perl: print return code if perl_parse() failes
by Daniel-Constantin Mierla 16 Apr '14

16 Apr '14

Module: sip-router Branch: 4.1 Commit: a8b3660d0048fe81f2d8961c967fb839558c465a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8b3660… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 16 12:14:44 2014 +0200 app_perl: print return code if perl_parse() failes (cherry picked from commit 6c5ebff42c1ee702ab4a859ffdd5ffeccbf8e11d) --- modules/app_perl/app_perl_mod.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/app_perl/app_perl_mod.c b/modules/app_perl/app_perl_mod.c index 3948bbe..625fec3 100644 --- a/modules/app_perl/app_perl_mod.c +++ b/modules/app_perl/app_perl_mod.c @@ -209,6 +209,7 @@ PerlInterpreter *parser_init(void) { int modpathset_start = 0; int modpathset_end = 0; int i; + int pr; new_perl = perl_alloc(); @@ -249,8 +250,9 @@ PerlInterpreter *parser_init(void) { argv[argc] = filename; /* The script itself */ argc++; - if (perl_parse(new_perl, xs_init, argc, argv, NULL)) { - LM_ERR("failed to load perl file \"%s\".\n", argv[argc-1]); + pr=perl_parse(new_perl, xs_init, argc, argv, NULL); + if (pr) { + LM_ERR("failed to load perl file \"%s\" with code %d.\n", argv[argc-1], pr); if (modpathset_start) { for (i = modpathset_start; i <= modpathset_end; i++) { pkg_free(argv[i]);

1 0

git:master: app_perl: print return code if perl_parse() failes
by Daniel-Constantin Mierla 16 Apr '14

16 Apr '14

Module: sip-router Branch: master Commit: 6c5ebff42c1ee702ab4a859ffdd5ffeccbf8e11d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c5ebff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 16 12:14:44 2014 +0200 app_perl: print return code if perl_parse() failes --- modules/app_perl/app_perl_mod.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/app_perl/app_perl_mod.c b/modules/app_perl/app_perl_mod.c index 3948bbe..625fec3 100644 --- a/modules/app_perl/app_perl_mod.c +++ b/modules/app_perl/app_perl_mod.c @@ -209,6 +209,7 @@ PerlInterpreter *parser_init(void) { int modpathset_start = 0; int modpathset_end = 0; int i; + int pr; new_perl = perl_alloc(); @@ -249,8 +250,9 @@ PerlInterpreter *parser_init(void) { argv[argc] = filename; /* The script itself */ argc++; - if (perl_parse(new_perl, xs_init, argc, argv, NULL)) { - LM_ERR("failed to load perl file \"%s\".\n", argv[argc-1]); + pr=perl_parse(new_perl, xs_init, argc, argv, NULL); + if (pr) { + LM_ERR("failed to load perl file \"%s\" with code %d.\n", argv[argc-1], pr); if (modpathset_start) { for (i = modpathset_start; i <= modpathset_end; i++) { pkg_free(argv[i]);

1 0

[tracker] Task closed: Change default max_limit in maxfwd module to RfC3261 recommended value
by sip-router 16 Apr '14

16 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#418 - Change default max_limit in maxfwd module to RfC3261 recommended value User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: Pushed to git master branch. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=418 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

git:master: maxfwd: max_limit default value set to 70
by Daniel-Constantin Mierla 16 Apr '14

16 Apr '14

Module: sip-router Branch: master Commit: 73c440e87fc256cda99ab572c0a259c13acac700 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73c440e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 16 08:41:51 2014 +0200 maxfwd: max_limit default value set to 70 - recommended value by RFC - lower value can create issues when terminating to PSTN/ISUP where can be used to set the Hop Counter - patch by Sebastian Damm, FS#418 --- modules/maxfwd/README | 2 +- modules/maxfwd/doc/maxfwd_admin.xml | 2 +- modules/maxfwd/maxfwd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/maxfwd/README b/modules/maxfwd/README index 764f8f5..f381e66 100644 --- a/modules/maxfwd/README +++ b/modules/maxfwd/README @@ -107,7 +107,7 @@ Chapter 1. Admin Guide MAX-FORWARDS value allowed by RFC 3261. The value can be changed at runtime. - Default value is "16". + Default value is "70". Example 1.1. Set max_limit parameter ... diff --git a/modules/maxfwd/doc/maxfwd_admin.xml b/modules/maxfwd/doc/maxfwd_admin.xml index f0f3463..3e5812b 100644 --- a/modules/maxfwd/doc/maxfwd_admin.xml +++ b/modules/maxfwd/doc/maxfwd_admin.xml @@ -78,7 +78,7 @@ </para> <para> <emphasis> - Default value is <quote>16</quote>. + Default value is <quote>70</quote>. </emphasis> </para> <example> diff --git a/modules/maxfwd/maxfwd.c b/modules/maxfwd/maxfwd.c index 371a1aa..c835610 100644 --- a/modules/maxfwd/maxfwd.c +++ b/modules/maxfwd/maxfwd.c @@ -55,7 +55,7 @@ struct cfg_group_maxfwd { }; static struct cfg_group_maxfwd default_maxfwd_cfg = { - .max_limit=16 + .max_limit=70 }; static void *maxfwd_cfg = &default_maxfwd_cfg;

2 2

git:master: kamailio.cfg: enable_full_lr set to 0
by Daniel-Constantin Mierla 16 Apr '14

16 Apr '14

Module: sip-router Branch: master Commit: c90369b406db09e9e3d9d690ed3d7742b5cc5c48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c90369b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 15 14:19:51 2014 +0200 kamailio.cfg: enable_full_lr set to 0 - it is default RFC recommendation and what of most UAs expect today - lr=on was needed for some old UAs that were discontinued meanwhile --- etc/kamailio.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 73079db..13ceb7a 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -300,8 +300,8 @@ modparam("tm", "fr_inv_timer", 120000) # ----- rr params ----- -# add value to ;lr param to cope with most of the UAs -modparam("rr", "enable_full_lr", 1) +# set next param to 1 to add value to ;lr param (helps with some UAs) +modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0)

2 2

git:4.1: tm: fix condition added in previous commit testing xavp list addition to core
by Daniel-Constantin Mierla 15 Apr '14

15 Apr '14

Module: sip-router Branch: 4.1 Commit: bebffc9a3a51083b0f93d664f27bd1d1afdc351a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bebffc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 15 18:53:34 2014 +0200 tm: fix condition added in previous commit testing xavp list addition to core (cherry picked from commit 09d136d053cde9a59c6f2937b8e1fa56f590fad0) --- modules/tm/t_serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 0db4535..8fdfeaf 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -155,7 +155,7 @@ void add_contacts_avp(str *uri, str *dst_uri, str *path, str *sock_str, val.type = SR_XTYPE_XAVP; val.v.xavp = record; - if(xavp_add_value(&contacts_avp, &val, NULL)) { + if(xavp_add_value(&contacts_avp, &val, NULL)==NULL) { /* failed to add xavps to root list */ LM_ERR("failed to add xavps to root list\n"); xavp_destroy_list(&record);

1 0

git:master: tm: fix condition added in previous commit testing xavp list addition to core
by Daniel-Constantin Mierla 15 Apr '14

15 Apr '14

Module: sip-router Branch: master Commit: 09d136d053cde9a59c6f2937b8e1fa56f590fad0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09d136d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 15 18:53:34 2014 +0200 tm: fix condition added in previous commit testing xavp list addition to core --- modules/tm/t_serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 0db4535..8fdfeaf 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -155,7 +155,7 @@ void add_contacts_avp(str *uri, str *dst_uri, str *path, str *sock_str, val.type = SR_XTYPE_XAVP; val.v.xavp = record; - if(xavp_add_value(&contacts_avp, &val, NULL)) { + if(xavp_add_value(&contacts_avp, &val, NULL)==NULL) { /* failed to add xavps to root list */ LM_ERR("failed to add xavps to root list\n"); xavp_destroy_list(&record);

1 0

git:4.1: tm: safety check for cases when xavps for serial forking fail to be added to root list
by Daniel-Constantin Mierla 15 Apr '14

15 Apr '14

Module: sip-router Branch: 4.1 Commit: 1c28c45facf8c87e805aff62e7f4da1a03c9aa8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c28c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 15 18:19:19 2014 +0200 tm: safety check for cases when xavps for serial forking fail to be added to root list - in error cases remove xavp group from the root list instead of local destroy, otherwise it stays linked in root list and can cause invalid memory access - discovered on investigating memory leak issue reported by Geoffrey M. (cherry picked from commit 4f95cfa6266bd66a1516629ed3445d98da433b2b) --- modules/tm/t_serial.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 62200ad..0db4535 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -155,7 +155,11 @@ void add_contacts_avp(str *uri, str *dst_uri, str *path, str *sock_str, val.type = SR_XTYPE_XAVP; val.v.xavp = record; - xavp_add_value(&contacts_avp, &val, NULL); + if(xavp_add_value(&contacts_avp, &val, NULL)) { + /* failed to add xavps to root list */ + LM_ERR("failed to add xavps to root list\n"); + xavp_destroy_list(&record); + } } /* @@ -383,7 +387,11 @@ void add_contact_flows_avp(str *uri, str *dst_uri, str *path, str *sock_str, val.type = SR_XTYPE_XAVP; val.v.xavp = record; - xavp_add_value(&contact_flows_avp, &val, NULL); + if(xavp_add_value(&contact_flows_avp, &val, NULL)==NULL) { + /* failed to add xavps to root list */ + LM_ERR("failed to add xavps to root list\n"); + xavp_destroy_list(&record); + } } /* @@ -449,13 +457,13 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) if (parse_phostport(sock_str.s, &host.s, &host.len, &port, &proto) != 0) { LM_ERR("parsing of socket info <%s> failed\n", sock_str.s); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } sock = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); if (sock == 0) { - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } } else { @@ -574,14 +582,14 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) != 0) { LM_ERR("parsing of socket info <%s> failed\n", sock_str.s); free_instance_list(il); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } sock = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); if (sock == 0) { free_instance_list(il); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } } else { @@ -659,7 +667,7 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) &ruid, &location_ua) != 1) { LM_ERR("appending branch failed\n"); free_instance_list(il); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } @@ -795,7 +803,7 @@ int t_next_contact_flow(struct sip_msg* msg, char* key, char* value) if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, &instance, 0, &ruid, &location_ua) != 1) { LM_ERR("appending branch failed\n"); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; }

1 0

git:master: tm: safety check for cases when xavps for serial forking fail to be added to root list
by Daniel-Constantin Mierla 15 Apr '14

15 Apr '14

Module: sip-router Branch: master Commit: 4f95cfa6266bd66a1516629ed3445d98da433b2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f95cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 15 18:19:19 2014 +0200 tm: safety check for cases when xavps for serial forking fail to be added to root list - in error cases remove xavp group from the root list instead of local destroy, otherwise it stays linked in root list and can cause invalid memory access - discovered on investigating memory leak issue reported by Geoffrey M. --- modules/tm/t_serial.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 62200ad..0db4535 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -155,7 +155,11 @@ void add_contacts_avp(str *uri, str *dst_uri, str *path, str *sock_str, val.type = SR_XTYPE_XAVP; val.v.xavp = record; - xavp_add_value(&contacts_avp, &val, NULL); + if(xavp_add_value(&contacts_avp, &val, NULL)) { + /* failed to add xavps to root list */ + LM_ERR("failed to add xavps to root list\n"); + xavp_destroy_list(&record); + } } /* @@ -383,7 +387,11 @@ void add_contact_flows_avp(str *uri, str *dst_uri, str *path, str *sock_str, val.type = SR_XTYPE_XAVP; val.v.xavp = record; - xavp_add_value(&contact_flows_avp, &val, NULL); + if(xavp_add_value(&contact_flows_avp, &val, NULL)==NULL) { + /* failed to add xavps to root list */ + LM_ERR("failed to add xavps to root list\n"); + xavp_destroy_list(&record); + } } /* @@ -449,13 +457,13 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) if (parse_phostport(sock_str.s, &host.s, &host.len, &port, &proto) != 0) { LM_ERR("parsing of socket info <%s> failed\n", sock_str.s); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } sock = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); if (sock == 0) { - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } } else { @@ -574,14 +582,14 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) != 0) { LM_ERR("parsing of socket info <%s> failed\n", sock_str.s); free_instance_list(il); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } sock = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); if (sock == 0) { free_instance_list(il); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } } else { @@ -659,7 +667,7 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) &ruid, &location_ua) != 1) { LM_ERR("appending branch failed\n"); free_instance_list(il); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; } @@ -795,7 +803,7 @@ int t_next_contact_flow(struct sip_msg* msg, char* key, char* value) if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, &instance, 0, &ruid, &location_ua) != 1) { LM_ERR("appending branch failed\n"); - xavp_destroy_list(&xavp_list); + xavp_rm(xavp_list, NULL); return -1; }

1 0

git:4.1: tm: free extra attributes stored in uac branch
by Daniel-Constantin Mierla 15 Apr '14

15 Apr '14

Module: sip-router Branch: 4.1 Commit: d921b452687a31ab49b7c5c4420c0c6134916140 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d921b45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 15 17:50:52 2014 +0200 tm: free extra attributes stored in uac branch - credits to Geoffrey M. for reporting and giving access for troubleshooting (cherry picked from commit c5e0bda5e20adeaa2a899fcc55ad12cf4678cf39) --- modules/tm/h_table.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 26ca3e3..db93725 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -210,6 +210,15 @@ void free_cell( struct cell* dead_cell ) if (unlikely(dead_cell->uac[i].path.s)) { shm_free_unsafe(dead_cell->uac[i].path.s); } + if (unlikely(dead_cell->uac[i].instance.s)) { + shm_free_unsafe(dead_cell->uac[i].instance.s); + } + if (unlikely(dead_cell->uac[i].ruid.s)) { + shm_free_unsafe(dead_cell->uac[i].ruid.s); + } + if (unlikely(dead_cell->uac[i].location_ua.s)) { + shm_free_unsafe(dead_cell->uac[i].location_ua.s); + } } #ifdef WITH_AS_SUPPORT

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
31
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 2014