sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: modules/tm: Fix uninitialised instance and ruid values

by Hugh Waite

Module: sip-router Branch: master Commit: 1dde1f64524db71b374ee81943fc259e8c818892 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1dde1f6… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Apr 9 11:32:17 2013 +0100 modules/tm: Fix uninitialised instance and ruid values In t_next_contacts: - Ensure instance was initialised to null when not present - Extract ruid value before storing a subsequent flow --- modules/tm/t_serial.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 576cdd9..bf87256 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -462,6 +462,8 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) memcpy(il->instance.s, instance.s, instance.len); il->next = (struct instance_list *)0; set_instance(msg, &instance); + } else { + instance.len = 0; } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); @@ -549,6 +551,9 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) vavp = xavp_get(&flags_name, xavp->val.v.xavp); flags = vavp->val.v.i; + vavp = xavp_get(&ruid_name, xavp->val.v.xavp); + ruid = vavp->val.v.s; + vavp = xavp_get(&instance_name, xavp->val.v.xavp); if (vavp != NULL) { instance = vavp->val.v.s; @@ -584,16 +589,16 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) ilp->next = il; il = ilp; } + } else { + instance.len = 0; } - vavp = xavp_get(&ruid_name, xavp->val.v.xavp); - ruid = vavp->val.v.s; - - LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s' inst-'%.*s'\n", + LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s' inst-'%.*s' ruid-'%.*s'\n", uri.len, uri.s, - dst_uri.len, dst_uri.s, - path.len, path.s, - instance.len, instance.s); + dst_uri.len, (dst_uri.len > 0)?dst_uri.s:"", + path.len, (path.len>0)?path.s:"", + instance.len, (instance.len>0)?instance.s:"", + ruid.len, ruid.s); if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, &instance, 0, &ruid) != 1) { LM_ERR("appending branch failed\n"); @@ -721,11 +726,12 @@ int t_next_contact_flow(struct sip_msg* msg, char* key, char* value) vavp = xavp_get(&ruid_name, xavp->val.v.xavp); ruid = vavp->val.v.s; - LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s' inst-'%.*s'\n", + LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s' inst-'%.*s' ruid-'%.*s'\n", uri.len, uri.s, - dst_uri.len, dst_uri.s, - path.len, path.s, - instance.len, instance.s); + dst_uri.len, (dst_uri.len > 0)?dst_uri.s:"", + path.len, (path.len>0)?path.s:"", + instance.len, (instance.len>0)?instance.s:"", + ruid.len, ruid.s); if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, &instance, 0, &ruid) != 1) { LM_ERR("appending branch failed\n");

11 years, 8 months

git:4.0: modules/ndb_redis: b/ f redisc_exec returns false if redis server is down.

by Vicente Hernando

Module: sip-router Branch: 4.0 Commit: c907eff8140bd07022aaf028741392322892b2f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c907eff… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Tue Apr 9 01:03:49 2013 +0200 modules/ndb_redis: b/f redisc_exec returns false if redis server is down. --- modules/ndb_redis/redis_client.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 0d8f703..322cabe 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -366,6 +366,10 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) if(redisc_reconnect_server(rsrv)==0) { rpl->rplRedis = redisvCommand(rsrv->ctxRedis, cmd->s, ap); + } else { + LM_ERR("unable to reconnect to redis server: %.*s\n", srv->len, srv->s); + cmd->s[cmd->len] = c; + goto error_exec; } } cmd->s[cmd->len] = c;

11 years, 8 months

git:4.0: modules/ndb_redis: b/ f restore correctly last char in argument strings.

by Vicente Hernando

