sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:3.1: tm: t_pick_branch() cannot ingnore the pending blined UACs

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 2b0aabbfa20de81d3c65464c17ca0d90889721f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b0aabb… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 10 14:26:14 2011 +0100 tm: t_pick_branch() cannot ingnore the pending blined UACs Empty branches shall be considered pending branches before their final response is set. When all the responses were dropped in failure route and a new blind UAC was added, t_pick_branch() did not realize that there is still at least one pending branch, it returned an error instead. Later on, the blind UAC was tried to be canceled causing deadlock. (cherry picked from commit 17fc9913737cf3314d317d9b62cfd3dc05f8376e) --- modules/tm/t_reply.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index c18c716..e65d1b9 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1042,8 +1042,11 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) } continue; } - /* skip 'empty branches' */ - if (!t->uac[b].request.buffer) continue; + /* skip 'empty branches' + * An empty branch without a final response is still considered + * to be a pending, incomplete branch. */ + if ((!t->uac[b].request.buffer) && (t->uac[b].last_received>=200)) + continue; /* there is still an unfinished UAC transaction; wait now! */ if ( t->uac[b].last_received<200 ) return -2;

13 years, 9 months

git:master: core xavp: refurbised xavp_print_list()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 395e0dae1ec45452e5d445ea3061f798b7877bba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=395e0da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 6 11:19:56 2011 +0100 core xavp: refurbised xavp_print_list() - print the level of xavp list --- xavp.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xavp.c b/xavp.c index 6b19d40..a008afd 100644 --- a/xavp.c +++ b/xavp.c @@ -459,15 +459,17 @@ sr_xavp_t **xavp_get_crt_list(void) return _xavp_list_crt; } -void xavp_print_list(sr_xavp_t **head) +void xavp_print_list_content(sr_xavp_t **head, int level) { sr_xavp_t *avp=0; + sr_xavp_t *start=0; if(head!=NULL) - avp = *head; + start = *head; else - avp=*_xavp_list_crt; - LM_DBG("+++++ XAVP list: %p\n", avp); + start=*_xavp_list_crt; + LM_DBG("+++++ start XAVP list: %p (level=%d)\n", start, level); + avp = start; while(avp) { LM_DBG(" *** XAVP name: %s\n", avp->name.s); @@ -494,7 +496,7 @@ void xavp_print_list(sr_xavp_t **head) break; case SR_XTYPE_XAVP: LM_DBG(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); - xavp_print_list(&avp->val.v.xavp); + xavp_print_list_content(&avp->val.v.xavp, level+1); break; case SR_XTYPE_DATA: LM_DBG(" XAVP value: <data:%p>\n", avp->val.v.data); @@ -502,7 +504,11 @@ void xavp_print_list(sr_xavp_t **head) } avp = avp->next; } - LM_DBG("----- XAVP list\n"); + LM_DBG("----- end XAVP list: %p (level=%d)\n", start, level); } +void xavp_print_list(sr_xavp_t **head) +{ + xavp_print_list_content(head, 0); +} #endif

13 years, 9 months

