sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
318 discussions

[tracker] Task closed: SQLOPS returns 0 for empty result set instead of $null
by sip-router 09 Dec '13

09 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#376 - SQLOPS returns 0 for empty result set instead of $null User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=376 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/usrloc deadlock on load/restart
by sip-router 09 Dec '13

09 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#378 - modules/usrloc deadlock on load/restart User who did this - Seudin Kasumovic (seudin) ---------- I tested on 4.1, and it works now! Many thanks, Seudin ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=378#comment1215 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/usrloc deadlock on load/restart
by sip-router 09 Dec '13

09 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#378 - modules/usrloc deadlock on load/restart User who did this - Daniel-Constantin Mierla (miconda) ---------- I pushed a fix on master and 4.1 branches. Thanks for troubleshooting. The explicit lock is not needed as get_urecord_by_ruid() lets the record slot locked. Apparently it was also a mistakenly handled return code. Can you give a try and see if all goes fine now? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=378#comment1214 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:4.1: usrloc: avoid double locking when preloading attributes
by Daniel-Constantin Mierla 09 Dec '13

09 Dec '13

Module: sip-router Branch: 4.1 Commit: 8df9d2336e7de2648288cf8ff6821e6820d88da9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8df9d23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 9 10:06:15 2013 +0100 usrloc: avoid double locking when preloading attributes - reported by Seudin Kasumovic, FS#378 (cherry picked from commit 888635bfa3719afeeea6f5f0d407aa862ceb34ac) --- modules/usrloc/udomain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index a736051..88fc7e4 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -1270,8 +1270,7 @@ int uldb_preload_attrs(udomain_t *_d) suri = user; } - lock_udomain(_d, &suri); - if (get_urecord_by_ruid(_d, ul_get_aorhash(&suri), &ruid, &r, &c) > 0) { + if (get_urecord_by_ruid(_d, ul_get_aorhash(&suri), &ruid, &r, &c) < 0) { /* delete attrs records from db table */ LM_INFO("no contact record for this ruid\n"); uldb_delete_attrs(_d->name, &user, &domain, &ruid); @@ -1287,8 +1286,9 @@ int uldb_preload_attrs(udomain_t *_d) LM_INFO("cannot add values to contact xavp\n"); } } + /* get_urecord_by_ruid() locks the slot */ + unlock_udomain(_d, &suri); } - unlock_udomain(_d, &user); } if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) {

1 0

git:4.1: registrar: handle error case when deleting contact fails for unregister()
by Daniel-Constantin Mierla 09 Dec '13

09 Dec '13