Module: sip-router Branch: 4.0 Commit: 0e7d000a9c73b0fd06132e458f838cc78abddbed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e7d000… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Mon Apr 8 11:47:51 2013 +0200 modules/ndb_redis: b/f restore correctly last char in argument strings. --- modules/ndb_redis/ndb_redis_mod.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/ndb_redis/ndb_redis_mod.c b/modules/ndb_redis/ndb_redis_mod.c index ecce4e9..2cca4dd 100644 --- a/modules/ndb_redis/ndb_redis_mod.c +++ b/modules/ndb_redis/ndb_redis_mod.c @@ -248,12 +248,12 @@ static int w_redis_cmd5(struct sip_msg* msg, char* ssrv, char* scmd, arg1.s[arg1.len] = '\0'; arg2.s[arg2.len] = '\0'; if(redisc_exec(&s[0], &s[2], &s[1], arg1.s, arg2.s)<0) { - c1 = arg1.s[arg1.len]; - c2 = arg2.s[arg2.len]; + arg1.s[arg1.len] = c1; + arg2.s[arg2.len] = c2; return -1; } - c1 = arg1.s[arg1.len]; - c2 = arg2.s[arg2.len]; + arg1.s[arg1.len] = c1; + arg2.s[arg2.len] = c2; return 1; } @@ -305,14 +305,14 @@ static int w_redis_cmd6(struct sip_msg* msg, char* ssrv, char* scmd, arg2.s[arg2.len] = '\0'; arg3.s[arg3.len] = '\0'; if(redisc_exec(&s[0], &s[2], &s[1], arg1.s, arg2.s, arg3.s)<0) { - c1 = arg1.s[arg1.len]; - c2 = arg2.s[arg2.len]; - c3 = arg3.s[arg3.len]; + arg1.s[arg1.len] = c1; + arg2.s[arg2.len] = c2; + arg3.s[arg3.len] = c3; return -1; } - c1 = arg1.s[arg1.len]; - c2 = arg2.s[arg2.len]; - c3 = arg3.s[arg3.len]; + arg1.s[arg1.len] = c1; + arg2.s[arg2.len] = c2; + arg3.s[arg3.len] = c3; return 1; }

11 years, 8 months

git:master: modules/ndb_redis: b/ f redisc_exec returns false if redis server is down.

by Vicente Hernando

Module: sip-router Branch: master Commit: 0d41a8d0a251b351104b3feba8fde5373e928d92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d41a8d… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Tue Apr 9 01:03:49 2013 +0200 modules/ndb_redis: b/f redisc_exec returns false if redis server is down. --- modules/ndb_redis/redis_client.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 3cc7639..0ba083a 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -366,6 +366,10 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) if(redisc_reconnect_server(rsrv)==0) { rpl->rplRedis = redisvCommand(rsrv->ctxRedis, cmd->s, ap); + } else { + LM_ERR("unable to reconnect to redis server: %.*s\n", srv->len, srv->s); + cmd->s[cmd->len] = c; + goto error_exec; } } cmd->s[cmd->len] = c;

11 years, 8 months

loose_route() return codes

by Juha Heinanen

in master, loose_route() return codes are: 1 - route calculation has been successful -1 - route calculation has been unsuccessful -2 - outbound flow-token shows evidence of tampering i would like to be able to tell in the successful case if outbound flow token was processed or not and add a new return code: 2 - route calculation based on flow-token has been successful it that ok? -- juha

11 years, 8 months

git:master: siptrace Fix bug in documentation

by Olle E. Johansson

Module: sip-router Branch: master Commit: 1c643eb26a25880669a719a29c1c8e984e32983d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c643eb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Feb 7 11:04:00 2013 +0100 siptrace Fix bug in documentation The default database URL was mysql, not "", which caused me some strange issues. --- modules/siptrace/README | 2 +- modules/siptrace/doc/siptrace_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/siptrace/README b/modules/siptrace/README index 6875f0a..bb8bb67 100644 --- a/modules/siptrace/README +++ b/modules/siptrace/README @@ -191,7 +191,7 @@ Chapter 1. Admin Guide Database URL. - Default value is "". + Default value is "mysql://kamailio:kamailiorw@localhost/okamailio". Example 1.1. Set db_url parameter ... diff --git a/modules/siptrace/doc/siptrace_admin.xml b/modules/siptrace/doc/siptrace_admin.xml index 70a4abd..004f510 100644 --- a/modules/siptrace/doc/siptrace_admin.xml +++ b/modules/siptrace/doc/siptrace_admin.xml @@ -96,7 +96,7 @@ </para> <para> <emphasis> - Default value is "". + Default value is "mysql://kamailio:kamailiorw@localhost/okamailio". </emphasis> </para> <example>

11 years, 8 months

[tracker] Comment added: add_path_received() adds invalid path uri

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#284 - add_path_received() adds invalid path uri User who did this - Juha Heinanen (jh) ---------- fixed category from core to module. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=284#comment823 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.

11 years, 8 months

[tracker] Task changed: add_path_received() adds invalid path uri

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#284 - add_path_received() adds invalid path uri User who did this: Juha Heinanen (jh) Category: Core -> Module More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=284 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.

11 years, 8 months

[tracker] Task opened: add_path_received() adds invalid path uri

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 - Juha Heinanen (jh) Attached to Project - sip-router Summary - add_path_received() adds invalid path uri Task Type - Bug Report Category - Core Status - New Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - add_path_received() adds invalid path uri that contains illegal received param value chars ; and =. for example: Path: <sip:192.98.102.10;transport=tcp;lr;received='sip:192.98.102.10:58022;transport=tcp'> chars ; and = must be escaped and once done, there is no need to single quote received param value. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=284 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.

