sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

git:master:fcf1d3d7: topos: keep original contact in 3xx responses sent out
by Daniel-Constantin Mierla 24 Jul '18

24 Jul '18

Module: kamailio Branch: master Commit: fcf1d3d778a903852b6e21103a23bd7fd6e3bbc9 URL: https://github.com/kamailio/kamailio/commit/fcf1d3d778a903852b6e21103a23bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-24T16:10:16+02:00 topos: keep original contact in 3xx responses sent out - reported by Andrew Pogrebennyk --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/fcf1d3d778a903852b6e21103a23bd7… Patch: https://github.com/kamailio/kamailio/commit/fcf1d3d778a903852b6e21103a23bd7… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 41cb7ef416..b349865262 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1074,12 +1074,17 @@ int tps_response_sent(sip_msg_t *msg) mtsd.direction = direction; tps_remove_headers(msg, HDR_RECORDROUTE_T); - tps_remove_headers(msg, HDR_CONTACT_T); - if(direction==TPS_DIR_DOWNSTREAM) { - tps_reinsert_contact(msg, &stsd, &stsd.as_contact); - } else { - tps_reinsert_contact(msg, &stsd, &stsd.bs_contact); + /* keep contact without updates for redirect responses sent out */ + if(msg->first_line.u.reply.statuscode<300 + || msg->first_line.u.reply.statuscode>=400) { + tps_remove_headers(msg, HDR_CONTACT_T); + + if(direction==TPS_DIR_DOWNSTREAM) { + tps_reinsert_contact(msg, &stsd, &stsd.as_contact); + } else { + tps_reinsert_contact(msg, &stsd, &stsd.bs_contact); + } } tps_reappend_rr(msg, &btsd, &btsd.x_rr);

1 0

git:master:2dfe895f: modules: readme files regenerated - http_async_client ... [skip ci]
by Kamailio Dev 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 2dfe895f52b2eac95dc0a9721bdb94225f28e827 URL: https://github.com/kamailio/kamailio/commit/2dfe895f52b2eac95dc0a9721bdb942… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-23T23:16:36+02:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/2dfe895f52b2eac95dc0a9721bdb942… Patch: https://github.com/kamailio/kamailio/commit/2dfe895f52b2eac95dc0a9721bdb942… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index e1b307ae76..635e6207b2 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ...

1 0

git:5.0:7571fa3c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 23 Jul '18

23 Jul '18

Module: kamailio Branch: 5.0 Commit: 7571fa3c85badec8bcf8bbda28842f6daa5ea0a5 URL: https://github.com/kamailio/kamailio/commit/7571fa3c85badec8bcf8bbda28842f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-23T23:01:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/7571fa3c85badec8bcf8bbda28842f6… Patch: https://github.com/kamailio/kamailio/commit/7571fa3c85badec8bcf8bbda28842f6… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index d61ae9c305..9e7ba1fafb 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ...

1 0

git:5.0:84f1f516: http_async_client: fix doc example regarding http_req_id
by Henning Westerholt 23 Jul '18

23 Jul '18

Module: kamailio Branch: 5.0 Commit: 84f1f516fa4d62ba556d67006288af8c018b0dd2 URL: https://github.com/kamailio/kamailio/commit/84f1f516fa4d62ba556d67006288af8… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-07-23T23:00:48+02:00 http_async_client: fix doc example regarding http_req_id (cherry picked from commit 45874202fd76f70c601b7ee7e22e950d06968d87) --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/84f1f516fa4d62ba556d67006288af8… Patch: https://github.com/kamailio/kamailio/commit/84f1f516fa4d62ba556d67006288af8… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 8629edabac..7131a71dfb 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ... </programlisting>

1 0

git:5.1:9e6f1362: http_async_client: fix doc example regarding http_req_id
by Henning Westerholt 23 Jul '18

23 Jul '18

Module: kamailio Branch: 5.1 Commit: 9e6f1362d4b7374a8f48b362128b9082a6a18482 URL: https://github.com/kamailio/kamailio/commit/9e6f1362d4b7374a8f48b362128b908… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-07-23T23:00:23+02:00 http_async_client: fix doc example regarding http_req_id (cherry picked from commit 45874202fd76f70c601b7ee7e22e950d06968d87) --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9e6f1362d4b7374a8f48b362128b908… Patch: https://github.com/kamailio/kamailio/commit/9e6f1362d4b7374a8f48b362128b908… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 8629edabac..7131a71dfb 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ... </programlisting>

