sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

new tmx function t_reuse_branch()
by Juha Heinanen 06 May '14

06 May '14

as per daniel's suggestion, i wrote a new tmx function t_reuse_branch(), which can currently be called from branch-failure route: /** * Creates new "main" branch by making copy of branch-failure branch. * Currently the following branch attributes are included: * request-uri, ruid, path, instance, and branch flags. */ static int w_t_reuse_branch(struct sip_msg* msg, char *p1, char *p2) { struct cell *t; int branch; if (msg == NULL) return -1; /* first get the transaction */ if (_tmx_tmb.t_check(msg, 0) == -1) return -1; if ((t = _tmx_tmb.t_gett()) == 0) { LM_ERR("no transaction\n"); return -1; } switch (get_route_type()) { case BRANCH_FAILURE_ROUTE: /* use the reason of the winning reply */ if ((branch = _tmx_tmb.t_get_picked_branch()) < 0) { LM_CRIT("no picked branch (%d) for a final response" " in MODE_ONFAILURE\n", branch); return -1; } rewrite_uri(msg, &(t->uac[branch].uri)); set_ruid(msg, &(t->uac[branch].ruid)); if (t->uac[branch].path.len) { set_path_vector(msg, &(t->uac[branch].path)); } else { reset_path_vector(msg); } setbflagsval(0, t->uac[branch].flags); set_instance(msg, &(t->uac[branch].instance)); return 1; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return -1; } } the new "main" branch does not include destination uri and socket, because i didn't find them in struct ua_client. unless someone adds them to struct ua_clients, they thus need to be set separately from htable after calling t_reuse_branch(). is it ok that i commit the above function to tmx module? in addition, i would like to add $T_reply_bf (branch flags) pv, since i need to test some of the branch flags in other parts of branch-failure route. -- juha

2 8

rtpengines replaces origin without replace-origin
by Juha Heinanen 01 May '14

01 May '14

