sr-dev August 2018

sr-dev@lists.kamailio.org

22 participants
281 discussions

git:master:085e2c2e: core: more accurate debug messages when forwarding a reply
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: 085e2c2ea5f85616c037b083495094a2232c405a URL: https://github.com/kamailio/kamailio/commit/085e2c2ea5f85616c037b083495094a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T09:11:11+02:00 core: more accurate debug messages when forwarding a reply --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/085e2c2ea5f85616c037b083495094a… Patch: https://github.com/kamailio/kamailio/commit/085e2c2ea5f85616c037b083495094a… --- diff --git a/src/core/forward.c b/src/core/forward.c index d9a778ca71..a6bf221a79 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -696,7 +696,7 @@ int update_sock_struct_from_via( union sockaddr_union* to, * strings; but only if host is not null terminated (host.s[len] will * always be ok for a via) */ - LM_DBG("trying SRV lookup\n"); + LM_DBG("check if dns lookup is needed for [%.*s]\n", name->len, name->s); proto=via->proto; he=sip_resolvehost(name, &port, &proto); @@ -705,6 +705,9 @@ int update_sock_struct_from_via( union sockaddr_union* to, return -1; } + LM_DBG("address is [%.*s] port %d proto %d\n", name->len, name->s, + (int)port, (int)proto); + hostent2su(to, he, 0, port); return 1; } @@ -821,14 +824,18 @@ static int do_forward_reply(struct sip_msg* msg, int mode) goto error; } + LM_DBG("reply forwarded (2nd via address: %.*s port %d)\n", + msg->via2->host.len, msg->via2->host.s, + (int) msg->via2->port); + done: #ifdef STATS STATS_TX_RESPONSE( (msg->first_line.u.reply.statuscode/100) ); #endif - LM_DBG("reply forwarded to %.*s:%d\n", + LM_DBG("reply forwarding finished (2nd via address: %.*s port %d)\n", msg->via2->host.len, msg->via2->host.s, - (unsigned short) msg->via2->port); + (int) msg->via2->port); STATS_RPL_FWD_OK(); pkg_free(new_buf);

1 0

git:master:e4d2ca28: core: debug message when dropping a sip reply
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: e4d2ca28ee2d42683d7604c6a767a201b6babbed URL: https://github.com/kamailio/kamailio/commit/e4d2ca28ee2d42683d7604c6a767a20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T08:50:36+02:00 core: debug message when dropping a sip reply --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/e4d2ca28ee2d42683d7604c6a767a20… Patch: https://github.com/kamailio/kamailio/commit/e4d2ca28ee2d42683d7604c6a767a20… --- diff --git a/src/core/receive.c b/src/core/receive.c index 9a385e4b85..df8db65ca6 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -415,10 +415,11 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) goto error_rpl; } else #endif /* NO_ONREPLY_ROUTE_ERROR */ - if(unlikely(ret == 0 || (ctx.run_flags & DROP_R_F))) { - STATS_RPL_FWD_DROP(); - goto skip_send_reply; /* drop the message, no error */ - } + if(unlikely(ret == 0 || (ctx.run_flags & DROP_R_F))) { + STATS_RPL_FWD_DROP(); + LM_DBG("drop flag set - skip forwarding the reply\n"); + goto skip_send_reply; /* drop the message, no error */ + } } /* send the msg */ forward_reply(msg);

1 0

git:master:f3312715: app_lua: split function for returning pv null value
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: f3312715943867f76c8753eba992dad5859d8c2f URL: https://github.com/kamailio/kamailio/commit/f3312715943867f76c8753eba992dad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T08:38:00+02:00 app_lua: split function for returning pv null value --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/f3312715943867f76c8753eba992dad… Patch: https://github.com/kamailio/kamailio/commit/f3312715943867f76c8753eba992dad… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index dc2aa8644f..a57f94fcc7 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -885,6 +885,22 @@ static const luaL_Reg _sr_hdr_Map [] = { }; +/** + * + */ +static int lua_sr_pv_push_val_null (lua_State *L, int rmode) +{ + if(rmode==1) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; + } else { + return 0; + } +} + /** * */ @@ -900,15 +916,7 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pvn.s = (char*)lua_tostring(L, -1); if(pvn.s==NULL || env_L->msg==NULL) { - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } pvn.len = strlen(pvn.s); @@ -916,52 +924,20 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } if(val.flags&PV_VAL_NULL) { - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } if(val.flags&PV_TYPE_INT) { lua_pushinteger(L, val.ri);

1 0

git:master:b98cb43b: app_lua: kemi - exported KSR.pv.getw("$...")
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: b98cb43b1ea33706fe133f6585c0705892663ae6 URL: https://github.com/kamailio/kamailio/commit/b98cb43b1ea33706fe133f6585c0705… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T08:20:17+02:00 app_lua: kemi - exported KSR.pv.getw("$...") - get the value of the pseudo-variable if it is not $null and the empty string ("") if it is $null --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/b98cb43b1ea33706fe133f6585c0705… Patch: https://github.com/kamailio/kamailio/commit/b98cb43b1ea33706fe133f6585c0705… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 4414bd83a2..dc2aa8644f 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -900,9 +900,12 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pvn.s = (char*)lua_tostring(L, -1); if(pvn.s==NULL || env_L->msg==NULL) { - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -913,9 +916,12 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -923,9 +929,12 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -933,17 +942,23 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } } if(val.flags&PV_VAL_NULL) { - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -972,6 +987,14 @@ static int lua_sr_pv_getw (lua_State *L) return lua_sr_pv_get_val(L, 1); } +/** + * + */ +static int lua_sr_pv_gete (lua_State *L) +{ + return lua_sr_pv_get_val(L, 2); +} + /** * */ @@ -1179,6 +1202,7 @@ static int lua_sr_pv_is_null (lua_State *L) static const luaL_Reg _sr_pv_Map [] = { {"get", lua_sr_pv_get}, {"getw", lua_sr_pv_getw}, + {"gete", lua_sr_pv_gete}, {"seti", lua_sr_pv_seti}, {"sets", lua_sr_pv_sets}, {"unset", lua_sr_pv_unset},

