sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:96642c19: misc/tools/kemi: lua - fixed typos in readme

by GitHub

Module: kamailio Branch: master Commit: 96642c19fa0fb135d9c0bb30d35834b7938c668d URL: https://github.com/kamailio/kamailio/commit/96642c19fa0fb135d9c0bb30d35834b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-23T21:17:59+01:00 misc/tools/kemi: lua - fixed typos in readme --- Modified: misc/tools/kemi/lua/README.md --- Diff: https://github.com/kamailio/kamailio/commit/96642c19fa0fb135d9c0bb30d35834b… Patch: https://github.com/kamailio/kamailio/commit/96642c19fa0fb135d9c0bb30d35834b… --- diff --git a/misc/tools/kemi/lua/README.md b/misc/tools/kemi/lua/README.md index 41fa5e8694..8847c810f7 100644 --- a/misc/tools/kemi/lua/README.md +++ b/misc/tools/kemi/lua/README.md @@ -71,9 +71,9 @@ Other external tools useful to check the Lua scripts. ### luac ### The `luac` (the Lua compiler) can be used with parameter `-p` to check for -syntax errors (e.g., missing closing quote or parenthesis).:w +syntax errors (e.g., missing closing quote or parenthesis). -Example - when there is a missing closing quite, like: +Example - when there is a missing closing quote, like: ``` KSR.hdr.remove("Route);

4 years

git:master:3f4e5899: misc/tools/kemi: lua - full file name for kemiluacheck tool

by GitHub

Module: kamailio Branch: master Commit: 3f4e589973ff7746611242f50d14eb990b2efa3f URL: https://github.com/kamailio/kamailio/commit/3f4e589973ff7746611242f50d14eb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-23T19:44:08+01:00 misc/tools/kemi: lua - full file name for kemiluacheck tool --- Modified: misc/tools/kemi/lua/README.md --- Diff: https://github.com/kamailio/kamailio/commit/3f4e589973ff7746611242f50d14eb9… Patch: https://github.com/kamailio/kamailio/commit/3f4e589973ff7746611242f50d14eb9… --- diff --git a/misc/tools/kemi/lua/README.md b/misc/tools/kemi/lua/README.md index de2a7b814c..41fa5e8694 100644 --- a/misc/tools/kemi/lua/README.md +++ b/misc/tools/kemi/lua/README.md @@ -2,7 +2,7 @@ Tools useful for using Kamailio with KEMI Lua scripts. -## kemiksrlib ## +## kemiksrlib.py ## Generates the file `KSR.lua` with skeleton functions in the `KSR` object. The function parameters are prefixed with `p_` and the functions return: @@ -85,4 +85,4 @@ the check results in: luac -p kamailio-basic-kemi-lua.lua luac: kamailio-basic-kemi-lua.lua:100: unfinished string near '"Route);' -``` \ No newline at end of file +```

4 years

[kamailio/kamailio] Keep several last versions at Kamailio build infrustructure (#2557)

by arkadiam

### Description When a new version in released, built and made available it'll be great to preserve at least one previous build. E.g. for Ubuntu/Debian repos: deb http://deb.kamailio.org/kamailio53 bionic main deb-src http://deb.kamailio.org/kamailio53 bionic main As of today these repos have 5.3.7 builds only. It not possible to downgrade to a previous version 5.3.6 using native package management tools. ### Expected behaviour apt list -a kamailio ...have kamailio 5.3.6 option here... apt install kamailio=5.3.6+ubuntu18.04 #### Actual observed behaviour apt list -a kamailio Listing... Done kamailio/unknown,now 5.3.7+ubuntu18.04 amd64 [installed] kamailio/bionic 5.1.2-1ubuntu2 amd64 #### Other notes This will be helpful in cases when quick downgrade is required. After the last upgrade to 5.3.7 by some reason Kamailio stopped processing ACKs after the call was answered and 200 OK was sent. We had to rebuild 5.3.6 from sources and rollback to our build to restore the service. I'll try to figure out what was the issue and provide more details in a separate issue. -- 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/issues/2557

4 years

git:master:c89d46d8: misc/tools/kemi: lua - tools useful for using Kamailio with KEMI Lua scripts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c89d46d88687602131c88b4001345a0be9f01380 URL: https://github.com/kamailio/kamailio/commit/c89d46d88687602131c88b4001345a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T14:21:12+01:00 misc/tools/kemi: lua - tools useful for using Kamailio with KEMI Lua scripts --- Added: misc/tools/kemi/lua/README.md Added: misc/tools/kemi/lua/kemiksrlib.py Added: misc/tools/kemi/lua/kemiluacheck.py --- Diff: https://github.com/kamailio/kamailio/commit/c89d46d88687602131c88b4001345a0… Patch: https://github.com/kamailio/kamailio/commit/c89d46d88687602131c88b4001345a0…

4 years

git:master:6035c30a: misc/examples/kemi: fixed function name to get From-URI

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6035c30aea72d06bf08883677d45f4eb0019f189 URL: https://github.com/kamailio/kamailio/commit/6035c30aea72d06bf08883677d45f4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T13:48:01+01:00 misc/examples/kemi: fixed function name to get From-URI --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/6035c30aea72d06bf08883677d45f4e… Patch: https://github.com/kamailio/kamailio/commit/6035c30aea72d06bf08883677d45f4e… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 0ddfc82c1e..bddabbaa89 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -163,13 +163,13 @@ function ksr_route_reqinit() if KSR.htable.sht_match_name("ipban", "eq", srcip) > 0 then -- ip is already blocked KSR.dbg("request from blocked IP - " .. KSR.kx.get_method() - .. " from " .. KSR.kx.gete_furi() .. " (IP:" + .. " from " .. KSR.kx.get_furi() .. " (IP:" .. srcip .. ":" .. KSR.kx.get_srcport() .. ")\n"); KSR.x.exit(); end if KSR.pike.pike_check_req() < 0 then KSR.err("ALERT: pike blocking " .. KSR.kx.get_method() - .. " from " .. KSR.kx.gete_furi() .. " (IP:" + .. " from " .. KSR.kx.get_furi() .. " (IP:" .. srcip .. ":" .. KSR.kx.get_srcport() .. ")\n"); KSR.htable.sht_seti("ipban", srcip, 1); KSR.x.exit();

4 years

git:master:454c4653: etc/kamailio.cfg: split to filter on both friendly and scanner

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 454c4653409a69ef115de5ee748524d36e147246 URL: https://github.com/kamailio/kamailio/commit/454c4653409a69ef115de5ee748524d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T10:10:55+01:00 etc/kamailio.cfg: split to filter on both friendly and scanner - some scanning scripts use a different format for the user agent --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/454c4653409a69ef115de5ee748524d… Patch: https://github.com/kamailio/kamailio/commit/454c4653409a69ef115de5ee748524d… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 29af152df7..2cf02d995b 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -615,7 +615,7 @@ route[REQINIT] { } } #!endif - if($ua =~ "friendly-scanner|sipcli|sipvicious|VaxSIPUserAgent") { + if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit;

4 years

git:master:e15c90d3: misc/examples/kemi: filter on user agent matching friendly, scanner and sipvicious

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e15c90d31fd0444f41cb862408f77399123c0191 URL: https://github.com/kamailio/kamailio/commit/e15c90d31fd0444f41cb862408f7739… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T10:09:33+01:00 misc/examples/kemi: filter on user agent matching friendly, scanner and sipvicious --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/e15c90d31fd0444f41cb862408f7739… Patch: https://github.com/kamailio/kamailio/commit/e15c90d31fd0444f41cb862408f7739… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 7cc880f290..ab3799fdc9 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -133,7 +133,8 @@ function ksr_route_reqinit() } if (KSR.corex.has_user_agent()>0) { var UA = KSR.pv.gete("$ua"); - if (UA.indexOf("friendly-scanner")>=0 || UA.indexOf("sipcli")>=0) { + if (UA.indexOf("friendly")>=0 || UA.indexOf("scanner")>=0 + || UA.indexOf("sipcli")>=0 || UA.indexOf("sipvicious")>=0) { KSR.sl.sl_send_reply(200, "OK"); KSR.x.exit(); } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index fc31e1b93c..0ddfc82c1e 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -176,8 +176,8 @@ function ksr_route_reqinit() end end local ua = KSR.kx.gete_ua(); - if string.find(ua, "friendly-scanner") - or string.find(ua, "sipcli") then + if string.find(ua, "friendly") or string.find(ua, "scanner") + or string.find(ua, "sipcli") or string.find(ua, "sipvicious") then KSR.sl.sl_send_reply(200, "OK"); KSR.x.exit(); end diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index f73abfedc5..601daa3687 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -157,8 +157,8 @@ def ksr_route_reqinit(self, msg): if KSR.corex.has_user_agent() > 0 : ua = KSR.pv.gete("$ua") - if (ua.find("friendly-scanner")!=-1 - or ua.find("sipcli")!=-1) : + if (ua.find("friendly")!=-1 or ua.find("scanner")!=-1 + or ua.find("sipcli")!=-1 or ua.find("sipvicious")!=-1) : KSR.sl.sl_send_reply(200, "Processed") return -255 diff --git a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb index 11f96b460c..2a3a9eca41 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb +++ b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb @@ -41,7 +41,7 @@ def ksr_request_route() # Auth ksr_route_auth() - + # Record routing for dialog forming requests (in case they are routed) KSR::HDR.remove("Route") if KSR.is_method_in("IS") then @@ -65,7 +65,8 @@ def ksr_request_route() def ksr_route_reqinit() if KSR::COREX.has_user_agent() > 0 then ua = KSR::PV.gete("$ua"); - if ua.include? 'friendly-scanner' or ua.include? 'sipcli' then + if ua.include? 'friendly' or ua.include? 'scanner' + or ua.include? 'sipcli' or ua.include? 'sipvicious' then KSR::SL.sl_send_reply(200, "OK"); exit end diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index 4926ec8317..38672aa817 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -137,7 +137,8 @@ function ksr_route_reqinit() if (KSR.corex.has_user_agent()>0) { local UA = KSR.pv.get("$ua"); // if (sipscanregex.match(UA)) { - if (UA.find("friendly-scanner")!=null || UA.find("sipcli")!=null) { + if (UA.find("friendly")!=null || UA.find("scanner")!=null + || UA.find("sipcli")!=null || UA.find("sipvicious")!=null) { KSR.sl.sl_send_reply(200, "OK"); KSR.x.exit(); }

4 years

git:master:b59204eb: kemix: exported functions to get socket string and name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b59204eb1df8c85bcdde65f2a840f55986f01223 URL: https://github.com/kamailio/kamailio/commit/b59204eb1df8c85bcdde65f2a840f55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T08:15:34+01:00 kemix: exported functions to get socket string and name --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b59204eb1df8c85bcdde65f2a840f55… Patch: https://github.com/kamailio/kamailio/commit/b59204eb1df8c85bcdde65f2a840f55… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 66cdcf1bc1..ba56a6c16f 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -486,6 +486,39 @@ static sr_kemi_xval_t* ki_kx_get_srcport(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_send_sock(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if (msg==NULL || msg->force_send_socket==0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->force_send_socket->sock_str; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_send_sock_name(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if (msg==NULL || msg->force_send_socket==0 + || msg->force_send_socket->sockname.s==0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->force_send_socket->sockname; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -520,6 +553,23 @@ static sr_kemi_xval_t* ki_kx_get_rcvport(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcv_sock_name(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL || msg->rcv.bind_address==NULL + || msg->rcv.bind_address->sockname.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->rcv.bind_address->sockname; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -1107,11 +1157,26 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_send_sock"), + SR_KEMIP_XVAL, ki_kx_get_send_sock, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_send_sock_name"), + SR_KEMIP_XVAL, ki_kx_get_send_sock_name, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_rcvip"), SR_KEMIP_XVAL, ki_kx_get_rcvip, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_rcv_sock_name"), + SR_KEMIP_XVAL, ki_kx_get_rcv_sock_name, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_rcvport"), SR_KEMIP_XVAL, ki_kx_get_rcvport, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

4 years

git:master:efe36cf0: pv: new variable $Rn - return receiving socket name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: efe36cf0bab16addb2a42a696f58ee38477f9e7f URL: https://github.com/kamailio/kamailio/commit/efe36cf0bab16addb2a42a696f58ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T07:44:09+01:00 pv: new variable $Rn - return receiving socket name --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/efe36cf0bab16addb2a42a696f58ee3… Patch: https://github.com/kamailio/kamailio/commit/efe36cf0bab16addb2a42a696f58ee3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 9367103bfe..bd80bafed7 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -410,6 +410,9 @@ static pv_export_t mod_pvs[] = { {{"Rut", (sizeof("Rut")-1)}, /* */ PVT_OTHER, pv_get_rcvaddr_uri_full, 0, 0, 0, 0, 0}, + {{"Rn", (sizeof("Rn")-1)}, /* */ + PVT_OTHER, pv_get_rcvsname, 0, + 0, 0, 0, 0}, {{"RAi", (sizeof("RAi")-1)}, /* */ PVT_OTHER, pv_get_rcv_advertised_ip, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index f7af431341..e569a393e8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -858,6 +858,19 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcvsname(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address==NULL + || msg->rcv.bind_address->sockname.s==NULL) + return pv_get_null(msg, param, res); + + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->sockname); +} + int pv_get_rcvaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, int tmode, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index cf87a7e0c9..29ec9f25a4 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -163,6 +163,9 @@ int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvsname(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

4 years

git:master:070a9c04: kemix: exported function get_rcvadvip() and get_rcvadvport()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 070a9c042a1caf19162d3d97b26f8d7548747cbb URL: https://github.com/kamailio/kamailio/commit/070a9c042a1caf19162d3d97b26f8d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-20T08:12:18+01:00 kemix: exported function get_rcvadvip() and get_rcvadvport() - return advertised address and port of the receiving socket --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/070a9c042a1caf19162d3d97b26f8d7… Patch: https://github.com/kamailio/kamailio/commit/070a9c042a1caf19162d3d97b26f8d7… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 4bd6f839d1..66cdcf1bc1 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -520,6 +520,38 @@ static sr_kemi_xval_t* ki_kx_get_rcvport(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvadvip(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.address_str.len > 0) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->rcv.bind_address->useinfo.address_str; + return &_sr_kemi_kx_xval; + } + + return ki_kx_get_rcvip(msg); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvadvport(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = (int)msg->rcv.bind_address->useinfo.port_no; + return &_sr_kemi_kx_xval; + } + + return ki_kx_get_rcvport(msg); +} + /** * */ @@ -1085,6 +1117,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_rcvadvip"), + SR_KEMIP_XVAL, ki_kx_get_rcvadvip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rcvadvport"), + SR_KEMIP_XVAL, ki_kx_get_rcvadvport, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_proto"), SR_KEMIP_XVAL, ki_kx_get_proto, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

4 years

← Newer
1
...
13
14
15
16
17
18
19
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020