while doing rtpengine tests, i noticed that it replaces c line ip address without being asked for. -- juha Apr 28 21:27:06 siika /usr/sbin/sip-proxy[15139]: INFO: ===== rtpengine_offer(ICE=force_relay via-branch=1 trust-address) Apr 28 21:27:06 siika rtpengine[13711]: Got valid command from 127.0.0.1:59497: offer - { "sdp": "v=0#015#012o=- 2010440216 969631828 IN IP4 192.168.43.146#015#012s=-#015#012c=IN IP4 192.168.43.146#015#012t=0 0#015#012a=tool:baresip 0.4.10#015#012a=ice-lite#015#012a=ice-ufrag:K7tL#015#012a=ice-pwd:Dl0YogJckXGNkrM36zfOVW#015#012m=audio 10082 RTP/AVP 96 97 98 8 0 101#015#012b=AS:125#015#012a=rtpmap:96 opus/48000/2#015#012a=fmtp:96 stereo=1;sprop-stereo=1#015#012a=rtpmap:97 speex/16000#015#012a=fmtp:97 mode="7";vbr=off;cng=on#015#012a=rtpmap:98 speex/8000#015#012a=fmtp:98 mode="7";vbr=off;cng=on#015#012a=rtpmap:8 PCMA/8000#015#012a=rtpmap:0 PCMU/8000#015#012a=rtpmap:101 telephone-event/8000#015#012a=fmtp:101 0-15#015#012a=sendrecv#015#012a=label:1#015#012a=rtcp-rsize#015#012a=ssrc:1679331760 cname:sip:test@test.tutpro.com#015#012a=ptime:20#015#012a=candidate:c062661e 1 UDP 2113932031 192.98.102.30 10082 typ host#015#012a=candidate:c062661e 2 UDP 2113932030 192.98.102.30 10083 typ host#015#012a=candidate:c0a82b92 1 UDP 2113932031 192.168.43.146 10082 typ host#015#012a=candidate:c0a82b92 2 UDP 2113932030 192.168.43.146 10083 typ host#015#012a=candidate:c062671e 1 UDP 2113932031 192.98.103.30 10082 typ host#015#012a=candidate:c062671e 2 UDP 2113932030 192.98.103.30 10083 typ host#015#012a=candidate:63c01c46 1 UDP 2113932031 2002:c062:661e::1 10082 typ host#015#012a=candidate:63c01c46 2 UDP 2113932030 2002:c062:661e::1 10083 typ host#015#012a=candidate:1e6662c0 1 UDP 2113932031 ::192.98.102.30 10082 typ host#015#012a=candidate:1e6662c0 2 UDP 2113932030 ::192.98.102.30 10083 typ host#015#012", "ICE": "force_relay", "flags": [ "trust-address" ], "call-id": "462bf6747eb5df7a", "via-branch": "z9hG4bK94d314320dc25092", "received-from": [ "IP4", "192.98.102.30" ], "from-tag": "f8419c09a23200e0", "command": "offer" } Apr 28 21:27:06 siika rtpengine[13711]: [462bf6747eb5df7a] Creating new call Apr 28 21:27:06 siika rtpengine[13711]: [462bf6747eb5df7a] enabling passthrough mode Apr 28 21:27:06 siika rtpengine[13711]: [462bf6747eb5df7a] Opened ports 50076..50077 for media relay Apr 28 21:27:06 siika rtpengine[13711]: [462bf6747eb5df7a] Opened ports 50078..50079 for media relay Apr 28 21:27:06 siika rtpengine[13711]: [462bf6747eb5df7a] Returning to SIP proxy: d3:sdp1459:v=0#015#012o=- 2010440216 969631828 IN IP4 192.168.43.146#015#012s=-#015#012c=IN IP4 192.98.102.30#015#012t=0 0#015#012a=tool:baresip 0.4.10#015#012a=ice-lite#015#012a=ice-ufrag:K7tL#015#012a=ice-pwd:Dl0YogJckXGNkrM36zfOVW#015#012m=audio 50076 RTP/AVP 96 97 98 8 0 101#015#012b=AS:125#015#012a=rtpmap:96 opus/48000/2#015#012a=fmtp:96 stereo=1;sprop-stereo=1#015#012a=rtpmap:97 speex/16000#015#012a=fmtp:97 mode="7";vbr=off;cng=on#015#012a=rtpmap:98 speex/8000#015#012a=fmtp:98 mode="7";vbr=off;cng=on#015#012a=rtpmap:8 PCMA/8000#015#012a=rtpmap:0 PCMU/8000#015#012a=rtpmap:101 telephone-event/8000#015#012a=fmtp:101 0-15#015#012a=label:1#015#012a=rtcp-rsize#015#012a=ssrc:1679331760 cname:sip:test@test.tutpro.com#015#012a=ptime:20#015#012a=candidate:c062661e 1 UDP 2113932031 192.98.102.30 10082 typ host#015#012a=candidate:c062661e 2 UDP 2113932030 192.98.102.30 10083 typ host#015#012a=candidate:c0a82b92 1 UDP 2113932031 192.168.43.146 10082 typ host#015#012a=candidate:c0a82b92 2 UDP 2113932030 192.168.43.146 10083 typ host#015#012a=candidate:c062671e 1 UDP 2113932031 192.98.103.30 10082 typ host#015#012a=candidate:c062671e 2 UDP 2113932030 192.98.103.30 10083 typ host#015#012a=candidate:63c01c46 1 UDP 2113932031 2002:c062:661e::1 10082 typ host#015#012a=candidate:63c01c46 2 UDP 2113932030 2002:c062:661e::1 10083 typ host#015#012a=candidate:1e6662c0 1 UDP 2113932031 ::192.98.102.30 10082 typ host#015#012a=candidate:1e6662c0 2 UDP 2113932030 ::192.98.102.30 10083 typ host#015#012a=sendrecv#015#012a=rtcp:50077#015#012a=candidate:WHSppLRUqzptTceE 1 UDP 16777216 192.98.102.30 50076 typ relay#015#012a=candidate:WHSppLRUqzptTceE 2 UDP 16777215 192.98.102.30 50077 typ relay#015#0126:result2:oke

5 37

[tracker] Comment added: DNS SRV lookup in rewritehost port fails
by sip-router 30 Apr '14

30 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#426 - DNS SRV lookup in rewritehost port fails User who did this - Daniel-Constantin Mierla (miconda) ---------- A fix should be now on branches 4.1 and master, can you try it and report if works ok? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=426#comment1428 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: core: compute the len for dns srv name
by Daniel-Constantin Mierla 30 Apr '14

30 Apr '14

Module: sip-router Branch: 4.1 Commit: 70f1b7479f80ca4f5e3a45fcf772785c110d0b57 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70f1b74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 30 21:46:55 2014 +0200 core: compute the len for dns srv name - fixes dns srv for cache, reported by Rob Eijgenraam, FS#426 (cherry picked from commit b834cde74f8a4b41ec24ceb8332adff8bb3922bb) --- dns_cache.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 7465c83..029b445 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2656,7 +2656,6 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, struct hostent* he; struct ip_addr* ip; static char tmp[MAX_DNS_NAME]; /* tmp. buff. for SRV lookups */ - int len; str srv_name; char srv_proto; @@ -2664,7 +2663,6 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, /* not init or off => use normal, non-cached version */ return _sip_resolvehost(name, port, proto); } - len=0; if (proto){ /* makes sure we have a protocol set*/ if (*proto==0) *proto=srv_proto=PROTO_UDP; /* default */ @@ -2708,7 +2706,7 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, } srv_name.s=tmp; - srv_name.len=len; + srv_name.len=strlen(tmp); if ((he=dns_srv_get_he(&srv_name, port, dns_flags))!=0) return he; }

