sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:master:9178da02: rtpengine: add support for explicit load balancing options
by Richard Fuchs 04 Mar '19

04 Mar '19

Module: kamailio Branch: master Commit: 9178da02494d3fbb689db331535a31b75b28b614 URL: https://github.com/kamailio/kamailio/commit/9178da02494d3fbb689db331535a31b… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-03-04T12:07:30-05:00 rtpengine: add support for explicit load balancing options --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9178da02494d3fbb689db331535a31b… Patch: https://github.com/kamailio/kamailio/commit/9178da02494d3fbb689db331535a31b… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f27503c6cc..23e06a88a4 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2309,6 +2309,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ pv_value_t pv_val; char md5[MD5_LEN]; char branch_buf[MAX_BRANCH_PARAM_LEN]; + bencode_item_t *result; /*** get & init basic stuff needed ***/ @@ -2332,6 +2333,9 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ } ng_flags.dict = bencode_dictionary(bencbuf); + item = bencode_dictionary_add_list(ng_flags.dict, "supports"); + bencode_list_add_string(item, "load limit"); + body.s = NULL; if (op == OP_OFFER || op == OP_ANSWER) { ng_flags.flags = bencode_list(bencbuf); @@ -2499,7 +2503,26 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ goto error; } - if (!bencode_dictionary_get_strcmp(resp, "result", "error")) { + result = bencode_dictionary_get_expect(resp, "result", BENCODE_STRING); + if (!result) { + LM_ERR("No 'result' dictionary entry in response from proxy %.*s", + node->rn_url.len, node->rn_url.s); + goto error; + } + + if (!bencode_strcmp(result, "load limit")) { + item = bencode_dictionary_get_expect(resp, "message", BENCODE_STRING); + if (!item) + LM_INFO("proxy %.*s has reached its load limit - trying next one", + node->rn_url.len, node->rn_url.s); + else + LM_INFO("proxy %.*s has reached its load limit (%.*s) - trying next one", + node->rn_url.len, node->rn_url.s, + item->iov[1].iov_len, item->iov[1].iov_base); + goto select_node; + } + + if (!bencode_strcmp(result, "error")) { if (!bencode_dictionary_get_str(resp, "error-reason", &error)) { LM_ERR("proxy return error but didn't give an error reason: %.*s\n", ret, cp); } else {

1 0

git:master:2baa05ad: rtpengine: add support for via-branch=extra option
by Richard Fuchs 04 Mar '19

04 Mar '19

Module: kamailio Branch: master Commit: 2baa05ad2336f5e1286218b6516b7b8ef16037a2 URL: https://github.com/kamailio/kamailio/commit/2baa05ad2336f5e1286218b6516b7b8… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-03-04T12:06:38-05:00 rtpengine: add support for via-branch=extra option --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/2baa05ad2336f5e1286218b6516b7b8… Patch: https://github.com/kamailio/kamailio/commit/2baa05ad2336f5e1286218b6516b7b8… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 54f448e222..f27503c6cc 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -77,6 +77,7 @@ #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/kemi.h" +#include "../../core/char_msg_val.h" #include "../../modules/tm/tm_load.h" #include "rtpengine.h" #include "rtpengine_funcs.h" @@ -199,7 +200,7 @@ static int rtpengine_query1_f(struct sip_msg *, char *, char *); static int parse_flags(struct ng_flags_parse *, struct sip_msg *, enum rtpe_operation *, const char *); -static int rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more); +static int rtpengine_offer_answer(struct sip_msg *msg, const char *flags, enum rtpe_operation op, int more); static int fixup_set_id(void ** param, int param_no); static int set_rtpengine_set_f(struct sip_msg * msg, char * str1, char * str2); static struct rtpp_set * select_rtpp_set(unsigned int id_set); @@ -2212,6 +2213,8 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu ng_flags->via = 3; else if (str_eq(&val, "extra")) ng_flags->via = -1; + else if (str_eq(&val, "next")) + ng_flags->via = -2; else goto error; goto next; @@ -2304,6 +2307,8 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ struct rtpp_node *node; char *cp; pv_value_t pv_val; + char md5[MD5_LEN]; + char branch_buf[MAX_BRANCH_PARAM_LEN]; /*** get & init basic stuff needed ***/ @@ -2387,12 +2392,30 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ bencode_dictionary_add_str(ng_flags.dict, "call-id", &ng_flags.call_id); if (ng_flags.via) { - if (ng_flags.via == 1 || ng_flags.via == 2) - ret = get_via_branch(msg, ng_flags.via, &viabranch); - else if (ng_flags.via == -1 && extra_id_pv) - ret = get_extra_id(msg, &viabranch); - else - ret = -1; + ret = -1; + switch (ng_flags.via) { + case 3: + ng_flags.via = (msg->first_line.type == SIP_REPLY) ? 2 : 1; + /* fall thru */ + case 1: + case 2: + ret = get_via_branch(msg, ng_flags.via, &viabranch); + break; + case -1: + if (extra_id_pv) + ret = get_extra_id(msg, &viabranch); + break; + case -2: + if (!char_msg_val(msg, md5)) + break; + msg->hash_index = hash(msg->callid->body, get_cseq(msg)->number); + + viabranch.s = branch_buf; + if (branch_builder(msg->hash_index, 0, md5, 0, branch_buf, &viabranch.len)) + ret = 0; + break; + } + if (ret == -1 || viabranch.len == 0) { LM_ERR("can't get Via branch/extra ID\n"); goto error; @@ -3555,7 +3578,7 @@ rtpengine_answer1_f(struct sip_msg *msg, char *str1, char *str2) } static int -rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) +rtpengine_offer_answer(struct sip_msg *msg, const char *flags, enum rtpe_operation op, int more) { bencode_buffer_t bencbuf; bencode_item_t *dict;

1 0

git:master:e6950ffb: topoh: detect when via param is shorter than expected prefix
by Daniel-Constantin Mierla 04 Mar '19

04 Mar '19

Module: kamailio Branch: master Commit: e6950ffb1985493e717e3d774eddad779aed1514 URL: https://github.com/kamailio/kamailio/commit/e6950ffb1985493e717e3d774eddad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-04T09:25:58+01:00 topoh: detect when via param is shorter than expected prefix --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/e6950ffb1985493e717e3d774eddad7… Patch: https://github.com/kamailio/kamailio/commit/e6950ffb1985493e717e3d774eddad7… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 8b8d278b25..e03b3653fa 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -418,12 +418,17 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) LM_ERR("cannot find param in via %d\n", i); return -1; } - if(i==2) + if(vp->value.len <= th_vparam_prefix.len) { + LM_ERR("invalid param len in via %d\n", i); + return -1; + } + if(i==2) { out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, CRLF_LEN+1, &out.len); - else + } else { out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, 0, &out.len); + } if(out.s==NULL || out.len<=0) { LM_ERR("cannot decode via %d\n", i);

1 0

ephemeral auth username expired
by Juha Heinanen 04 Mar '19

04 Mar '19

I would suggest the following diff that allows the script to learn that timestamp in ephemeral auth username has expired. The script can then tell it to user via a suitable response. -- Juha ---------------------------------------------------------------- diff --git a/src/modules/auth/api.h b/src/modules/auth/api.h index 9730b409e..33d131840 100644 --- a/src/modules/auth/api.h +++ b/src/modules/auth/api.h @@ -39,6 +39,7 @@ */ typedef enum auth_cfg_result { AUTH_USER_MISMATCH = -8, /*!< Auth user != From/To user */ + AUTH_USERNAME_EXPIRED = -7, /*!< Ephemeral auth username expired */ AUTH_NONCE_REUSED = -6, /*!< Returned if nonce is used more than once */ AUTH_NO_CREDENTIALS = -5, /*!< Credentials missing */ AUTH_STALE_NONCE = -4, /*!< Stale nonce */ diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 745f12d7a..216332b32 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -203,7 +203,7 @@ int autheph_verify_timestamp(str *_username) if (cur_time > expires) { LM_WARN("username has expired\n"); - return -1; + return AUTH_USERNAME_EXPIRED; } return 0; @@ -255,10 +255,16 @@ static inline int digest_authenticate(struct sip_msg *_m, str *_realm, username = ((auth_body_t *) h->parsed)->digest.username.whole; LM_DBG("username: %.*s\n", username.len, username.s); - if (autheph_verify_timestamp(&username) < 0) + int res = autheph_verify_timestamp(&username); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } SECRET_LOCK; @@ -489,10 +495,16 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) return AUTH_ERROR; } - if (autheph_verify_timestamp(susername) < 0) + int res = autheph_verify_timestamp(susername); + if (res < 0) { - LM_ERR("invalid timestamp in username\n"); - return AUTH_ERROR; + if (res == -1) + { + LM_ERR("invalid timestamp in username\n"); + return AUTH_ERROR; + } else { + return AUTH_USERNAME_EXPIRED; + } } LM_DBG("username: %.*s\n", susername->len, susername->s);

1 0

git:master:cbadbca3: tcpops: Fix minor typo: tcp_init_evroutes => tcpops_init_evroutes
by Carsten Bock 03 Mar '19

03 Mar '19

Module: kamailio Branch: master Commit: cbadbca348c5deb97522afe440dc6055475ea72c URL: https://github.com/kamailio/kamailio/commit/cbadbca348c5deb97522afe440dc605… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2019-03-04T00:15:19+01:00 tcpops: Fix minor typo: tcp_init_evroutes => tcpops_init_evroutes --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/cbadbca348c5deb97522afe440dc605… Patch: https://github.com/kamailio/kamailio/commit/cbadbca348c5deb97522afe440dc605… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index d16f9db1bf..cab215365c 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -54,7 +54,7 @@ int tcp_closed_routes[_TCP_CLOSED_REASON_MAX] = /** * */ -void tcp_init_evroutes(void) +void tcpops_init_evroutes(void) { if(tcpops_event_callback.len > 0) { return;

1 0

git:master:90bcc49a: modules: readme files regenerated - dialplan ... [skip ci]
by Kamailio Dev 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: 90bcc49a7ec4e1c44ac94fd814d4ef41e79cb4f7 URL: https://github.com/kamailio/kamailio/commit/90bcc49a7ec4e1c44ac94fd814d4ef4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-03-01T15:46:42+01:00 modules: readme files regenerated - dialplan ... [skip ci] --- Modified: src/modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/90bcc49a7ec4e1c44ac94fd814d4ef4… Patch: https://github.com/kamailio/kamailio/commit/90bcc49a7ec4e1c44ac94fd814d4ef4… --- diff --git a/src/modules/dialplan/README b/src/modules/dialplan/README index a63e4bfc7c..c5bdaea8eb 100644 --- a/src/modules/dialplan/README +++ b/src/modules/dialplan/README @@ -506,7 +506,8 @@ xlog("translated to var $var(y) \n"); 6.4. dp_reload() - Forces an update of the translation rules from the database. + Reload the translation rules from the database. Note that there is a + rate limiting of maximum one reload in five seconds. Name: dp_reload

1 0

git:master:34f92842: dialplan: docs - note about limiting to max 1 rpc reload in 5 seconds
by Daniel-Constantin Mierla 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: 34f928427ecf315f638cd59fa512d59f4c64f22e URL: https://github.com/kamailio/kamailio/commit/34f928427ecf315f638cd59fa512d59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-01T15:43:16+01:00 dialplan: docs - note about limiting to max 1 rpc reload in 5 seconds --- Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/34f928427ecf315f638cd59fa512d59… Patch: https://github.com/kamailio/kamailio/commit/34f928427ecf315f638cd59fa512d59… --- diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index ed8bad4fae..371120fac4 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -620,7 +620,8 @@ xlog("translated to var $var(y) \n"); <function moreinfo="none">dp_reload()</function> </title> <para> - Forces an update of the translation rules from the database. + Reload the translation rules from the database. Note that there is + a rate limiting of maximum one reload in five seconds. </para> <para> Name: <emphasis>dp_reload</emphasis>

1 0

[kamailio/kamailio] Kamailio crash while concurrent dialplan.reload (#1874)
by Dmitri Savolainen 01 Mar '19

01 Mar '19

#### Reproduction run this script simultaneously (from two console for example) ``` #!/usr/bin/perl $cmd = q(curl -X GET -H "Content-Type: application/json" -d '{"jsonrpc": "2.0", "method": "dialplan.reload", "params":[], "id": 1 }' http://IP:PORT/jsonrpc/); for ($i=0; $i<1000; $i++){ `$cmd`; } ``` #### Debugging Data ``` Program terminated with signal 11, Segmentation fault. #0 0x00007ffaa39e95f7 in add_rule2hash (rule=0x7ffa9fa05248, h_index=1) at dp_db.c:563 /home/snen/KamailioGitMyFork/src/modules/dialplan/dp_db.c:563:12474:beg:0x7ffaa39e95f7 (gdb) bt #0 0x00007ffaa39e95f7 in add_rule2hash (rule=0x7ffa9fa05248, h_index=1) at dp_db.c:563 #1 0x00007ffaa39e4831 in dp_load_db () at dp_db.c:305 #2 0x00007ffaa39ce914 in dialplan_rpc_reload (rpc=0x7ffa9f382a80 <func_param>, ctx=0x7ffa9f3829a0 <_jsonrpc_ctx_global>) at dialplan.c:610 #3 0x00007ffa9f16398f in jsonrpc_dispatch (msg=0x7ffd427ad880, s1=0x0, s2=0x0) at jsonrpcs_mod.c:1294 #4 0x0000000000461a5f in do_action (h=0x7ffd427ad7a0, a=0x7ffaa72987d8, msg=0x7ffd427ad880) at core/action.c:1067 #5 0x000000000046e23e in run_actions (h=0x7ffd427ad7a0, a=0x7ffaa72987d8, msg=0x7ffd427ad880) at core/action.c:1564 #6 0x00000000004619ce in do_action (h=0x7ffd427ad7a0, a=0x7ffaa729b140, msg=0x7ffd427ad880) at core/action.c:1058 #7 0x000000000046e23e in run_actions (h=0x7ffd427ad7a0, a=0x7ffaa729b140, msg=0x7ffd427ad880) at core/action.c:1564 #8 0x00007ffa9f38868c in xhttp_process_request (orig_msg=0x7ffaa72a6ed0, new_buf=0x7ffaa72c4420 "GET /jsonrpc/ HTTP/1.1\r\nVia: SIP/2.0/TCP 192.168.10.190:48542\r\nUser-Agent: curl/7.29.0\r\nHost: 192.168.10.190:5071\r\nAccept: */*\r\nContent-Type: application/json\r\nContent-Length: 71\r\n\r\n{\"jsonrpc\": \"2.0\","..., new_len=253) at xhttp_mod.c:296 #9 0x00007ffa9f389dcf in xhttp_handler (msg=0x7ffaa72a6ed0) at xhttp_mod.c:383 #10 0x00000000004ff30c in nonsip_msg_run_hooks (msg=0x7ffaa72a6ed0) at core/nonsip_hooks.c:112 #11 0x000000000057b373 in receive_msg ( buf=0x7ffaa02ec618 "GET /jsonrpc/ HTTP/1.1\r\nUser-Agent: curl/7.29.0\r\nHost: 192.168.10.190:5071\r\nAccept: */*\r\nContent-Type: application/json\r\nContent-Length: 71\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\": \"dialplan.reload\", \"params\":"..., len=214, rcv_info=0x7ffaa02ec338) at core/receive.c:270 #12 0x0000000000635eb5 in receive_tcp_msg ( tcpbuf=0x7ffaa02ec618 "GET /jsonrpc/ HTTP/1.1\r\nUser-Agent: curl/7.29.0\r\nHost: 192.168.10.190:5071\r\nAccept: */*\r\nContent-Type: application/json\r\nContent-Length: 71\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\": \"dialplan.reload\", \"params\":"..., len=214, rcv_info=0x7ffaa02ec338, con=0x7ffaa02ec320) at core/tcp_read.c:1399 #13 0x0000000000638372 in tcp_read_req (con=0x7ffaa02ec320, bytes_read=0x7ffd427ae65c, read_flags=0x7ffd427ae658) at core/tcp_read.c:1631 #14 0x000000000063b115 in handle_io (fm=0x7ffaa7302d78, events=1, idx=-1) at core/tcp_read.c:1804 #15 0x00000000006299b6 in io_wait_loop_epoll (h=0xae9060 <io_w>, t=2, repeat=0) at core/io_wait.h:1062 #16 0x000000000063d172 in tcp_receive_loop (unix_sock=16) at core/tcp_read.c:1974 #17 0x00000000004dcaf9 in tcp_init_children () at core/tcp_main.c:5086 #18 0x00000000004266c4 in main_loop () at main.c:1750 #19 0x000000000042d14b in main (argc=13, argv=0x7ffd427aedc8) at main.c:2737 (gdb) l 558 new_id = 0; 559 560 /*search for the corresponding dpl_id*/ 561 for(crt_idp = last_idp =rules_hash[h_index]; crt_idp!= NULL; 562 last_idp = crt_idp, crt_idp = crt_idp->next) 563 if(crt_idp->dp_id == rule->dpid) 564 break; 565 566 /*didn't find a dpl_id*/ 567 if(!crt_idp){ (gdb) p crt_idp->dp_id Cannot access memory at address 0x7ffa9f002429 (gdb) ``` ### Additional Information ``` kamailio 5.3.0-dev3 (x86_64/linux) d726bd ``` -- 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/1874

2 4

git:master:1fd9b508: pv: new variable $rcv(key)
by Daniel-Constantin Mierla 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: 1fd9b508ccba3f52e68f04cd6e4580bc342489e6 URL: https://github.com/kamailio/kamailio/commit/1fd9b508ccba3f52e68f04cd6e4580b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-01T15:06:16+01:00 pv: new variable $rcv(key) - available inside event_route[core:msg-received] - get details of the received message - the key can be: * buf - received message * len - lenght of received message * srcip - source ip * rcvip - local ip where it was received * scrport - source port * rcvport - local port where it was received * proto - protocol as int id * sproto - protocol as string * af - address family --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_branch.c Modified: src/modules/pv/pv_branch.h --- Diff: https://github.com/kamailio/kamailio/commit/1fd9b508ccba3f52e68f04cd6e4580b… Patch: https://github.com/kamailio/kamailio/commit/1fd9b508ccba3f52e68f04cd6e4580b… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 0df9353606..24687d45a1 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -90,6 +90,8 @@ static pv_export_t mod_pvs[] = { pv_parse_snd_name, 0, 0, 0 }, { {"sndfrom", (sizeof("sndfrom")-1)}, PVT_OTHER, pv_get_sndfrom, 0, pv_parse_snd_name, 0, 0, 0 }, + { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0, + pv_parse_rcv_name, 0, 0, 0 }, #ifdef WITH_XAVP { {"xavp", sizeof("xavp")-1}, /* xavp */ PVT_XAVP, pv_get_xavp, pv_set_xavp, diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index b0668c07f8..8100046b94 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -533,6 +533,110 @@ int pv_parse_snd_name(pv_spec_p sp, str *in) return -1; } +int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + sr_net_info_t *neti = NULL; + str s; + + neti = ksr_evrt_rcvnetinfo_get(); + + if (neti==NULL || neti->rcv==NULL || neti->rcv->bind_address==NULL) + return pv_get_null(msg, param, res); + + switch(param->pvn.u.isname.name.n) + { + case 1: /* buf */ + s.s = neti->data.s; + s.len = neti->data.len; + return pv_get_strval(msg, param, res, &s); + case 2: /* len */ + return pv_get_uintval(msg, param, res, + (int)neti->data.len); + case 3: /* proto */ + return pv_get_uintval(msg, param, res, (int)neti->rcv->proto); + case 4: /* srcip */ + s.s = ip_addr2a(&neti->rcv->src_ip); + s.len = strlen(s.s); + return pv_get_strval(msg, param, res, &s); + case 5: /* rcvip */ + s.s = ip_addr2a(&neti->rcv->dst_ip); + s.len = strlen(s.s); + return pv_get_strval(msg, param, res, &s); + case 6: /* sproto */ + if(get_valid_proto_string((int)neti->rcv->proto, + 0, 0, &s)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &s); + case 7: /* srcport */ + return pv_get_uintval(msg, param, res, + (int)neti->rcv->src_port); + case 8: /* rcvport */ + return pv_get_uintval(msg, param, res, + (int)neti->rcv->dst_port); + default: + /* 0 - af */ + return pv_get_uintval(msg, param, res, + (int)neti->rcv->bind_address->address.af); + } + + return 0; +} + +int pv_parse_rcv_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 2: + if(strncmp(in->s, "af", 2)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 3: + if(strncmp(in->s, "buf", 3)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "len", 3)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else goto error; + break; + case 5: + if(strncmp(in->s, "proto", 5)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "srcip", 5)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "rcvip", 5)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + case 6: + if(strncmp(in->s, "sproto", 6)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else goto error; + break; + case 7: + if(strncmp(in->s, "srcport", 7)==0) + sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "rcvport", 7)==0) + sp->pvp.pvn.u.isname.name.n = 8; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV rcv name %.*s\n", in->len, in->s); + return -1; +} + int pv_get_nh(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_branch.h b/src/modules/pv/pv_branch.h index e69e785526..a83c98208b 100644 --- a/src/modules/pv/pv_branch.h +++ b/src/modules/pv/pv_branch.h @@ -40,6 +40,10 @@ int pv_get_sndfrom(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_parse_snd_name(pv_spec_p sp, str *in); +int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +int pv_parse_rcv_name(pv_spec_p sp, str *in); + int pv_get_nh(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_parse_nh_name(pv_spec_p sp, str *in);

1 0

git:master:01a02091: core: init actions context for running event_route[core:msg-received]
by Daniel-Constantin Mierla 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: 01a02091835651d8eccdba05887a4f2e6f8af725 URL: https://github.com/kamailio/kamailio/commit/01a02091835651d8eccdba05887a4f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-01T15:05:36+01:00 core: init actions context for running event_route[core:msg-received] --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/01a02091835651d8eccdba05887a4f2… Patch: https://github.com/kamailio/kamailio/commit/01a02091835651d8eccdba05887a4f2… --- diff --git a/src/core/receive.c b/src/core/receive.c index 7f677865cd..dd9248c721 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -200,6 +200,7 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) ksr_evrt_rcvnetinfo = &netinfo; set_route_type(REQUEST_ROUTE); fmsg = faked_msg_get_next(); + init_run_actions_ctx(&ra_ctx); if(keng) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ra_ctx);

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 March 2019