11 years, 8 months

[tracker] Task opened: xcap_server crash

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 - Juha Heinanen (jh) Attached to Project - sip-router Summary - xcap_server crash Task Type - Bug Report Category - Module Status - New Assigned To - Operating System - All Severity - High Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - when sipsimple client sends put request to xcap_server, kamailio crashes like this: (gdb) where #0 0x00007fa35ab47764 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007fa3547ff9e2 in check_match_header (body=..., etag=0x7fff50162170) at xcap_server.c:1625 #2 0x00007fa3547ff88a in check_preconditions (msg=0x7fff501631c0, etag_hdr=...) at xcap_server.c:1583 #3 0x00007fa3547f85ec in w_xcaps_put (msg=0x7fff501631c0, puri=0x7fa35a091470 "\300-\tZ\243\177", ppath=0x7fa35a091510 "\360:\tZ\243\177", pbody=0x7fa35a0915b0 " ;\tZ\243\177") at xcap_server.c:594 #4 0x000000000041bbe0 in do_action (h=0x7fff501630e0, a=0x7fa35a092f50, msg=0x7fff501631c0) at action.c:1092 #5 0x00000000004240a7 in run_actions (h=0x7fff501630e0, a=0x7fa35a092f50, msg=0x7fff501631c0) at action.c:1573 #6 0x0000000000422852 in do_action (h=0x7fff501630e0, a=0x7fa35a0aad20, msg=0x7fff501631c0) at action.c:1321 #7 0x00000000004240a7 in run_actions (h=0x7fff501630e0, a=0x7fa35a0726c0, msg=0x7fff501631c0) at action.c:1573 #8 0x00007fa3545e9355 in xhttp_process_request (orig_msg=0x7fa35a10d0d0, new_buf=0x7fa35a10e390 "PUT /xcap-root/resource-lists/users/sip:jh@test.fi/index HTTP/1.1\r\nVia: SIP/2.0/TCP 192.98.102.10:45208\r\nAccept-Encoding: identity\r\nContent-Length: 996\r\nHost: 192.98.102.10:8080\r\nUser-Agent: sipsimple"..., new_len=1290) at xhttp_mod.c:271 #9 0x00007fa3545e9b8a in xhttp_handler (msg=0x7fa35a10d0d0) at xhttp_mod.c:346 #10 0x0000000000482492 in nonsip_msg_run_hooks (msg=0x7fa35a10d0d0) at nonsip_hooks.c:125 #11 0x00000000004982c7 in receive_msg ( buf=0x7fa351da7e30 "PUT /xcap-root/resource-lists/users/sip:jh@test.fi/index HTTP/1.1\r\nAccept-Encoding: identity\r\nContent-Length: 996\r\nHost: 192.98.102.10:8080\r\nUser-Agent: sipsimple 0.34.0\r\nConnection: close\r\nIf-None-Ma"..., len=1252, rcv_info=0x7fa351da7b68) at receive.c:158 #12 0x000000000051f294 in receive_tcp_msg ( tcpbuf=0x7fa351da7e30 "PUT /xcap-root/resource-lists/users/sip:jh@test.fi/index HTTP/1.1\r\nAccept-Encoding: identity\r\nContent-Length: 996\r\nHost: 192.98.102.10:8080\r\nUser-Agent: sipsimple 0.34.0\r\nConnection: close\r\nIf-None-Ma"..., len=1252, rcv_info=0x7fa351da7b68, con=0x7fa351da7b50) at tcp_read.c:1179 #13 0x0000000000520271 in tcp_read_req (con=0x7fa351da7b50, bytes_read=0x7fff50163c20, read_flags=0x7fff50163c18) at tcp_read.c:1384 #14 0x0000000000521aa4 in handle_io (fm=0x7fa35a0fa980, events=1, idx=-1) at tcp_read.c:1614 #15 0x000000000051b0ae in io_wait_loop_epoll (h=0x8c27e0, t=2, repeat=0) at io_wait.h:1092 #16 0x0000000000522341 in tcp_receive_loop (unix_sock=20) at tcp_read.c:1725 #17 0x0000000000515e3d in tcp_init_children () at tcp_main.c:4956 #18 0x00000000004658f9 in main_loop () at main.c:1723 #19 0x0000000000468594 in main (argc=18, argv=0x7fff501640b8) at main.c:2566 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=283 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.

11 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013