1 0

git:master: core: compute the len for dns srv name
by Daniel-Constantin Mierla 30 Apr '14

30 Apr '14

Module: sip-router Branch: master Commit: b834cde74f8a4b41ec24ceb8332adff8bb3922bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b834cde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 30 21:46:55 2014 +0200 core: compute the len for dns srv name - fixes dns srv for cache, reported by Rob Eijgenraam, FS#426 --- dns_cache.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 7465c83..029b445 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2656,7 +2656,6 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, struct hostent* he; struct ip_addr* ip; static char tmp[MAX_DNS_NAME]; /* tmp. buff. for SRV lookups */ - int len; str srv_name; char srv_proto; @@ -2664,7 +2663,6 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, /* not init or off => use normal, non-cached version */ return _sip_resolvehost(name, port, proto); } - len=0; if (proto){ /* makes sure we have a protocol set*/ if (*proto==0) *proto=srv_proto=PROTO_UDP; /* default */ @@ -2708,7 +2706,7 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, } srv_name.s=tmp; - srv_name.len=len; + srv_name.len=strlen(tmp); if ((he=dns_srv_get_he(&srv_name, port, dns_flags))!=0) return he; }

1 0

[tracker] Comment added: DNS SRV lookup in rewritehost port fails
by sip-router 30 Apr '14

30 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#426 - DNS SRV lookup in rewritehost port fails User who did this - Rob Eijgenraam (robeyg) ---------- There are no global dns parameters defined in kamailio.cfg ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=426#comment1427 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: DNS SRV lookup in rewritehost port fails (Attachment added)
by sip-router 30 Apr '14

30 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#426 - DNS SRV lookup in rewritehost port fails User who did this - Rob Eijgenraam (robeyg) ---------- This is the code which is trying to execute: #rewritehostport("91.236.192.231:5060"); (workaround) rewritehostport("motto.nl"); remove_hf("To") ; insert_hf("To: <sip:$rU@$rd>\r\n", "Contact"); In 4.0.3 kamailio version, it retrieved the DNS SRV record _sip._udp.motto.nl (nslookup -querytype=SRV _sip._udp.motto.nl) ---------- 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=426#comment1426 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:master: modules/ims_qos: port in flow control media sub component is clipped becuase of lack of space in buffer for nul terminator
by Jason Penton 30 Apr '14

30 Apr '14

Module: sip-router Branch: master Commit: 1d8215d82038db81b82e449b93aaea40d07cadca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d8215d… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Apr 30 10:43:58 2014 +0200 modules/ims_qos: port in flow control media sub component is clipped becuase of lack of space in buffer for nul terminator --- modules/ims_qos/rx_avp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 65c8a43..e2751aa 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -548,7 +548,7 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, int intportB = atoi(portB->s); len = (permit_out.len + from_s.len + to_s.len + ipB->len + ipA->len + 4 + - proto_len + portA->len + portB->len) * sizeof (char); + proto_len + portA->len + portB->len + 1/*nul terminator*/) * sizeof (char); if (!flowdata_buf.s || flowdata_buflen < len) { if (flowdata_buf.s)

1 0

[tracker] Comment added: textops: add functions to convert and append multipart bodies.
by sip-router 30 Apr '14

30 Apr '14

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 - Víctor Seva (linuxmaniac) ---------- Maybe it's a good idea to create some helper lib for the functions like get_line, find_line_start and such. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=410#comment1425 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:master: pipelimit: if db url or table name are empty, skip loading pipes from db
by Daniel-Constantin Mierla 29 Apr '14

29 Apr '14

Module: sip-router Branch: master Commit: 658aabd74b8da2c6ecc1337be0f26007a64daef9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=658aabd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 23:02:08 2014 +0200 pipelimit: if db url or table name are empty, skip loading pipes from db --- modules/pipelimit/pl_db.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/pipelimit/pl_db.c b/modules/pipelimit/pl_db.c index 637c561..7800c76 100644 --- a/modules/pipelimit/pl_db.c +++ b/modules/pipelimit/pl_db.c @@ -106,18 +106,18 @@ int pl_init_db(void) if(pl_db_url.s==NULL) return 1; - if(rlp_table_name.s == 0) - { - LM_ERR("invalid database table name\n"); - return -1; - } - pl_db_url.len = strlen(pl_db_url.s); rlp_table_name.len = strlen(rlp_table_name.s); rlp_pipeid_col.len = strlen(rlp_pipeid_col.s); rlp_limit_col.len = strlen(rlp_limit_col.s); rlp_algorithm_col.len = strlen(rlp_algorithm_col.s); + if(rlp_table_name.len <= 0 || pl_db_url.len<=0) + { + LM_INFO("no table name or db url - skipping loading from db\n"); + return 0; + } + /* Find a database module */ if (db_bind_mod(&pl_db_url, &pl_dbf) < 0) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014