1 0

git:5.0:7ab0b1c0: drouting: fix crush for empty username in ruri
by Henning Westerholt 23 Aug '18

23 Aug '18

Module: kamailio Branch: 5.0 Commit: 7ab0b1c0fa4028d7d4abb1b621b364584ae0f4b9 URL: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b3645… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-23T20:00:58+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio (cherry picked from commit e4f3849f35ae556e317c365d56b14212e48d1dab) --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b3645… Patch: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b3645… --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 07bd518d64..305ed4f14b 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -115,7 +115,7 @@ get_prefix( if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the

1 0

git:5.1:ff36d82d: drouting: fix crush for empty username in ruri
by Henning Westerholt 23 Aug '18

23 Aug '18

Module: kamailio Branch: 5.1 Commit: ff36d82d8861ed50adf91b9e314c29ef8ee3e745 URL: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29e… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-23T20:00:40+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio (cherry picked from commit e4f3849f35ae556e317c365d56b14212e48d1dab) --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29e… Patch: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29e… --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 099c402dec..9ce8d04bc6 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -98,7 +98,7 @@ rt_info_t *get_prefix(ptree_t *ptree, str *prefix, unsigned int rgid) if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the

1 0

git:master:e4f3849f: drouting: fix crush for empty username in ruri
by Henning Westerholt 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: e4f3849f35ae556e317c365d56b14212e48d1dab URL: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b1421… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-08-23T19:59:30+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b1421… Patch: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b1421… --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 099c402dec..9ce8d04bc6 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -98,7 +98,7 @@ rt_info_t *get_prefix(ptree_t *ptree, str *prefix, unsigned int rgid) if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the

1 0

[kamailio/kamailio] drouting: fix crush for empty username in ruri (#1625)
by Dmitri Savolainen 23 Aug '18

23 Aug '18

- uri like sip:@host crushed kamailio #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1625 -- Commit Summary -- * drouting: fix crush for empty username in ruri -- File Changes -- M src/modules/drouting/prefix_tree.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1625.patch https://github.com/kamailio/kamailio/pull/1625.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1625

2 2

git:master:f8220f53: modules: readme files regenerated - misc_radius ... [skip ci]
by Kamailio Dev 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: f8220f53da4494d88e3b371d4cfc6a6b3baca909 URL: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-23T17:16:52+02:00 modules: readme files regenerated - misc_radius ... [skip ci] --- Modified: src/modules/misc_radius/README --- Diff: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6… Patch: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6… --- diff --git a/src/modules/misc_radius/README b/src/modules/misc_radius/README index 129ca733c7..ec165d9cdd 100644 --- a/src/modules/misc_radius/README +++ b/src/modules/misc_radius/README @@ -326,16 +326,16 @@ radius_load_caller_avps($fU); Sending Access-Accept of id 60 to 192.168.25.32 port 59736 Session-Timeout = 4261674 next-hop-ip = "SIP/00111222333444@cisco-out" - SIP-AVP = "email:sr-users@lists.sip-router.org session-timeout#161 next-hop- -ip:h323/0001111@myvoip-gate.kamailio.org" + SIP-AVP = "email:sr-users@lists.kamailio.org session-timeout#161 next-hop-ip +:h323/0001111@myvoip-gate.kamailio.org" session-protocol = "SIP" ... $avp(Session-Timeout) has integer value 4261674 $avp(next-hop-ip) has string value "SIP/005555777888@cisco-out" $avp(session-protocol) has string value "SIP" -$avp(SIP-AVP) has string value "email:sr-users@lists.sip-router.org session-tim -eout#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" +$avp(SIP-AVP) has string value "email:sr-users@lists.kamailio.org session-timeo +ut#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" ... When receiving negative response, check appropriate avp's:

1 0

git:master:b2b2b981: update mailing list URL
by Victor Seva 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: b2b2b981e641eb3b83dd9afd09c8668b8a239741 URL: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-08-23T16:59:11+02:00 update mailing list URL --- Modified: .github/ISSUE_TEMPLATE.md Modified: INSTALL Modified: ISSUES Modified: doc/README.md Modified: doc/man/kamailio.8 Modified: doc/man/kamailio.cfg.5 Modified: doc/tutorials/presence/trouble.xml Modified: etc/sip-router.cfg Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/scscf/kamailio.cfg Modified: misc/examples/kemi/kamailio-basic-kemi.cfg Modified: misc/examples/pkg/sip-router-basic.cfg Modified: misc/examples/pkg/sip-router-oob.cfg Modified: misc/tls-ca/README Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/xenial/copyright Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg Modified: src/modules/db_cassandra/kamailio_cassa.cfg Modified: src/modules/dispatcher/doc/dispatcher.cfg Modified: src/modules/ims_ocs/examples/full/kamailio.cfg Modified: src/modules/ims_ocs/examples/simple/kamailio.cfg Modified: src/modules/misc_radius/doc/misc_radius_admin.xml Modified: src/modules/smsops/examples/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668… Patch: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2018