1 0

git:master:45874202: http_async_client: fix doc example regarding http_req_id
by Henning Westerholt 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 45874202fd76f70c601b7ee7e22e950d06968d87 URL: https://github.com/kamailio/kamailio/commit/45874202fd76f70c601b7ee7e22e950… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-07-23T22:58:23+02:00 http_async_client: fix doc example regarding http_req_id --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45874202fd76f70c601b7ee7e22e950… Patch: https://github.com/kamailio/kamailio/commit/45874202fd76f70c601b7ee7e22e950… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 6752b12d04..605964e268 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -358,10 +358,10 @@ $http_req(suspend) = 0; http_async_query("https://example.com/test.php", "HTTP_REPLY"); -xlog("L_INFO", "Query id: $http_query_id"); +xlog("L_INFO", "Query id: $http_req_id"); ... route[HTTP_REPLY] { -xlog("L_INFO", "received reply for query $http_query_id\n"); +xlog("L_INFO", "received reply for query $http_req_id\n"); } ... </programlisting>

1 0

[kamailio/kamailio] Reply code in $uac_req(evcode) remains 401 instead of 200 when using uac_req_send() with authentication (#1598)
by Joel Serrano 23 Jul '18

23 Jul '18

### Description Following this scenario: Softphone <-> Kamailio <-> Asterisk 1- Softphone registers with kamailio (REGISTER) 2- Kamailio challenges... (401) 3- Softphone registers with kamailio (REGISTER + Auth info) 4- Kamailio accepts (200) 5- If Kamailio accepted, it sends a REGISTER to asterisk (REGISTER) 6- Asterisk challenges... (401) 7- Kamailio authenticates (REGISTER + Auth info) 8- Asterisk accepts (200) (NOTE: I know you can avoid Asterisk re-requesting for authentication, but in this case it's mandatory.) kamailio.cfg has this: ``` $var(rip) = $(avp(s:dsp_uri_list){uri.host}); $var(rip_port) = $(avp(s:dsp_uri_list){uri.port}); $uac_req(method)="REGISTER"; $uac_req(auser)=$avp(customer_user); $uac_req(apasswd)=$avp(customer_pass); $uac_req(ruri)="sip:" + $var(rip) + ":" + $var(rip_port); $uac_req(furi)="sip:" + $au + "@" + $var(rip); $uac_req(turi)="sip:" + $au + "@" + $var(rip); $uac_req(hdrs)="Contact: <sip:" + $au + "@X.X.X.X:5060>\r\n"; $uac_req(evroute)=1; if ($sel(contact.expires) != $null) { $uac_req(hdrs)= $uac_req(hdrs) + "Expires: " + $sel(contact.expires) + "\r\n"; } else { $uac_req(hdrs)= $uac_req(hdrs) + "Expires: " + $hdr(Expires) + "\r\n"; } uac_req_send(); ``` and this: ``` # Log replies from uac_req_send() event_route[uac:reply] { xlog("L_NOTICE", "[UAC] - $uac_req(method) request from user $uac_req(auser) to $uac_req(ruri) completed with code: $uac_req(evcode)\n"); } ``` The result: ![image](https://user-images.githubusercontent.com/16212586/43027222-0a32bd48-8c2e-11e8-8038-16d0dba00dec.png) ``` Jul 20 16:49:42 sbc01 sbc[5236]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 16:51:05 sbc01 sbc[5240]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 16:51:49 sbc01 sbc[5241]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 17:00:06 sbc01 sbc[5239]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 Jul 20 17:09:06 sbc01 sbc[5240]: NOTICE: <script>: [UAC] - REGISTER request from user XXXXX to sip:A.B.C.D:5060 completed with code: 401 ``` I was expecting for `$uac_req(evcode)` to be 200, but it's 401. #### Reproduction Generate a REGISTER using uaq_send_req() with `auser` and `apasswd` set, and then print the `$uac_req(evcode)` from the corresponding `event_route[]`. ### Possible Solutions Not sure if the 401 is expected because it was the *first* final response, period. Or, (when using authentication), it should be updated to 200 or whatever the reply is after sending the REGISTER with auth info. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**: ``` OS: Debian stretch 9.4 Kernel: Linux kamailio 4.9.0-6-amd64 #1 SMP Debian 4.9.88-1+deb9u1 (2018-05-07) x86_64 GNU/Linux ``` -- 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/1598

3 8

git:master:ab6e63dc: misc/examples: added minimal config sample for anycast
by Daniel-Constantin Mierla 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: ab6e63dcb31551a9b534f26eeae883153fd1af39 URL: https://github.com/kamailio/kamailio/commit/ab6e63dcb31551a9b534f26eeae8831… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-23T14:08:38+02:00 misc/examples: added minimal config sample for anycast --- Added: misc/examples/mixed/kamailio-minimal-anycast.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ab6e63dcb31551a9b534f26eeae8831… Patch: https://github.com/kamailio/kamailio/commit/ab6e63dcb31551a9b534f26eeae8831…

1 0

git:master:5c3df566: uac: call event route for uac_req_send() for second response
by Daniel-Constantin Mierla 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 5c3df566887e8c37d3144d4191b36fc9eba24c34 URL: https://github.com/kamailio/kamailio/commit/5c3df566887e8c37d3144d4191b36fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-23T13:59:28+02:00 uac: call event route for uac_req_send() for second response - done in case the request is resent after a 401/407 - GH #1598 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/5c3df566887e8c37d3144d4191b36fc… Patch: https://github.com/kamailio/kamailio/commit/5c3df566887e8c37d3144d4191b36fc… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 5db66bd1a2..1d939dc815 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -656,7 +656,35 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) } /** - * TM callback function + * TM resend callback function + */ +void uac_resend_tm_callback(struct cell *t, int type, struct tmcb_params *ps) +{ + uac_send_info_t *tp = NULL; + + LM_DBG("tm callback with status %d\n", ps->code); + + if(ps->param==NULL || *ps->param==0) + { + LM_DBG("callback param with message id not received\n"); + goto done; + } + tp = (uac_send_info_t*)(*ps->param); + + if(tp->evroute!=0) { + uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, + tp, ps->code); + } + +done: + if(tp!=NULL) + shm_free(tp); + return; + +} + +/** + * TM send callback function */ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) { @@ -753,6 +781,12 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) uac_r.ssock = (tp->s_sock.len <= 0) ? NULL : &tp->s_sock; uac_r.dialog = &tmdlg; uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + if(tp->evroute!=0) { + /* Callback function */ + uac_r.cb = uac_resend_tm_callback; + /* Callback parameter */ + uac_r.cbp = (void*)tp; + } ret = tmb.t_request_within(&uac_r); if(ret<0) { @@ -760,6 +794,10 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) goto error; } + if(tp->evroute!=0) { + return; + } + done: error: if(tp!=NULL)

1 0

git:master:1ac4527a: uac: uac_send - small bits of formatting
by Daniel-Constantin Mierla 23 Jul '18

23 Jul '18

Module: kamailio Branch: master Commit: 1ac4527ac8f05dbb48e3ab9e2aa9790ae86f179f URL: https://github.com/kamailio/kamailio/commit/1ac4527ac8f05dbb48e3ab9e2aa9790… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-23T13:59:28+02:00 uac: uac_send - small bits of formatting --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/1ac4527ac8f05dbb48e3ab9e2aa9790… Patch: https://github.com/kamailio/kamailio/commit/1ac4527ac8f05dbb48e3ab9e2aa9790… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 78dc725453..5db66bd1a2 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -499,12 +499,12 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "all", 3)==0) sp->pvp.pvn.u.isname.name.n = 0; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "ruri", 4)==0) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "turi", 4)==0) @@ -526,7 +526,7 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; - case 6: + case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 7; else if(strncmp(in->s, "callid", 6)==0) @@ -537,7 +537,7 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 16; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "evroute", 7)==0) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "apasswd", 7)==0) @@ -655,7 +655,7 @@ void uac_req_run_event_route(sip_msg_t *msg, uac_send_info_t *tp, int rcode) set_route_type(backup_rt); } -/** +/** * TM callback function */ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps)

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2018