sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: core:forward.c Fixed small error caused by unlikely usage.

by Marius Zbihlei

Module: sip-router Branch: master Commit: 6cfee82666b78400d5ff15c49aac1441cfbbaaf6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6cfee82… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Nov 4 17:14:56 2010 +0200 core:forward.c Fixed small error caused by unlikely usage. --- forward.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index 3d7aed1..175f54b 100644 --- a/forward.c +++ b/forward.c @@ -175,7 +175,7 @@ retry: if( !mhomed_sock_cache_disabled ){ /* some Linux kernel versions (all?) along with other UNIXes don't re-bound the sock if already bound */ /* to un-bound a socket set sin_family to AF_UNSPEC and zero out the rest*/ - if (unlikely(connect(*temp_sock, &uncon.s, sockaddru_len(uncon))) < 0) + if (unlikely(connect(*temp_sock, &uncon.s, sockaddru_len(uncon)) < 0)) mhomed_sock_cache_disabled = 1; }

14 years, 3 months

git:master: core/forward.c Fixed mhomed behavior.

by Marius Zbihlei

Module: sip-router Branch: master Commit: ef0dd4e3f0837753ac18d58606078d8595f24dc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef0dd4e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Nov 4 16:11:41 2010 +0200 core/forward.c Fixed mhomed behavior. As connect() dones't re-bound a UDP sock if the socket is already bound to an interface, first unbind the socket by connecting to AF_UNSPEC --- forward.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index 25bc11d..3d7aed1 100644 --- a/forward.c +++ b/forward.c @@ -131,6 +131,10 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto) union sockaddr_union from; struct socket_info* si; struct ip_addr ip; + union sockaddr_union uncon; + + memset(&uncon, 0, sizeof(union sockaddr_union)); + uncon.sin.sin_family = AF_UNSPEC; if (unlikely(proto!=PROTO_UDP)) { LOG(L_CRIT, "BUG: get_out_socket can only be called for UDP\n"); @@ -167,6 +171,14 @@ retry: return 0; } } + + if( !mhomed_sock_cache_disabled ){ + /* some Linux kernel versions (all?) along with other UNIXes don't re-bound the sock if already bound */ + /* to un-bound a socket set sin_family to AF_UNSPEC and zero out the rest*/ + if (unlikely(connect(*temp_sock, &uncon.s, sockaddru_len(uncon))) < 0) + mhomed_sock_cache_disabled = 1; + } + if (unlikely(connect(*temp_sock, &to->s, sockaddru_len(*to))==-1)) { if (unlikely(errno==EISCONN && !mhomed_sock_cache_disabled)){ /* no multiple connects support on the same socket */

14 years, 3 months

SF.net SVN: openser:[6050] branches/1.5/forward.c

by Marius Zbihlei

Revision: 6050 http://openser.svn.sourceforge.net/openser/?rev=6050&view=rev Author: mariuszbihlei Date: 2010-11-04 13:07:25 +0000 (Thu, 04 Nov 2010) Log Message: ----------- core/forward.c Some Linux kernels, (tested on 2.6.26 and 2.6.32) don't re-bound a UDP sock if the socket is already bound to an interface when doing connect(). Modified Paths: -------------- branches/1.5/forward.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 3 months

SF.net SVN: openser:[6049] branches/1.5/modules/dialog/dlg_handlers.c

by Timo Reimann

Revision: 6049 http://openser.svn.sourceforge.net/openser/?rev=6049&view=rev Author: timoreimann Date: 2010-11-02 18:21:32 +0000 (Tue, 02 Nov 2010) Log Message: ----------- modules/dialog: Enhance unref_dlg_from_cb() robustness. - Check parameter for NULL pointer. - Call unreference_dlg(), thus being more wrapper-ish. - Fix indention. Backport from git commit 75fc49f74d13774f1ecc0cdd8f0adfe168915b4f. Modified Paths: -------------- branches/1.5/modules/dialog/dlg_handlers.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 3 months

git:3.1: modules_k/dialog: Enhance unref_dlg_from_cb() robustness.

by Timo Reimann

Module: sip-router Branch: 3.1 Commit: 849a667f74a1c2dd543c52e7be9b4e8a05a0bcfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=849a667… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Nov 2 19:06:12 2010 +0100 modules_k/dialog: Enhance unref_dlg_from_cb() robustness. - Check parameter for NULL pointer. - Call unreference_dlg(), thus being more wrapper-ish. - Fix indention. (cherry picked from commit 75fc49f74d13774f1ecc0cdd8f0adfe168915b4f) --- modules_k/dialog/dlg_handlers.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ebed8a9..a118a91 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -820,10 +820,13 @@ static void unreference_dialog(void *dialog) */ static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *param) { - struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + + if (!dlg) + return; /* destroy dialog */ - unref_dlg(dlg, 1); + unreference_dialog(dlg); }

14 years, 3 months

git:master: modules_k/dialog: Enhance unref_dlg_from_cb() robustness.

by Timo Reimann

Module: sip-router Branch: master Commit: 75fc49f74d13774f1ecc0cdd8f0adfe168915b4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75fc49f… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Nov 2 19:06:12 2010 +0100 modules_k/dialog: Enhance unref_dlg_from_cb() robustness. - Check parameter for NULL pointer. - Call unreference_dlg(), thus being more wrapper-ish. - Fix indention. --- modules_k/dialog/dlg_handlers.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index ebed8a9..a118a91 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -820,10 +820,13 @@ static void unreference_dialog(void *dialog) */ static void unref_dlg_from_cb(struct cell* t, int type, struct tmcb_params *param) { - struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + struct dlg_cell *dlg = (struct dlg_cell *)(*param->param); + + if (!dlg) + return; /* destroy dialog */ - unref_dlg(dlg, 1); + unreference_dialog(dlg); }

14 years, 3 months

git:kamailio_3.0: trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: 0c36835ce2cce98454cd10bd53f855787f1bbc9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c36835… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Nov 2 11:45:15 2010 +0200 trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 (cherry picked from commit 49837c37aea72c1e4f0cc3290382c0adbf72e3f8) --- lib/trie/dtrie.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 9965263..90cb52f 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -39,8 +39,6 @@ #include "dtrie.h" -#include <assert.h> - #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../mem/mem.h" @@ -142,12 +140,20 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); - assert(node->child[digit] != NULL); + if(node->child[digit] == NULL ){ + SHM_MEM_ERROR; + return -1; + } + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); - assert(node->child[digit]->child != NULL); + if(node->child[digit]->child == NULL){ + SHM_MEM_ERROR; + shm_free(node->child[digit]); + return -1; + } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child);

14 years, 3 months

git:3.1: trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used

by Marius Zbihlei

Module: sip-router Branch: 3.1 Commit: 759083ad159e3a9d5b52501b2f1f99a6976f9aeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=759083a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Nov 2 11:45:15 2010 +0200 trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 (cherry picked from commit 49837c37aea72c1e4f0cc3290382c0adbf72e3f8) --- lib/trie/dtrie.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 9965263..90cb52f 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -39,8 +39,6 @@ #include "dtrie.h" -#include <assert.h> - #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../mem/mem.h" @@ -142,12 +140,20 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); - assert(node->child[digit] != NULL); + if(node->child[digit] == NULL ){ + SHM_MEM_ERROR; + return -1; + } + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); - assert(node->child[digit]->child != NULL); + if(node->child[digit]->child == NULL){ + SHM_MEM_ERROR; + shm_free(node->child[digit]); + return -1; + } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child);

14 years, 3 months

git:master: trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used

by Marius Zbihlei

Module: sip-router Branch: master Commit: 49837c37aea72c1e4f0cc3290382c0adbf72e3f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49837c3… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Nov 2 11:45:15 2010 +0200 trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 --- lib/trie/dtrie.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 9965263..90cb52f 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -39,8 +39,6 @@ #include "dtrie.h" -#include <assert.h> - #include "../../dprint.h" #include "../../mem/shm_mem.h" #include "../../mem/mem.h" @@ -142,12 +140,20 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i if (node->child[digit] == NULL) { node->child[digit] = shm_malloc(sizeof(struct dtrie_node_t)); - assert(node->child[digit] != NULL); + if(node->child[digit] == NULL ){ + SHM_MEM_ERROR; + return -1; + } + LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); - assert(node->child[digit]->child != NULL); + if(node->child[digit]->child == NULL){ + SHM_MEM_ERROR; + shm_free(node->child[digit]); + return -1; + } LM_DBG("allocate %lu bytes for %d root children pointer at %p\n", (long unsigned)sizeof(struct dtrie_node_t *) * branches, branches, node->child[digit]->child);

14 years, 3 months

SF.net SVN: openser:[6048] branches/1.5/trie/dtrie.c

by Marius Zbihlei

Revision: 6048 http://openser.svn.sourceforge.net/openser/?rev=6048&view=rev Author: mariuszbihlei Date: 2010-11-02 09:40:31 +0000 (Tue, 02 Nov 2010) Log Message: ----------- trie API Fixed dtrie_insert OOM handling, where assert() was wrongfully used Now the function behaves as expected, freeing previous allocated resources, logging the OOM condition , and returning -1 Modified Paths: -------------- branches/1.5/trie/dtrie.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev