sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

[tracker] Task opened: registrar documentation is wrong, (exp->aor)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Corey Edwards (tensai) Attached to Project - sip-router Summary - registrar documentation is wrong, (exp->aor) Task Type - Bug Report Category - registrar (k) Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - When attempting to set up an event_route for usrloc:contact-expired according to the documentation, I received the following error. /usr/sbin/kamailio[26518]: ERROR: registrar [regpv.c:305]: pv_parse_ulc_name(): invalid contact pv name exp->aor /usr/sbin/kamailio[26518]: ERROR: <core> [pvapi.c:810]: pv_parse_spec2(): pvar "ulc" has an invalid name param [exp->aor] /usr/sbin/kamailio[26518]: ERROR: <core> [pvapi.c:965]: pv_parse_spec2(): wrong char [)/41] in [$ulc(exp->aor)] at [13 (5)] /usr/sbin/kamailio[26518]: ERROR: xlog [xlog.c:363]: xdbg_fixup_helper(): wrong format[expired contact for $ulc(exp->aor)#012] According to the note just above the example it should be "=>" instead of "->". I made this change in my config and confirmed that it works. Attached is a patch against git master to correct the documentation. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=411 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.

10 years, 9 months

[tracker] Comment added: Crash in websocket module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#406 - Crash in websocket module User who did this - Daniel-Constantin Mierla (miconda) ---------- I added Peter and Hugh to this item, so they will review the patch, being related to websocket module. >From my point of view, I suggest to remove the lines you commented. The patch is bigger and makes no sense to keep all those // lines. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=406#comment1343 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.

10 years, 9 months

[tracker] Task changed: Crash in websocket module

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#406 - Crash in websocket module User who did this: Daniel-Constantin Mierla (miconda) Assigned To: [-] -> Hugh Waite, Peter Dunkley More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=406 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.

10 years, 9 months

[tracker] Task closed: Kamailio crashes in case USE_LONGJMP undefined

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#409 - Kamailio crashes in case USE_LONGJMP undefined User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: Closed on a request by the person opening the item. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=409 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.

10 years, 9 months

[tracker] Comment added: textops: add functions to convert and append multipart bodies.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#410 - textops: add functions to convert and append multipart bodies. User who did this - Daniel-Constantin Mierla (miconda) ---------- The patch doesn't touch any other existing code, so it is safe to apply -- also, on a quick look over I couldn't spot anything wrong. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=410#comment1342 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.

10 years, 9 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Jason Penton

Module: sip-router Branch: master Commit: e8ca4fc9a74d21a057f2efed14459d49d5e6e82a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8ca4fc… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Mar 17 16:11:16 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

10 years, 9 months

git:master: modules/ims_usrloc_pcscf: preload of pcscf contacts was omitting rx_port and proto

by Jason Penton

Module: sip-router Branch: master Commit: 0a1b1890dbeea316e55ccef66f96d17e29843d76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a1b189… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Mar 13 10:47:55 2014 +0200 modules/ims_usrloc_pcscf: preload of pcscf contacts was omitting rx_port and proto --- modules/ims_usrloc_pcscf/udomain.c | 46 +++++++++++++++++++---------------- modules/ims_usrloc_pcscf/ul_mod.c | 1 - 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index 31a051b..d453c38 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -660,7 +660,7 @@ int delete_pcontact(udomain_t* _d, str* _aor, struct pcontact* _c) * \brief Convert database values into pcontact_info * * Convert database values into pcontact_info, - * expects 10 rows (aor, contact, received, rx_session_id_col + * expects 12 rows (aor, contact, received, received_port, received_proto, rx_session_id_col * reg_state, expires, socket, service_routes_col, public_ids, path * \param vals database values * \param contact contact @@ -684,9 +684,11 @@ static inline pcontact_info_t* dbrow2info( db_val_t *vals, str *contact) received.len = strlen(received.s); } ci.received_host = received; + ci.received_port = VAL_INT(vals + 3); + ci.received_proto = VAL_INT(vals + 4); - rx_session_id.s = (char*) VAL_STRING(vals + 3); - if (VAL_NULL(vals+3) || !rx_session_id.s || !rx_session_id.s[0]) { + rx_session_id.s = (char*) VAL_STRING(vals + 5); + if (VAL_NULL(vals+5) || !rx_session_id.s || !rx_session_id.s[0]) { rx_session_id.len = 0; rx_session_id.s = 0; LM_DBG("2\n"); @@ -694,18 +696,18 @@ static inline pcontact_info_t* dbrow2info( db_val_t *vals, str *contact) rx_session_id.len = strlen(rx_session_id.s); } ci.rx_regsession_id = &rx_session_id; - if (VAL_NULL(vals + 4)) { + if (VAL_NULL(vals + 6)) { LM_CRIT("empty registration state in DB\n"); return 0; } - ci.reg_state = VAL_INT(vals + 4); - if (VAL_NULL(vals + 5)) { + ci.reg_state = VAL_INT(vals + 6); + if (VAL_NULL(vals + 7)) { LM_CRIT("empty expire\n"); return 0; } - ci.expires = VAL_TIME(vals + 5); - path.s = (char*)VAL_STRING(vals+9); - if (VAL_NULL(vals+9) || !path.s || !path.s[0]) { + ci.expires = VAL_TIME(vals + 7); + path.s = (char*)VAL_STRING(vals+11); + if (VAL_NULL(vals+11) || !path.s || !path.s[0]) { path.len = 0; path.s = 0; } else { @@ -714,7 +716,7 @@ static inline pcontact_info_t* dbrow2info( db_val_t *vals, str *contact) ci.path = &path; //public IDs - implicit set - implicit_impus.s = (char*) VAL_STRING(vals + 8); + implicit_impus.s = (char*) VAL_STRING(vals + 10); if (!VAL_NULL(vals + 8) && implicit_impus.s && implicit_impus.s[0]) { //how many n=0; @@ -749,8 +751,8 @@ static inline pcontact_info_t* dbrow2info( db_val_t *vals, str *contact) } //service routes - service_routes.s = (char*) VAL_STRING(vals + 7); - if (!VAL_NULL(vals + 7) && service_routes.s && service_routes.s[0]) { + service_routes.s = (char*) VAL_STRING(vals + 9); + if (!VAL_NULL(vals + 9) && service_routes.s && service_routes.s[0]) { //how many n = 0; p = service_routes.s; @@ -812,13 +814,15 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) columns[1] = &aor_col; columns[2] = &contact_col; columns[3] = &received_col; - columns[4] = &rx_session_id_col; - columns[5] = &reg_state_col; - columns[6] = &expires_col; - columns[7] = &socket_col; - columns[8] = &service_routes_col; - columns[9] = &public_ids_col; - columns[10] = &path_col; + columns[4] = &received_port_col; + columns[5] = &received_proto_col; + columns[6] = &rx_session_id_col; + columns[7] = &reg_state_col; + columns[8] = &expires_col; + columns[9] = &socket_col; + columns[10] = &service_routes_col; + columns[11] = &public_ids_col; + columns[12] = &path_col; if (ul_dbf.use_table(_c, _d->name) < 0) { LM_ERR("sql use_table failed\n"); @@ -830,7 +834,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) #endif if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) { - if (ul_dbf.query(_c, 0, 0, 0, columns, 0, 11, 0, 0) < 0) { + if (ul_dbf.query(_c, 0, 0, 0, columns, 0, 13, 0, 0) < 0) { LM_ERR("db_query (1) failed\n"); return -1; } @@ -839,7 +843,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) return -1; } } else { - if (ul_dbf.query(_c, 0, 0, 0, columns, 0, 11, 0, &res) < 0) { + if (ul_dbf.query(_c, 0, 0, 0, columns, 0, 13, 0, &res) < 0) { LM_ERR("db_query failed\n"); return -1; } diff --git a/modules/ims_usrloc_pcscf/ul_mod.c b/modules/ims_usrloc_pcscf/ul_mod.c index 989e512..998d4bc 100644 --- a/modules/ims_usrloc_pcscf/ul_mod.c +++ b/modules/ims_usrloc_pcscf/ul_mod.c @@ -173,7 +173,6 @@ static int mod_init(void) { return -1; } - db_url.len = strlen(db_url.s); /* Regsiter RPC */

10 years, 9 months

git:master: modules/ims_registrar_pcscf: when search for contacts also include possible security ports

by Jason Penton

Module: sip-router Branch: master Commit: 969d680c571128cd8df398e574cfdfc7a92440fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=969d680… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Mar 14 15:41:27 2014 +0200 modules/ims_registrar_pcscf: when search for contacts also include possible security ports - with IPSEC, the received port could be different from the initial registration which occurs after security has been negotiated --- modules/ims_registrar_pcscf/service_routes.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index cafed54..8238f3b 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -117,6 +117,7 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { str received_host = {0, 0}; contact_t *ct; char srcip[50]; + int security_server_port = -1; if (_m->id != current_msg_id) { current_msg_id = _m->id; @@ -127,7 +128,27 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { if (b && b->contacts) { for (ct = b->contacts; ct; ct = ct->next) { if (ul.get_pcontact(_d, &ct->uri, &c) == 0) { - if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _m->rcv.src_port) && (c->received_proto == _m->rcv.proto)) { + if (c->security) { + switch (c->security->type) { + case SECURITY_IPSEC: + security_server_port = c->security->data.ipsec->port_uc; + break; + case SECURITY_TLS: + case SECURITY_NONE: + break; + } + } else if (c->security_temp) { + switch (c->security->type) { + case SECURITY_IPSEC: + security_server_port = c->security->data.ipsec->port_uc; + break; + case SECURITY_TLS: + case SECURITY_NONE: + break; + } + } + + if ((c->reg_state == PCONTACT_REGISTERED) && ((c->received_port == _m->rcv.src_port) || (security_server_port == _m->rcv.src_port)) && (c->received_proto == _m->rcv.proto)) { received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); received_host.s = srcip; LM_DBG("Received host len %d (search %d)\n", c->received_host.len, received_host.len);

10 years, 9 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Jason Penton

Module: sip-router Branch: master Commit: 07f4ffcbc4dc7dc6affd65f0930d86320a59602d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07f4ffc… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Mar 13 11:31:53 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

10 years, 9 months

git:master: modules/ims_usrloc_pcscf: more debug logging...

by Jason Penton

Module: sip-router Branch: master Commit: 660b0cf139c0e2e9279838154354f78d7e51c6d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=660b0cf… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Mar 13 10:47:26 2014 +0200 modules/ims_usrloc_pcscf: more debug logging... --- modules/ims_usrloc_pcscf/pcontact.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/modules/ims_usrloc_pcscf/pcontact.c b/modules/ims_usrloc_pcscf/pcontact.c index e5acdfc..5bd8766 100644 --- a/modules/ims_usrloc_pcscf/pcontact.c +++ b/modules/ims_usrloc_pcscf/pcontact.c @@ -244,7 +244,19 @@ void free_pcontact(pcontact_t* _c) { static inline void nodb_timer(pcontact_t* _c) { - LM_DBG("Running nodb timer on <%.*s> which has expires %d and expires in %d seconds\n", _c->aor.len, _c->aor.s, (int)_c->expires, (int)(_c->expires - time(NULL))); + LM_DBG("Running nodb timer on <%.*s>, " + "Reg state: %s, " + "Expires: %d, " + "Expires in: %d seconds, " + "Received: %.*s:%d, " + "Proto: %d\n", + _c->aor.len, _c->aor.s, + reg_state_to_string(_c->reg_state), + (int)_c->expires, + (int)(_c->expires - time(NULL)), + _c->received_host.len, _c->received_host.s, + _c->received_port, + _c->received_proto); get_act_time(); if ((_c->expires - act_time) <= -10) {//we've allowed some grace time TODO: add as parameter

10 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2014