git:master: pv: reset the index for inner fields of xavp PV

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d202b9dc49565aa13c96ed75dc67bc9e389a212a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d202b9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 6 11:38:35 2011 +0100 pv: reset the index for inner fields of xavp PV - reported by Alex Hermann --- modules_k/pv/pv_xavp.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv_xavp.c b/modules_k/pv/pv_xavp.c index 34dd91b..e706d04 100644 --- a/modules_k/pv/pv_xavp.c +++ b/modules_k/pv/pv_xavp.c @@ -99,7 +99,7 @@ int pv_get_xavp(struct sip_msg *msg, pv_param_t *param, if(idx<0) { count = xavp_count(&xname->name, NULL); - idx = count + idx + 1; + idx = count + idx; } avp = xavp_get_by_index(&xname->name, idx, NULL); if(avp==NULL) @@ -107,6 +107,8 @@ int pv_get_xavp(struct sip_msg *msg, pv_param_t *param, if(xname->next==NULL) return pv_xavp_get_value(msg, param, res, avp); + idx = 0; + idxf = 0; if(xname->next->index.type==PVT_EXTRA) { /* get the index */ @@ -120,7 +122,7 @@ int pv_get_xavp(struct sip_msg *msg, pv_param_t *param, if(idx<0) { count = xavp_count(&xname->next->name, &avp->val.v.xavp); - idx = count + idx + 1; + idx = count + idx; } avp = xavp_get_by_index(&xname->next->name, idx, &avp->val.v.xavp); if(avp==NULL)

13 years, 9 months

git:master: core: enable dumpable flag after setuid() on Linux

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f4136d7742b0b0bfc09a9157d573c8a7f6118b76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4136d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 6 00:51:41 2011 +0100 core: enable dumpable flag after setuid() on Linux - init rlimit struct for proper dbg message when core limits are not changed --- daemonize.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- daemonize.h | 2 +- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/daemonize.c b/daemonize.c index 7411652..f131212 100644 --- a/daemonize.c +++ b/daemonize.c @@ -58,6 +58,10 @@ #include <pwd.h> #include <grp.h> +#ifdef __OS_linux +#include <sys/prctl.h> +#endif + #ifdef HAVE_SCHED_SETSCHEDULER #include <sched.h> #endif @@ -202,6 +206,40 @@ void daemon_status_no_wait() } +/** + * enable dumpable flag for core dumping after setuid() & friends + * @return 0 when no critical error occured, -1 on such error + */ +int enable_dumpable(void) +{ +#ifdef __OS_linux + struct rlimit lim; + /* re-enable core dumping on linux after setuid() & friends */ + if(disable_core_dump==0) { + LM_DBG("trying enable core dumping...\n"); + if(prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)<=0) { + LM_DBG("core dumping is disabled now...\n"); + if(prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)<0) { + LM_WARN("cannot re-enable core dumping!\n"); + } else { + LM_DBG("core dumping has just been enabled...\n"); + if (getrlimit(RLIMIT_CORE, &lim)<0){ + LOG(L_CRIT, "cannot get the maximum core size: %s\n", + strerror(errno)); + return -1; + } else { + DBG("current core file limit: %lu (max: %lu)\n", + (unsigned long)lim.rlim_cur, (unsigned long)lim.rlim_max); + } + } + } else { + LM_DBG("core dumping is enabled now (%d)...\n", + prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)); + } + } +#endif + return 0; +} /** daemon init. *@param name - daemon name used for logging (used when opening syslog). @@ -289,6 +327,10 @@ int daemonize(char* name, int status_wait) exit(0); } } + + if(enable_dumpable()<0) + goto error; + /* added by noh: create a pid file for the main process */ if (pid_file!=0){ @@ -415,6 +457,10 @@ int do_suid() goto error; } } + + if(enable_dumpable()<0) + goto error; + return 0; error: return -1; @@ -477,7 +523,7 @@ error: /*! \brief enable core dumps */ -int set_core_dump(int enable, int size) +int set_core_dump(int enable, long unsigned int size) { struct rlimit lim; struct rlimit newlim; @@ -510,8 +556,11 @@ int set_core_dump(int enable, int size) (unsigned long)lim.rlim_max); } goto error; /* it's an error we haven't got the size we wanted*/ + }else{ + newlim.rlim_cur=lim.rlim_cur; + newlim.rlim_max=lim.rlim_max; + goto done; /*nothing to do */ } - goto done; /*nothing to do */ }else{ /* disable */ newlim.rlim_cur=0; diff --git a/daemonize.h b/daemonize.h index 622a710..9003a01 100644 --- a/daemonize.h +++ b/daemonize.h @@ -30,7 +30,7 @@ int daemonize(char* name, int daemon_status_fd_input); int do_suid(); int increase_open_fds(int target); -int set_core_dump(int enable, int size); +int set_core_dump(int enable, long unsigned int size); int mem_lock_pages(); int set_rt_prio(int prio, int policy);

13 years, 9 months

git:master: ser_stun: update to RFC 5389

by Alfred E. Heggestad

Module: sip-router Branch: master Commit: 7caa03982b482e9f8b84abc9b671e8df36f66713 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7caa039… Author: Alfred E. Heggestad <aeh(a)db.org> Committer: Alfred E. Heggestad <aeh(a)db.org> Date: Tue Feb 22 11:13:14 2011 +0100 ser_stun: update to RFC 5389 - Removing checking/adding of FINGERPRINT attibute - Update some attribute values according to new spec - Fix endianess of XOR-MAPPED-ADDRESS --- ser_stun.c | 153 ++++-------------------------------------------------------- ser_stun.h | 9 +-- 2 files changed, 13 insertions(+), 149 deletions(-) diff --git a/ser_stun.c b/ser_stun.c index 6957a88..7eb2cf5 100644 --- a/ser_stun.c +++ b/ser_stun.c @@ -64,9 +64,7 @@ int stun_add_address_attr(struct stun_msg* res, int do_xor); int add_unknown_attr(struct stun_msg* res, struct stun_unknown_att* unknown); int add_error_code(struct stun_msg* res, USHORT_T error_code); -int add_fingerprint(struct stun_buffer* msg); int copy_str_to_buffer(struct stun_msg* res, const char* data, UINT_T pad); -int validate_fingerprint(struct stun_msg* req, USHORT_T* error_code); int reallock_buffer(struct stun_buffer* buffer, UINT_T len); int buf_copy(struct stun_buffer* msg, void* source, UINT_T len); void clean_memory(struct stun_msg* req, @@ -231,11 +229,9 @@ int stun_parse_body( struct stun_unknown_att* tmp_unknown; struct stun_unknown_att* body; char* buf; - int fp_present; attr_size = sizeof(struct stun_attr); buf = &req->msg.buf.s[sizeof(struct stun_hdr)]; - fp_present = 0; /* * Mark the body lenght as unparsed. @@ -286,7 +282,6 @@ int stun_parse_body( case MAPPED_ADDRESS_ATTR: case XOR_MAPPED_ADDRESS_ATTR: case ALTERNATE_SERVER_ATTR: - case REFRESH_INTERVAL_ATTR: case RESPONSE_ADDRESS_ATTR: case SOURCE_ADDRESS_ATTR: case REFLECTED_FROM_ATTR: @@ -300,10 +295,9 @@ int stun_parse_body( /* following attributes must be padded to 4 bytes */ case USERNAME_ATTR: - case PASSWORD_ATTR: case ERROR_CODE_ATTR: case UNKNOWN_ATTRIBUTES_ATTR: - case SERVER_ATTR: + case SOFTWARE_ATTR: padded_len = PADDED_TO_FOUR(ntohs(attr.len)); #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_parse_body: padded to four\n"); @@ -322,25 +316,8 @@ int stun_parse_body( #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_parse_body: fingerprint attribute found\n"); #endif - fp_present = 1; - if (ntohs(attr.len) != SHA_DIGEST_LENGTH) { - LOG(L_WARN, - "WARNING: STUN: Incorrect fingerprint of request.\n"); - *error_code = BAD_REQUEST_ERR; - continue; - } - - memcpy(req->fp, buf, SHA_DIGEST_LENGTH); - if(stun_allow_fp) { - if (validate_fingerprint(req, error_code) != 0) { - LOG(L_WARN, - "WARNING: STUN: Incorrect fingerprint of request.\n"); - *error_code = BAD_REQUEST_ERR; - continue; - } - } - padded_len = SHA_DIGEST_LENGTH; + if (not_parsed > SHA_DIGEST_LENGTH) { #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_parse_body: fingerprint is not the last attribute\n"); @@ -396,14 +373,6 @@ int stun_parse_body( *error_code = UNKNOWN_ATTRIBUTE_ERR; } - if (fp_present == 0 && req->old == 0) { -#ifdef EXTRA_DEBUG - LOG(L_DBG, "DEBUG: stun_parse_body: fingerprint is missing is this new request\n"); -#endif - /* missing mandatory attribute fingerprint */ - *error_code = BAD_REQUEST_ERR; - } - return 0; } @@ -431,7 +400,6 @@ int stun_create_response( struct stun_unknown_att* unknown, UINT_T error_code) { - UINT_T msg_len; /* * Alloc some space for response. * Optimalization? - maybe it would be better to use biggish static array. @@ -480,14 +448,6 @@ int stun_create_response( #endif return FATAL_ERROR; } - - if (stun_add_common_integer_attr(res, REFRESH_INTERVAL_ATTR, - stun_refresh_interval) != 0) { -#ifdef EXTRA_DEBUG - LOG(L_DBG, "DEBUG: stun_create_response: failed to common attributes\n"); -#endif - return FATAL_ERROR; - } } else { if (stun_add_address_attr(res, ri->src_ip.af, ri->src_port, @@ -532,10 +492,10 @@ int stun_create_response( if (req->old == 0) { /* - * add optional information about server; attribute SERVER is not a part of - * rfc3489.txt + * add optional information about server; attribute SOFTWARE is part of + * rfc5389.txt * */ - if (stun_add_common_text_attr(res, SERVER_ATTR, SERVER_HDR, PAD4)!=0) { + if (stun_add_common_text_attr(res, SOFTWARE_ATTR, SERVER_HDR, PAD4)!=0) { #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_create_response: failed to add common text attribute\n"); #endif @@ -543,28 +503,9 @@ int stun_create_response( } } - if (req->old == 0 && stun_allow_fp) { - /* count length of body except header and fingerprint - * and copy message length at the beginning of buffer - */ - msg_len = res->msg.buf.len - sizeof(struct stun_hdr); - msg_len += SHA_DIGEST_LENGTH + sizeof(struct stun_attr); - res->hdr.len = htons(msg_len); - memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *) &res->hdr.len, - sizeof(USHORT_T)); - - if (add_fingerprint(&res->msg) != 0) { -#ifdef EXTRA_DEBUG - LOG(L_DBG, "DEBUG: stun_create_response: failed to add fingerprint\n"); -#endif - return FATAL_ERROR; - } - } - else { - res->hdr.len = htons(res->msg.buf.len - sizeof(struct stun_hdr)); - memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *) &res->hdr.len, - sizeof(USHORT_T)); - } + res->hdr.len = htons(res->msg.buf.len - sizeof(struct stun_hdr)); + memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *) &res->hdr.len, + sizeof(USHORT_T)); return 0; } @@ -824,14 +765,14 @@ int stun_add_address_attr(struct stun_msg* res, ip_struct_len = 0; attr.type = htons(type); - res->ip_addr.port = (do_xor) ? htons(port) ^ MAGIC_COOKIE_2B : htons(port); + res->ip_addr.port = htons((do_xor) ? (port ^ MAGIC_COOKIE_2B) : port); switch(af) { case AF_INET: ip_struct_len = sizeof(struct stun_ip_addr) - 3*sizeof(UINT_T); res->ip_addr.family = htons(IPV4_FAMILY); memcpy(res->ip_addr.ip, ip_addr, IPV4_LEN); res->ip_addr.ip[0] = (do_xor) ? - res->ip_addr.ip[0] ^ MAGIC_COOKIE : res->ip_addr.ip[0]; + res->ip_addr.ip[0] ^ htonl(MAGIC_COOKIE) : res->ip_addr.ip[0]; break; #ifdef USE_IPV6 case AF_INET6: @@ -865,48 +806,6 @@ int stun_add_address_attr(struct stun_msg* res, } /* - * add_fingerprint() - * - msg: response buffer - * - * The function add_fingerprint ensures adding fingerprint attribute into - * response buffer. - * - * Return value: 0 if there is no environment error - * -1 if there is some enviroment error such as insufficiency - * of memory - */ -int add_fingerprint(struct stun_buffer* msg) -{ - struct stun_attr attr; - USHORT_T attr_type_size; - - attr_type_size = sizeof(struct stun_attr); - attr.type = htons(FINGERPRINT_ATTR); - attr.len = htons(SHA_DIGEST_LENGTH); - - if (msg->empty < (SHA_DIGEST_LENGTH + attr_type_size)) { - if (reallock_buffer(msg, SHA_DIGEST_LENGTH + attr_type_size) != 0) { - return FATAL_ERROR; - } - } - - memcpy(&msg->buf.s[msg->buf.len], (void *) &attr, attr_type_size); - msg->buf.len += attr_type_size; - msg->empty -= attr_type_size; - - if (SHA1((UCHAR_T *)msg->buf.s, msg->buf.len-attr_type_size, - (UCHAR_T *) &msg->buf.s[msg->buf.len]) == 0) { - LOG(L_ERR, "ERROR: STUN: SHA-1 algorithm failed.\n"); - return FATAL_ERROR; - } - - msg->buf.len += SHA_DIGEST_LENGTH; - msg->empty -= SHA_DIGEST_LENGTH; - - return 0; -} - -/* * stun_alloc_unknown_attr() * - type: type of unknown attribute * @@ -958,38 +857,6 @@ void stun_delete_unknown_attrs(struct stun_unknown_att* unknown) } /* - * validate_fingerprint() - * - req: structure representing request message - * - error_code: indication of any protocol error - * - * The function validate_fingerprint ensures validation of FINGERPRINT - * attribute. - * - * Return value: 0 if there is no environment error - * -1 if there is some enviroment error such as insufficiency - * of memory - */ -int validate_fingerprint(struct stun_msg* req, USHORT_T* error_code) -{ - UCHAR_T msg_digest[SHA_DIGEST_LENGTH]; - UINT_T buf_len; - - buf_len = req->hdr.len + sizeof(struct stun_hdr); - buf_len -= SHA_DIGEST_LENGTH + sizeof(struct stun_attr); - - if (SHA1((UCHAR_T *) req->msg.buf.s, buf_len, msg_digest) == 0) { - LOG(L_ERR, "ERROR: STUN: SHA-1 algorithm failed.\n"); - return FATAL_ERROR; - } - - if (memcmp((void *)req->fp, (void *)&msg_digest, SHA_DIGEST_LENGTH) != 0) { - *error_code = BAD_REQUEST_ERR; - } - - return 0; -} - -/* * buf_copy() * - msg: buffer where the data will be copy to * - source: source data buffer diff --git a/ser_stun.h b/ser_stun.h index 1e6051b..b287a78 100644 --- a/ser_stun.h +++ b/ser_stun.h @@ -56,19 +56,17 @@ typedef unsigned long ULONG_T; /* common STUN attributes */ #define MAPPED_ADDRESS_ATTR 0x0001 #define USERNAME_ATTR 0x0006 -#define PASSWORD_ATTR 0x0007 #define MESSAGE_INTEGRITY_ATTR 0x0008 #define ERROR_CODE_ATTR 0x0009 #define UNKNOWN_ATTRIBUTES_ATTR 0x000A -/* STUN attributes defined by rfc3489bis */ +/* STUN attributes defined by rfc5389 */ #define REALM_ATTR 0x0014 #define NONCE_ATTR 0x0015 #define XOR_MAPPED_ADDRESS_ATTR 0x0020 -#define FINGERPRINT_ATTR 0x0023 -#define SERVER_ATTR 0x8022 +#define FINGERPRINT_ATTR 0x8028 +#define SOFTWARE_ATTR 0x8022 #define ALTERNATE_SERVER_ATTR 0x8023 -#define REFRESH_INTERVAL_ATTR 0x8024 /* STUN attributes defined by rfc3489 */ #define RESPONSE_ADDRESS_ATTR 0x0002 @@ -167,7 +165,6 @@ struct stun_msg { struct stun_hdr hdr; struct stun_ip_addr ip_addr; /* XOR values for rfc3489bis, normal values for rfc3489 */ - char fp[SHA_DIGEST_LENGTH]; /* fingerprint value */ struct stun_buffer msg; UCHAR_T old; /* true: the format of message is in accordance with rfc3489 */

13 years, 9 months

git:master: dialog: safer unref of terminated dialogs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2c28a251a87fd66fa81b4802fe960fef3989fb3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c28a25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 4 22:50:02 2011 +0100 dialog: safer unref of terminated dialogs - if reference counter is already <=0, don't deref anymore, dialog in destroyed state - should protect against bogus dereferencing - reported by Anton Roman --- modules_k/dialog/dlg_hash.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 0c14f05..95e541c 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -543,11 +543,10 @@ void link_dlg(struct dlg_cell *dlg, int n) */ #define unref_dlg_unsafe(_dlg,_cnt,_d_entry) \ do { \ - (_dlg)->ref -= (_cnt); \ - LM_DBG("unref dlg %p with %d -> %d\n",\ + LM_DBG("unref dlg %p with %d, crt ref count: %d\n",\ (_dlg),(_cnt),(_dlg)->ref);\ - if ((_dlg)->ref<0) {\ - LM_CRIT("bogus ref %d with cnt %d for dlg %p [%u:%u] "\ + if ((_dlg)->ref<=0) {\ + LM_CRIT("bogus op: ref %d with cnt %d for dlg %p [%u:%u] "\ "with clid '%.*s' and tags '%.*s' '%.*s'\n",\ (_dlg)->ref, _cnt, _dlg,\ (_dlg)->h_entry, (_dlg)->h_id,\ @@ -556,11 +555,13 @@ void link_dlg(struct dlg_cell *dlg, int n) (_dlg)->tag[DLG_CALLER_LEG].s,\ (_dlg)->tag[DLG_CALLEE_LEG].len,\ (_dlg)->tag[DLG_CALLEE_LEG].s); \ - }\ - if ((_dlg)->ref<=0) { \ - unlink_unsafe_dlg( _d_entry, _dlg);\ - LM_DBG("ref <=0 for dialog %p\n",_dlg);\ - destroy_dlg(_dlg);\ + } else { \ + (_dlg)->ref -= (_cnt); \ + if ((_dlg)->ref<=0) { \ + unlink_unsafe_dlg( _d_entry, _dlg);\ + LM_DBG("ref <=0 for dialog %p\n",_dlg);\ + destroy_dlg(_dlg);\ + }\ }\ }while(0)

13 years, 10 months

git:master: kamailio.cfg: tighten the auth checks for PUBLISH

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8d16577bbcdd7bd84f1767bba76749083c2518fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d16577… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 4 21:44:15 2011 +0100 kamailio.cfg: tighten the auth checks for PUBLISH - based on a patch by Klaus Darilion --- etc/kamailio.cfg | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 6d39ee9..5e6d9f7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -677,10 +677,20 @@ route[AUTH] { } if (is_method("PUBLISH")) { - if ($au!=$tU) { + if ($au!=$fU || $au!=$tU) { sl_send_reply("403","Forbidden auth ID"); exit; } + if ($au!=$rU) { + sl_send_reply("403","Forbidden R-URI"); + exit; + } +#!ifdef WITH_MULTIDOMAIN + if ($fd!=$rd) { + sl_send_reply("403","Forbidden R-URI domain"); + exit; + } +#!endif } else { if ($au!=$fU) { sl_send_reply("403","Forbidden auth ID");

13 years, 10 months

git:3.1: srdb1: warning about different pids for db connection made dbg

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: eb24c1e9c0c2dc12c6cc4cc1536b9873306e79f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb24c1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 4 21:27:14 2011 +0100 srdb1: warning about different pids for db connection made dbg (cherry picked from commit 9fb37a55e0b97a98b7d2d104a7692f18cb3f7df6) --- lib/srdb1/db_id.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index 7a8b5d7..d7fcf02 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -277,7 +277,7 @@ unsigned char cmp_db_id(const struct db_id* id1, const struct db_id* id2) if (strcasecmp(id1->host, id2->host)) return 0; if (strcmp(id1->database, id2->database)) return 0; if(id1->pid!=id2->pid) { - LM_WARN("identical DB URLs, but different DB connection pid [%d/%d]\n", + LM_DBG("identical DB URLs, but different DB connection pid [%d/%d]\n", id1->pid, id2->pid); return 0; }

13 years, 10 months

git:master: srdb1: warning about different pids for db connection made dbg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9fb37a55e0b97a98b7d2d104a7692f18cb3f7df6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fb37a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 4 21:27:14 2011 +0100 srdb1: warning about different pids for db connection made dbg --- lib/srdb1/db_id.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index 2761c65..6b0bb66 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -279,7 +279,7 @@ unsigned char cmp_db_id(const struct db_id* id1, const struct db_id* id2) if (strcasecmp(id1->host, id2->host)) return 0; if (strcmp(id1->database, id2->database)) return 0; if(id1->pid!=id2->pid) { - LM_WARN("identical DB URLs, but different DB connection pid [%d/%d]\n", + LM_DBG("identical DB URLs, but different DB connection pid [%d/%d]\n", id1->pid, id2->pid); return 0; }

13 years, 10 months

PATCH: fix ser_stun.[hc]

by Alfred E. Heggestad

Hi, I have tested the STUN code in sip-router (enabled by make STUN=1) and it became quite clear that this code is based on old I-D's and probably not tested/used against SIP outbound clients implemented according to RFC 5626 this patch fixes some issues, removing the Fingerprint check which is not needed, and fixing the XOR scrambling of XOR-MAPPED-ADDRESS. please review it carefully and apply to your GIT tree if you are happy with it. Signed-Off-By: Alfred E. Heggestad <aeh(a)db.org> --

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011