Module: sip-router Branch: 4.1 Commit: efb2670ef03b69cb0ae26e7c9ac427c995ffbacf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efb2670… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 9 10:05:11 2013 +0100 registrar: handle error case when deleting contact fails for unregister() - reformatted file (cherry picked from commit 67d218e29457ffd75148c8c520b26ec6f3f41719) --- modules/registrar/save.c | 103 +++++++++++++++++++++++----------------------- 1 files changed, 52 insertions(+), 51 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index fc5d564..caa81df 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -95,7 +95,7 @@ static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) { urecord_t* r; ucontact_t* c; - + ul.lock_udomain(_d, _a); if (!ul.get_urecord(_d, _a, &r)) { @@ -114,11 +114,11 @@ static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) if (ul.delete_urecord(_d, _a, r) < 0) { LM_ERR("failed to remove record from usrloc\n"); - - /* Delete failed, try to get corresponding - * record structure and send back all existing - * contacts - */ + + /* Delete failed, try to get corresponding + * record structure and send back all existing + * contacts + */ rerrno = R_UL_DEL_R; if (!ul.get_urecord(_d, _a, &r)) { build_contact(_m, r->contacts, _h); @@ -133,7 +133,7 @@ static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) /*! \brief - */ +*/ static struct socket_info *get_sock_val(struct sip_msg *msg) { struct socket_info *sock; @@ -179,10 +179,10 @@ static struct socket_info *get_sock_val(struct sip_msg *msg) socks = vavp->val.v.s; } if (parse_phostport( socks.s, &hosts.s, &hosts.len, - &port, &proto)!=0) { + &port, &proto)!=0) { socks.s[socks.len] = c; LM_ERR("bad socket <%.*s> in \n", - socks.len, socks.s); + socks.len, socks.s); return 0; } if(sock_hdr_name.len>0 && c!=0) { @@ -211,7 +211,7 @@ static inline int no_contacts(sip_msg_t *_m, udomain_t* _d, str* _a, str* _h) { urecord_t* r; int res; - + ul.lock_udomain(_d, _a); res = ul.get_urecord(_d, _a, &r); if (res < 0) { @@ -220,7 +220,7 @@ static inline int no_contacts(sip_msg_t *_m, udomain_t* _d, str* _a, str* _h) ul.unlock_udomain(_d, _a); return -1; } - + if (res == 0) { /* Contacts found */ build_contact(_m, r->contacts, _h); ul.release_urecord(r); @@ -280,7 +280,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig /* set tcp connection id */ if (_m->rcv.proto==PROTO_TCP || _m->rcv.proto==PROTO_TLS - || _m->rcv.proto==PROTO_WS || _m->rcv.proto==PROTO_WSS) { + || _m->rcv.proto==PROTO_WS || _m->rcv.proto==PROTO_WSS) { ci.tcpconn_id = _m->rcv.proto_reserved1; } else { ci.tcpconn_id = -1; @@ -288,7 +288,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig /* additional info from message */ if (parse_headers(_m, HDR_USERAGENT_F, 0) != -1 && _m->user_agent && - _m->user_agent->body.len>0 && _m->user_agent->body.len<MAX_UA_SIZE) { + _m->user_agent->body.len>0 && _m->user_agent->body.len<MAX_UA_SIZE) { ci.user_agent = &_m->user_agent->body; } else { ci.user_agent = &no_ua; @@ -379,8 +379,8 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig if (received_found==0) { memset(&val, 0, sizeof(int_str)); if (rcv_avp_name.n!=0 - && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) - && val.s.len > 0) { + && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) + && val.s.len > 0) { if (val.s.len>RECEIVED_MAX_SIZE) { rerrno = R_CONTACT_LEN; LM_ERR("received too long\n"); @@ -574,13 +574,13 @@ error: static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, - ucontact_info_t *ci, int mc) + ucontact_info_t *ci, int mc) { int num; int e; ucontact_t* ptr, *cont; int ret; - + num = 0; ptr = _r->contacts; while(ptr) { @@ -590,7 +590,7 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, ptr = ptr->next; } LM_DBG("%d valid contacts\n", num); - + for( ; _c ; _c = get_next_contact(_c) ) { /* calculate expires */ calc_contact_expires(_m, _c->expires, &e); @@ -610,7 +610,7 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, if (e == 0) num--; } } - + LM_DBG("%d contacts after commit\n", num); if (num > mc) { LM_INFO("too many contacts for AOR <%.*s>\n", _r->aor.len, _r->aor.s); @@ -668,7 +668,7 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, #ifdef USE_TCP if ( (_m->flags&tcp_persistent_flag) && - (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { + (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { e_max = -1; tcp_check = 1; } else { @@ -756,15 +756,15 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, /* If call-id has changed then delete all records with this sip.instance then insert new record */ if (ci->instance.s != NULL && - (ci->callid->len != c->callid.len || - strncmp(ci->callid->s, c->callid.s, ci->callid->len) != 0)) + (ci->callid->len != c->callid.len || + strncmp(ci->callid->s, c->callid.s, ci->callid->len) != 0)) { ptr = _r->contacts; while (ptr) { ptr0 = ptr->next; if ((ptr != c) && ptr->instance.len == c->instance.len && - strncmp(ptr->instance.s, c->instance.s, ptr->instance.len) == 0) + strncmp(ptr->instance.s, c->instance.s, ptr->instance.len) == 0) { ul.delete_ucontact(_r, ptr); } @@ -912,12 +912,12 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } if (reg_outbound_mode != REG_OUTBOUND_NONE - && !(parse_headers(_m, HDR_VIA2_F, 0) == -1 || _m->via2 == 0 - || _m->via2->error != PARSE_OK)) { + && !(parse_headers(_m, HDR_VIA2_F, 0) == -1 || _m->via2 == 0 + || _m->via2->error != PARSE_OK)) { /* Outbound supported on server, and more than one Via: - not the first hop */ if (!(parse_headers(_m, HDR_PATH_F, 0) == -1 || _m->path == 0)) { - route = (rr_t *)0; + route = (rr_t *)0; if (parse_rr_body(_m->path->body.s, _m->path->body.len, &route) < 0) { LM_ERR("Failed to parse Path: header body\n"); goto error; @@ -949,7 +949,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) if ((use_ob == 0) && (reg_regid_mode == REG_REGID_OUTBOUND)) { if ((get_supported(_m) & F_OPTION_TAG_OUTBOUND) - && contact->reg_id) { + && contact->reg_id) { LM_WARN("Outbound used by UAC but not supported by edge proxy\n"); rerrno = R_OB_UNSUP_EDGE; goto error; @@ -959,7 +959,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } } } - + get_act_time(); c = get_first_contact(_m); @@ -1012,9 +1012,9 @@ int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) if (_ruid == NULL) { /* No ruid provided - remove all contacts for aor */ - if (extract_aor(_uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - return -1; + if (extract_aor(_uri, &aor, NULL) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; } u = parse_to_uri(_m); @@ -1029,36 +1029,37 @@ int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) } else { /* ruid provided - remove a specific contact */ - if (_uri->len > 0) { + if (_uri->len > 0) { - if (extract_aor(_uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - return -1; - } + if (extract_aor(_uri, &aor, NULL) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } - if (ul.get_urecord_by_ruid(_d, ul.get_aorhash(&aor), - _ruid, &r, &c) != 0) { - LM_WARN("AOR/Contact not found\n"); - return -1; + if (ul.get_urecord_by_ruid(_d, ul.get_aorhash(&aor), + _ruid, &r, &c) != 0) { + LM_WARN("AOR/Contact not found\n"); + return -1; } if (ul.delete_ucontact(r, c) != 0) { - LM_WARN("could not delete contact\n"); - return -1; + ul.unlock_udomain(_d, &aor); + LM_WARN("could not delete contact\n"); + return -1; } ul.unlock_udomain(_d, &aor); } else { - res = ul.delete_urecord_by_ruid(_d, _ruid); + res = ul.delete_urecord_by_ruid(_d, _ruid); switch (res) { - case -1: - LM_ERR("could not delete contact\n"); - return -1; - case -2: - LM_WARN("contact not found\n"); - return -1; - default: - return 1; + case -1: + LM_ERR("could not delete contact\n"); + return -1; + case -2: + LM_WARN("contact not found\n"); + return -1; + default: + return 1; } }

1 0

git:master: usrloc: avoid double locking when preloading attributes
by Daniel-Constantin Mierla 09 Dec '13

09 Dec '13

Module: sip-router Branch: master Commit: 888635bfa3719afeeea6f5f0d407aa862ceb34ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=888635b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 9 10:06:15 2013 +0100 usrloc: avoid double locking when preloading attributes - reported by Seudin Kasumovic, FS#378 --- modules/usrloc/udomain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index a736051..88fc7e4 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -1270,8 +1270,7 @@ int uldb_preload_attrs(udomain_t *_d) suri = user; } - lock_udomain(_d, &suri); - if (get_urecord_by_ruid(_d, ul_get_aorhash(&suri), &ruid, &r, &c) > 0) { + if (get_urecord_by_ruid(_d, ul_get_aorhash(&suri), &ruid, &r, &c) < 0) { /* delete attrs records from db table */ LM_INFO("no contact record for this ruid\n"); uldb_delete_attrs(_d->name, &user, &domain, &ruid); @@ -1287,8 +1286,9 @@ int uldb_preload_attrs(udomain_t *_d) LM_INFO("cannot add values to contact xavp\n"); } } + /* get_urecord_by_ruid() locks the slot */ + unlock_udomain(_d, &suri); } - unlock_udomain(_d, &user); } if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) {

1 0

git:master: registrar: handle error case when deleting contact fails for unregister()
by Daniel-Constantin Mierla 09 Dec '13

09 Dec '13

Module: sip-router Branch: master Commit: 67d218e29457ffd75148c8c520b26ec6f3f41719 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67d218e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 9 10:05:11 2013 +0100 registrar: handle error case when deleting contact fails for unregister() - reformatted file --- modules/registrar/save.c | 103 +++++++++++++++++++++++----------------------- 1 files changed, 52 insertions(+), 51 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index fc5d564..caa81df 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -95,7 +95,7 @@ static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) { urecord_t* r; ucontact_t* c; - + ul.lock_udomain(_d, _a); if (!ul.get_urecord(_d, _a, &r)) { @@ -114,11 +114,11 @@ static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) if (ul.delete_urecord(_d, _a, r) < 0) { LM_ERR("failed to remove record from usrloc\n"); - - /* Delete failed, try to get corresponding - * record structure and send back all existing - * contacts - */ + + /* Delete failed, try to get corresponding + * record structure and send back all existing + * contacts + */ rerrno = R_UL_DEL_R; if (!ul.get_urecord(_d, _a, &r)) { build_contact(_m, r->contacts, _h); @@ -133,7 +133,7 @@ static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) /*! \brief - */ +*/ static struct socket_info *get_sock_val(struct sip_msg *msg) { struct socket_info *sock; @@ -179,10 +179,10 @@ static struct socket_info *get_sock_val(struct sip_msg *msg) socks = vavp->val.v.s; } if (parse_phostport( socks.s, &hosts.s, &hosts.len, - &port, &proto)!=0) { + &port, &proto)!=0) { socks.s[socks.len] = c; LM_ERR("bad socket <%.*s> in \n", - socks.len, socks.s); + socks.len, socks.s); return 0; } if(sock_hdr_name.len>0 && c!=0) { @@ -211,7 +211,7 @@ static inline int no_contacts(sip_msg_t *_m, udomain_t* _d, str* _a, str* _h) { urecord_t* r; int res; - + ul.lock_udomain(_d, _a); res = ul.get_urecord(_d, _a, &r); if (res < 0) { @@ -220,7 +220,7 @@ static inline int no_contacts(sip_msg_t *_m, udomain_t* _d, str* _a, str* _h) ul.unlock_udomain(_d, _a); return -1; } - + if (res == 0) { /* Contacts found */ build_contact(_m, r->contacts, _h); ul.release_urecord(r); @@ -280,7 +280,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig /* set tcp connection id */ if (_m->rcv.proto==PROTO_TCP || _m->rcv.proto==PROTO_TLS - || _m->rcv.proto==PROTO_WS || _m->rcv.proto==PROTO_WSS) { + || _m->rcv.proto==PROTO_WS || _m->rcv.proto==PROTO_WSS) { ci.tcpconn_id = _m->rcv.proto_reserved1; } else { ci.tcpconn_id = -1; @@ -288,7 +288,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig /* additional info from message */ if (parse_headers(_m, HDR_USERAGENT_F, 0) != -1 && _m->user_agent && - _m->user_agent->body.len>0 && _m->user_agent->body.len<MAX_UA_SIZE) { + _m->user_agent->body.len>0 && _m->user_agent->body.len<MAX_UA_SIZE) { ci.user_agent = &_m->user_agent->body; } else { ci.user_agent = &no_ua; @@ -379,8 +379,8 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig if (received_found==0) { memset(&val, 0, sizeof(int_str)); if (rcv_avp_name.n!=0 - && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) - && val.s.len > 0) { + && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) + && val.s.len > 0) { if (val.s.len>RECEIVED_MAX_SIZE) { rerrno = R_CONTACT_LEN; LM_ERR("received too long\n"); @@ -574,13 +574,13 @@ error: static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, - ucontact_info_t *ci, int mc) + ucontact_info_t *ci, int mc) { int num; int e; ucontact_t* ptr, *cont; int ret; - + num = 0; ptr = _r->contacts; while(ptr) { @@ -590,7 +590,7 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, ptr = ptr->next; } LM_DBG("%d valid contacts\n", num); - + for( ; _c ; _c = get_next_contact(_c) ) { /* calculate expires */ calc_contact_expires(_m, _c->expires, &e); @@ -610,7 +610,7 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, if (e == 0) num--; } } - + LM_DBG("%d contacts after commit\n", num); if (num > mc) { LM_INFO("too many contacts for AOR <%.*s>\n", _r->aor.len, _r->aor.s); @@ -668,7 +668,7 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, #ifdef USE_TCP if ( (_m->flags&tcp_persistent_flag) && - (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { + (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { e_max = -1; tcp_check = 1; } else { @@ -756,15 +756,15 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, /* If call-id has changed then delete all records with this sip.instance then insert new record */ if (ci->instance.s != NULL && - (ci->callid->len != c->callid.len || - strncmp(ci->callid->s, c->callid.s, ci->callid->len) != 0)) + (ci->callid->len != c->callid.len || + strncmp(ci->callid->s, c->callid.s, ci->callid->len) != 0)) { ptr = _r->contacts; while (ptr) { ptr0 = ptr->next; if ((ptr != c) && ptr->instance.len == c->instance.len && - strncmp(ptr->instance.s, c->instance.s, ptr->instance.len) == 0) + strncmp(ptr->instance.s, c->instance.s, ptr->instance.len) == 0) { ul.delete_ucontact(_r, ptr); } @@ -912,12 +912,12 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } if (reg_outbound_mode != REG_OUTBOUND_NONE - && !(parse_headers(_m, HDR_VIA2_F, 0) == -1 || _m->via2 == 0 - || _m->via2->error != PARSE_OK)) { + && !(parse_headers(_m, HDR_VIA2_F, 0) == -1 || _m->via2 == 0 + || _m->via2->error != PARSE_OK)) { /* Outbound supported on server, and more than one Via: - not the first hop */ if (!(parse_headers(_m, HDR_PATH_F, 0) == -1 || _m->path == 0)) { - route = (rr_t *)0; + route = (rr_t *)0; if (parse_rr_body(_m->path->body.s, _m->path->body.len, &route) < 0) { LM_ERR("Failed to parse Path: header body\n"); goto error; @@ -949,7 +949,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) if ((use_ob == 0) && (reg_regid_mode == REG_REGID_OUTBOUND)) { if ((get_supported(_m) & F_OPTION_TAG_OUTBOUND) - && contact->reg_id) { + && contact->reg_id) { LM_WARN("Outbound used by UAC but not supported by edge proxy\n"); rerrno = R_OB_UNSUP_EDGE; goto error; @@ -959,7 +959,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } } } - + get_act_time(); c = get_first_contact(_m); @@ -1012,9 +1012,9 @@ int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) if (_ruid == NULL) { /* No ruid provided - remove all contacts for aor */ - if (extract_aor(_uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - return -1; + if (extract_aor(_uri, &aor, NULL) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; } u = parse_to_uri(_m); @@ -1029,36 +1029,37 @@ int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) } else { /* ruid provided - remove a specific contact */ - if (_uri->len > 0) { + if (_uri->len > 0) { - if (extract_aor(_uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - return -1; - } + if (extract_aor(_uri, &aor, NULL) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } - if (ul.get_urecord_by_ruid(_d, ul.get_aorhash(&aor), - _ruid, &r, &c) != 0) { - LM_WARN("AOR/Contact not found\n"); - return -1; + if (ul.get_urecord_by_ruid(_d, ul.get_aorhash(&aor), + _ruid, &r, &c) != 0) { + LM_WARN("AOR/Contact not found\n"); + return -1; } if (ul.delete_ucontact(r, c) != 0) { - LM_WARN("could not delete contact\n"); - return -1; + ul.unlock_udomain(_d, &aor); + LM_WARN("could not delete contact\n"); + return -1; } ul.unlock_udomain(_d, &aor); } else { - res = ul.delete_urecord_by_ruid(_d, _ruid); + res = ul.delete_urecord_by_ruid(_d, _ruid); switch (res) { - case -1: - LM_ERR("could not delete contact\n"); - return -1; - case -2: - LM_WARN("contact not found\n"); - return -1; - default: - return 1; + case -1: + LM_ERR("could not delete contact\n"); + return -1; + case -2: + LM_WARN("contact not found\n"); + return -1; + default: + return 1; } }

1 0

Finding rtpproxy ip address
by murthy ch 09 Dec '13

09 Dec '13

Hi, I am using two rtpproxy's with one kamailio server. Could someone help me on how to find out the rtpproxy ip of a particular call from kamailio. Thank You, Murthy.

2 4

[tracker] Task opened: modules/usrloc deadlock on load/restart (Attachment added)
by sip-router 08 Dec '13

08 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Seudin Kasumovic (seudin) Attached to Project - sip-router Summary - modules/usrloc deadlock on load/restart Task Type - Bug Report Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - Linux Severity - Critical Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi, kamailio stops responding when location and location_attr table contains non expired contacts and attributes. I have these settings for usrloc module: modparam("usrloc", "nat_bflag", FLB_NATB) modparam("usrloc", "xavp_contact", "ulattrs") modparam("usrloc", "db_mode", 2) output of 'bt full' is attached. function uldb_preload_attrs locks table by lock_udomain function and then calls get_urecord_by_ruid which again try to locks table. Workaround by removing lock/unloc domain helps, but then operation is not atomic. Regards, Seudin -- version: kamailio 4.1.0 (i386/linux) flags: STATS: Off, EXTRA_DEBUG, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 4MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: compiled on 16:45:39 Dec 6 2013 with gcc 4.5.4 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=378 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: presence_dialoginfo -> force_single doesn't sent most relevant xml (Attachment added)
by sip-router 08 Dec '13

08 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#341 - presence_dialoginfo -> force_single doesn't sent most relevant xml User who did this - Devs Voicenter (voicenter) ---------- I used same way to determine relevant node, but as now we have more options, i just used numbers, that every new number is sum of all previous + 1, just to be sure we don't get same results with sum of few as single one. I checked the order on RFC, hope it's the right one. ---------- 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=341#comment1213 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
...
16
17
18
19
20
21
22
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013