sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
237 discussions

git:master:7456a25e: textopsx: if no param is given to keep_hf(re), then keep only mandatory headers
by Daniel-Constantin Mierla 05 Oct '15

05 Oct '15

Module: kamailio Branch: master Commit: 7456a25e214658bbbfb420d8401366b34c6a285c URL: https://github.com/kamailio/kamailio/commit/7456a25e214658bbbfb420d8401366b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-05T07:42:10+02:00 textopsx: if no param is given to keep_hf(re), then keep only mandatory headers --- Modified: modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7456a25e214658bbbfb420d8401366b… Patch: https://github.com/kamailio/kamailio/commit/7456a25e214658bbbfb420d8401366b… --- diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index b170eb8..564e9ac 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -84,6 +84,8 @@ static cmd_export_t cmds[] = { change_reply_status_fixup, ONREPLY_ROUTE }, {"remove_body", (cmd_function)w_remove_body_f, 0, 0, ANY_ROUTE }, + {"keep_hf", (cmd_function)w_keep_hf_f, 0, + fixup_regexp_null, ANY_ROUTE }, {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, ANY_ROUTE }, {"fnmatch", (cmd_function)w_fnmatch2_f, 2, @@ -356,7 +358,11 @@ static int w_keep_hf_f(struct sip_msg* msg, char* key, char* foo) char c; struct lump* l; - re = (regex_t*)key; + if(key) { + re = (regex_t*)key; + } else { + re = NULL; + } /* we need to be sure we have seen all HFs */ parse_headers(msg, HDR_EOH_F, 0); @@ -380,20 +386,32 @@ static int w_keep_hf_f(struct sip_msg* msg, char* key, char* foo) ; } - c = hf->name.s[hf->name.len]; - hf->name.s[hf->name.len] = '\0'; - if (regexec(re, hf->name.s, 1, &pmatch, 0)!=0) - { - /* no match => remove */ - hf->name.s[hf->name.len] = c; + if(re==NULL) { + /* no regex to match => remove all */ l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); if (l==0) { - LM_ERR("cannot remove header\n"); + LM_ERR("cannot remove header [%.*s]\n", + hf->name.len, hf->name.s); return -1; } } else { - hf->name.s[hf->name.len] = c; + c = hf->name.s[hf->name.len]; + hf->name.s[hf->name.len] = '\0'; + if (regexec(re, hf->name.s, 1, &pmatch, 0)!=0) + { + /* no match => remove */ + hf->name.s[hf->name.len] = c; + l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); + if (l==0) + { + LM_ERR("cannot remove header [%.*s]\n", + hf->name.len, hf->name.s); + return -1; + } + } else { + hf->name.s[hf->name.len] = c; + } } }

1 0

git:master:22e1dcd8: tcpops Add simple function with true/false response for connection state checking - tcp_conid_alive
by Olle E. Johansson 04 Oct '15

04 Oct '15

Module: kamailio Branch: master Commit: 22e1dcd860fb1dee2aaade2c63efde7e5f3de257 URL: https://github.com/kamailio/kamailio/commit/22e1dcd860fb1dee2aaade2c63efde7… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-04T13:19:32+02:00 tcpops Add simple function with true/false response for connection state checking - tcp_conid_alive --- Modified: modules/tcpops/README Modified: modules/tcpops/doc/functions.xml Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/22e1dcd860fb1dee2aaade2c63efde7… Patch: https://github.com/kamailio/kamailio/commit/22e1dcd860fb1dee2aaade2c63efde7…

1 0

git:master:4e758808: htable Change error messages from "$ht" to "$sht"
by Olle E. Johansson 04 Oct '15

04 Oct '15

Module: kamailio Branch: master Commit: 4e758808f76236a1830787038eef6654baf925a4 URL: https://github.com/kamailio/kamailio/commit/4e758808f76236a1830787038eef665… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-04T13:13:23+02:00 htable Change error messages from "$ht" to "$sht" --- Modified: modules/htable/ht_var.c Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/4e758808f76236a1830787038eef665… Patch: https://github.com/kamailio/kamailio/commit/4e758808f76236a1830787038eef665…

1 0

[kamailio] SIP pinger does not use socket advertized address (#352)
by Emmanuel BUU 04 Oct '15

04 Oct '15

When using Kamailio on a host with a natted address listen=10.1.2.3 advertize 20.20.20.20 SIP options sent by NATHELPER module includes a via with the private IP address rather than the public one. It cause OPTIONS not to be answered by UAs. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/352

2 2

git:master:4da31d56: nathelper: use advertised address if send socket has one
by Daniel-Constantin Mierla 04 Oct '15

04 Oct '15

Module: kamailio Branch: master Commit: 4da31d56f4b1e18fc4232c5174637c858c75e9db URL: https://github.com/kamailio/kamailio/commit/4da31d56f4b1e18fc4232c5174637c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-04T06:28:39+02:00 nathelper: use advertised address if send socket has one - reported by emanuel Buu, GH#352 --- Modified: modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/4da31d56f4b1e18fc4232c5174637c8… Patch: https://github.com/kamailio/kamailio/commit/4da31d56f4b1e18fc4232c5174637c8… --- diff --git a/modules/nathelper/sip_pinger.h b/modules/nathelper/sip_pinger.h index fc18f96..9db8144 100644 --- a/modules/nathelper/sip_pinger.h +++ b/modules/nathelper/sip_pinger.h @@ -123,10 +123,22 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, static char buf[MAX_SIPPING_SIZE]; char *p; int len; + str vaddr; + str vport; + + if(s->useinfo.name.len>0) + vaddr = s->useinfo.name; + else + vaddr = s->address_str; + + if(s->useinfo.port_no>0) + vport = s->useinfo.port_no_str; + else + vport = s->port_no_str; if ( sipping_method.len + 1 + curi->len + s_len(" SIP/2.0"CRLF) + - s_len("Via: SIP/2.0/UDP ") + s->address_str.len + - 1 + s->port_no_str.len + s_len(";branch=0") + + s_len("Via: SIP/2.0/UDP ") + vaddr.len + + 1 + vport.len + s_len(";branch=0") + (path->len ? (s_len(CRLF"Route: ") + path->len) : 0) + s_len(CRLF"From: ") + sipping_from.len + s_len(";tag=") + ruid->len + 1 + 8 + 1 + 8 + @@ -146,9 +158,9 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, *(p++) = ' '; append_str( p, curi->s, curi->len); append_fix( p, " SIP/2.0"CRLF"Via: SIP/2.0/UDP "); - append_str( p, s->address_str.s, s->address_str.len); + append_str( p, vaddr.s, vaddr.len); *(p++) = ':'; - append_str( p, s->port_no_str.s, s->port_no_str.len); + append_str( p, vport.s, vport.len); if (path->len) { append_fix( p, ";branch=0"CRLF"Route: "); append_str( p, path->s, path->len);

1 0

[kamailio] kamailio 4.3 crash in update_dialog_vars_dbinfo (#301)
by MayamaTakeshi 03 Oct '15

03 Oct '15

Commit is the latest for 4.3: 48d78ce87e2f42bdc77e688a0f45ff725ea97de5 Here is the backtrace: ``` Program terminated with signal 11, Segmentation fault. #0 0x00007f3b4fd779da in update_dialog_vars_dbinfo (cell=0x7f3b3c3aa958, var=0x3433) at dlg_db_handler.c:651 651 SET_STR_VALUE(values+2, var->key); Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.5-7.el6_0.x86_64 db4-4.7.25-19.el6_6.x86_64 elfutils-libelf-0.161-3.el6.x86_64 glibc-2.12-1.166.el6_7.1.x86_64 keyutils-libs-1.4-5.el6.x86_64 krb5-libs-1.10.3-42.el6.x86_64 libacl-2.2.49-6.el6.x86_64 libattr-2.4.44-7.el6.x86_64 libcap-2.16-5.5.el6.x86_64 libcom_err-1.41.12-22.el6.x86_64 libgcc-4.4.7-16.el6.x86_64 libselinux-2.0.94-5.8.el6.x86_64 lm_sensors-libs-3.1.1-17.el6.x86_64 lua-5.1.4-4.1.el6.x86_64 mysql-libs-5.1.73-5.el6_6.x86_64 net-snmp-libs-5.5-54.el6_7.1.x86_64 nspr-4.10.8-1.el6_6.x86_64 nss-3.19.1-3.el6_6.x86_64 nss-softokn-freebl-3.14.3-22.el6_6.x86_64 nss-util-3.19.1-1.el6_6.x86_64 openssl-1.0.1e-42.el6.x86_64 pcre-7.8-7.el6.x86_64 perl-libs-5.10.1-141.el6.x86_64 popt-1.13-7.el6.x86_64 rpm-libs-4.8.0-47.el6.x86_64 tcp_wrappers-libs-7.6-57.el6.x86_64 xz-libs-4.999.9-0.5.beta.20091007git.el6.x86_64 zlib-1.2.3-29.el6.x86_64 (gdb) bt #0 0x00007f3b4fd779da in update_dialog_vars_dbinfo (cell=0x7f3b3c3aa958, var=0x3433) at dlg_db_handler.c:651 #1 0x00007f3b4fd78511 in update_dialog_dbinfo_unsafe (cell=0x7f3b3c3aa958) at dlg_db_handler.c:718 #2 0x00007f3b4fd79afc in update_dialog_dbinfo (cell=0x7f3b3c3aa958) at dlg_db_handler.c:861 #3 0x00007f3b4fdb93dc in set_dlg_variable (dlg=0x7f3b3c3aa958, key=0x7f3b508b8760, val=0x7fff7efaae60) at dlg_var.c:305 #4 0x00007f3b50696a9c in set_start_time (dialog=0x7f3b3c3aa958) at acc_cdr.c:523 #5 0x00007f3b5069c932 in cdr_on_create (dialog=0x7f3b3c3aa958, type=2, params=0x7f3b4ffda0a0) at acc_cdr.c:790 #6 0x00007f3b4fd68398 in run_create_callbacks (dlg=0x7f3b3c3aa958, msg=0x7f3b530498f0) at dlg_cb.c:230 #7 0x00007f3b4fd82590 in dlg_new_dialog (req=0x7f3b530498f0, t=0x7f3b3c7b89a8, run_initial_cbs=1) at dlg_handlers.c:865 #8 0x00007f3b4fd81006 in dlg_onreq (t=0x7f3b3c7b89a8, type=1, param=0x7f3b52df2760) at dlg_handlers.c:717 #9 0x00007f3b52b36c3a in run_reqin_callbacks_internal (hl=0x7f3b3b7eb480, trans=0x7f3b3c7b89a8, params=0x7f3b52df2760) at t_hooks.c:360 #10 0x00007f3b52b36d48 in run_reqin_callbacks (trans=0x7f3b3c7b89a8, req=0x7f3b530498f0, code=1) at t_hooks.c:385 #11 0x00007f3b52af7b58 in build_cell (p_msg=0x7f3b530498f0) at h_table.c:356 #12 0x00007f3b52b48283 in new_t (p_msg=0x7f3b530498f0) at t_lookup.c:1269 #13 0x00007f3b52b494b3 in t_newtran (p_msg=0x7f3b530498f0) at t_lookup.c:1409 #14 0x00007f3b52b1de9c in t_relay_to (p_msg=0x7f3b530498f0, proxy=0x0, proto=0, replicate=0) at t_funcs.c:236 #15 0x00007f3b52b5cbbb in _w_t_relay_to (p_msg=0x7f3b530498f0, proxy=0x0, force_proto=0) at tm.c:1476 #16 0x00007f3b52b5dd20 in w_t_relay (p_msg=0x7f3b530498f0, _foo=0x0, _bar=0x0) at tm.c:1677 #17 0x000000000041ddad in do_action (h=0x7fff7efabc80, a=0x7f3b52efc9b8, msg=0x7f3b530498f0) at action.c:1053 #18 0x000000000042a4c3 in run_actions (h=0x7fff7efabc80, a=0x7f3b52efc9b8, msg=0x7f3b530498f0) at action.c:1548 #19 0x000000000042ab28 in run_actions_safe (h=0x7fff7efac8a0, a=0x7f3b52efc9b8, msg=0x7f3b530498f0) at action.c:1613 #20 0x0000000000543c94 in rval_get_int (h=0x7fff7efac8a0, msg=0x7f3b530498f0, i=0x7fff7efac158, rv=0x7f3b52efd008, cache=0x0) at rvalue.c:912 #21 0x0000000000547ecc in rval_expr_eval_int (h=0x7fff7efac8a0, msg=0x7f3b530498f0, res=0x7fff7efac158, rve=0x7f3b52efd000) at rvalue.c:1906 #22 0x00000000005482c2 in rval_expr_eval_int (h=0x7fff7efac8a0, msg=0x7f3b530498f0, res=0x7fff7efac5e0, rve=0x7f3b52efd700) at rvalue.c:1914 #23 0x000000000041d897 in do_action (h=0x7fff7efac8a0, a=0x7f3b52efccb0, msg=0x7f3b530498f0) at action.c:1029 #24 0x000000000042a4c3 in run_actions (h=0x7fff7efac8a0, a=0x7f3b52e45308, msg=0x7f3b530498f0) at action.c:1548 #25 0x000000000042abf0 in run_top_route (a=0x7f3b52e45308, msg=0x7f3b530498f0, c=0x0) at action.c:1634 #26 0x000000000050a938 in receive_msg ( buf=0xa6fee0 "INVITE sip:09011112222@192.168.2.185:5060 SIP/2.0\r\nVia: SIP/2.0/UDP 192.168.0.186:5010;rport;branch=z9hG4bK-13146-256700-4\r\nFrom: \"user1\" <sip:user1@test1.com>;tag=13146SIPpTag00256700\r\nTo: <sip:09011"..., len=947, rcv_info=0x7fff7efacb90) at receive.c:196 #27 0x000000000060a3ea in udp_rcv_loop () at udp_server.c:495 #28 0x00000000004a7ef7 in main_loop () at main.c:1573 #29 0x00000000004ae2d2 in main (argc=7, argv=0x7fff7efacfc8) at main.c:2533 ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/301

2 34

git:master:bff0a08b: Merge pull request #351 from ycaner06/patch-1
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Module: kamailio Branch: master Commit: bff0a08b9ecf4c0c84f2003fdf9abc476950b542 URL: https://github.com/kamailio/kamailio/commit/bff0a08b9ecf4c0c84f2003fdf9abc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T18:15:24+02:00 Merge pull request #351 from ycaner06/patch-1 acc_radius : more logging for acc_radius module --- Modified: modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bff0a08b9ecf4c0c84f2003fdf9abc4… Patch: https://github.com/kamailio/kamailio/commit/bff0a08b9ecf4c0c84f2003fdf9abc4… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index f9327ad..5a660d6 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -327,7 +327,8 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) int i; int m=0; int o=0; - + int rc_result=-1; + send=NULL; attr_cnt = accb.get_core_attrs( req, inf->varr, inf->iarr, inf->tarr ); @@ -384,14 +385,31 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) inf->tarr, 0))!=0 ); } - if (rc_acct(rh, SIP_PORT, send)!=OK_RC) { - LM_ERR("radius-ing failed\n"); - goto error; - } - rc_avpair_free(send); - /* free memory allocated by extra2strar */ - free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); - return 1; + rc_result=rc_acct(rh, SIP_PORT, send); + + if (rc_result==ERROR_RC) { + LM_ERR("Radius accounting - ERROR - \n"); + goto error; + }else if(rc_result==BADRESP_RC){ + LM_ERR("Radius accounting - BAD RESPONSE \n"); + goto error; + }else if(rc_result==TIMEOUT_RC){ + LM_ERR("Radius accounting - TIMEOUT \n"); + goto error; + }else if(rc_result==REJECT_RC){ + LM_ERR("Radius accounting - REJECTED \n"); + goto error; + }else if(rc_result==OK_RC){ + LM_DBG("Radius accounting - OK \n"); + }else{ + LM_ERR("Radius accounting - Unkown response \n"); + goto error; + } + + rc_avpair_free(send); + /* free memory allocated by extra2strar */ + free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); + return 1; error: rc_avpair_free(send);

1 0

git:master:31185385: Update acc_radius_mod.c
by Yasin 02 Oct '15

02 Oct '15

Module: kamailio Branch: master Commit: 31185385cf017f2d00a3d2a6c69ce5776304eb9a URL: https://github.com/kamailio/kamailio/commit/31185385cf017f2d00a3d2a6c69ce57… Author: Yasin <yasin.caner(a)netgsm.com.tr> Committer: Yasin <yasin.caner(a)netgsm.com.tr> Date: 2015-10-02T11:09:36+03:00 Update acc_radius_mod.c --- Modified: modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/31185385cf017f2d00a3d2a6c69ce57… Patch: https://github.com/kamailio/kamailio/commit/31185385cf017f2d00a3d2a6c69ce57… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index 3ec064b..5a660d6 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -401,6 +401,9 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) goto error; }else if(rc_result==OK_RC){ LM_DBG("Radius accounting - OK \n"); + }else{ + LM_ERR("Radius accounting - Unkown response \n"); + goto error; } rc_avpair_free(send);

1 0

git:master:486031d1: acc_radius : more logging for radius
by Yasin 02 Oct '15

02 Oct '15

Module: kamailio Branch: master Commit: 486031d1023ec453083da218df1a23945f64868f URL: https://github.com/kamailio/kamailio/commit/486031d1023ec453083da218df1a239… Author: Yasin <yasin.caner(a)netgsm.com.tr> Committer: Yasin <yasin.caner(a)netgsm.com.tr> Date: 2015-10-02T09:52:55+03:00 acc_radius : more logging for radius added more log about radius result. it makes better to understand problem. i checked freeradiusclient.h and radiusclient-ng.h to have all defined variables. --- Modified: modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/486031d1023ec453083da218df1a239… Patch: https://github.com/kamailio/kamailio/commit/486031d1023ec453083da218df1a239… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index f9327ad..3ec064b 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -327,7 +327,8 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) int i; int m=0; int o=0; - + int rc_result=-1; + send=NULL; attr_cnt = accb.get_core_attrs( req, inf->varr, inf->iarr, inf->tarr ); @@ -384,14 +385,28 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) inf->tarr, 0))!=0 ); } - if (rc_acct(rh, SIP_PORT, send)!=OK_RC) { - LM_ERR("radius-ing failed\n"); - goto error; - } - rc_avpair_free(send); - /* free memory allocated by extra2strar */ - free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); - return 1; + rc_result=rc_acct(rh, SIP_PORT, send); + + if (rc_result==ERROR_RC) { + LM_ERR("Radius accounting - ERROR - \n"); + goto error; + }else if(rc_result==BADRESP_RC){ + LM_ERR("Radius accounting - BAD RESPONSE \n"); + goto error; + }else if(rc_result==TIMEOUT_RC){ + LM_ERR("Radius accounting - TIMEOUT \n"); + goto error; + }else if(rc_result==REJECT_RC){ + LM_ERR("Radius accounting - REJECTED \n"); + goto error; + }else if(rc_result==OK_RC){ + LM_DBG("Radius accounting - OK \n"); + } + + rc_avpair_free(send); + /* free memory allocated by extra2strar */ + free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); + return 1; error: rc_avpair_free(send);

1 0

[kamailio] acc_radius : more logging for acc_radius module (#351)
by Yasin 02 Oct '15

02 Oct '15

added more log about radius result. it makes better to understand problem. i checked freeradiusclient.h and radiusclient-ng.h to have all defined variables. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/351 -- Commit Summary -- * acc_radius : more logging for radius -- File Changes -- M modules/acc_radius/acc_radius_mod.c (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/351.patch https://github.com/kamailio/kamailio/pull/351.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/351

2 3

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015