sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:master:2815150b: nathelper: allow variable for nat_uac_test() parameter
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: 2815150bf74cdda26c12d05f25d6b67adf033dc1 URL: https://github.com/kamailio/kamailio/commit/2815150bf74cdda26c12d05f25d6b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T16:19:55+01:00 nathelper: allow variable for nat_uac_test() parameter --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/2815150bf74cdda26c12d05f25d6b67… Patch: https://github.com/kamailio/kamailio/commit/2815150bf74cdda26c12d05f25d6b67… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index d34d807408..d6878e3176 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -207,7 +207,7 @@ static cmd_export_t cmds[] = { fixup_fix_sdp, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"nat_uac_test", (cmd_function)nat_uac_test_f, 1, - fixup_uint_null, 0, + fixup_igp_null, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_register", (cmd_function)fix_nated_register_f, 0, fixup_fix_nated_register, 0, @@ -1441,7 +1441,12 @@ static int nat_uac_test(struct sip_msg *msg, int tests) static int nat_uac_test_f(struct sip_msg *msg, char *str1, char *str2) { - return nat_uac_test(msg, (int)(long)str1); + int tflags = 0; + if(fixup_get_ivalue(msg, (gparam_t*)str1, &tflags)<0) { + LM_ERR("failed to get the value for flags parameter\n"); + return -1; + } + return nat_uac_test(msg, tflags); } static int is_rfc1918(struct sip_msg *msg, str *address) @@ -2101,7 +2106,7 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) int hdr_param = 0; if(str1) { - if(fixup_get_ivalue(msg, (gparam_t*))str1, &hdr_param)<0) { + if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { LM_ERR("failed to get falgs parameter\n"); return -1; }

1 0

git:master:d2120dae: nathelper: support to use variable for flags param of add_rcv_param()
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: d2120dae8bb76dfaa7057883c1f10950d35d4e48 URL: https://github.com/kamailio/kamailio/commit/d2120dae8bb76dfaa7057883c1f1095… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T16:07:19+01:00 nathelper: support to use variable for flags param of add_rcv_param() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/d2120dae8bb76dfaa7057883c1f1095… Patch: https://github.com/kamailio/kamailio/commit/d2120dae8bb76dfaa7057883c1f1095… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index b333d8d7ef..d34d807408 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -216,7 +216,7 @@ static cmd_export_t cmds[] = { 0, 0, REQUEST_ROUTE }, {"add_rcv_param", (cmd_function)add_rcv_param_f, 1, - fixup_uint_null, 0, + fixup_igp_null, 0, REQUEST_ROUTE }, {"is_rfc1918", (cmd_function)is_rfc1918_f, 1, fixup_spve_null, 0, @@ -2098,9 +2098,14 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) struct lump *anchor; char *param; str uri; - int hdr_param; + int hdr_param = 0; - hdr_param = str1 ? 0 : 1; + if(str1) { + if(fixup_get_ivalue(msg, (gparam_t*))str1, &hdr_param)<0) { + LM_ERR("failed to get falgs parameter\n"); + return -1; + } + } if(create_rcv_uri(&uri, msg) < 0) { return -1;

1 0

git:master:bcc5a668: nathelper: clang format the code
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: bcc5a66815ea21a762c22a8222afc621b42bb94d URL: https://github.com/kamailio/kamailio/commit/bcc5a66815ea21a762c22a8222afc62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T15:56:18+01:00 nathelper: clang format the code --- Modified: src/modules/nathelper/nathelper.c Modified: src/modules/nathelper/nathelper.h Modified: src/modules/nathelper/nhelpr_funcs.c Modified: src/modules/nathelper/nhelpr_funcs.h Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/bcc5a66815ea21a762c22a8222afc62… Patch: https://github.com/kamailio/kamailio/commit/bcc5a66815ea21a762c22a8222afc62…

1 0

git:master:2cb94f28: core: test if ipv6 address starts with [ for subst snd lumps
by Daniel-Constantin Mierla 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 2cb94f28d7d214d22ccdb6a5b993b391f61ea15b URL: https://github.com/kamailio/kamailio/commit/2cb94f28d7d214d22ccdb6a5b993b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-17T14:33:46+01:00 core: test if ipv6 address starts with [ for subst snd lumps - safer than the test against cached socket address known to be without [], allowing to pass any address value to be used - reported by GH #1315 --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/2cb94f28d7d214d22ccdb6a5b993b39… Patch: https://github.com/kamailio/kamailio/commit/2cb94f28d7d214d22ccdb6a5b993b39… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 725d6290c9..ca0f9fa521 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -678,8 +678,8 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case SUBST_SND_IP: \ if (send_sock){ \ new_len+=send_address_str->len; \ - if (send_sock->address.af!=AF_INET && \ - send_address_str==&(send_sock->address_str)) \ + if (send_sock->address.af==AF_INET6 && \ + send_address_str->s[0]!='[') \ new_len+=2; \ }else{ \ LM_CRIT("FIXME: null send_sock\n"); \ @@ -724,8 +724,8 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case SUBST_SND_ALL: \ if (send_sock){ \ new_len+=send_address_str->len; \ - if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))) \ + if ((send_sock->address.af==AF_INET6) && \ + (send_address_str->s[0]!='[')) \ new_len+=2; \ if ((send_sock->port_no!=SIP_PORT) || \ (send_port_str!=&(send_sock->port_no_str))){ \ @@ -766,7 +766,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, default: \ LM_CRIT("unknown subst type %d\n", (subst_l)->u.subst); \ } - + if (send_info){ send_sock=send_info->send_sock; }else{ @@ -935,7 +935,7 @@ void process_lumps( struct sip_msg* msg, default:\ LM_CRIT("unknown comp %d\n", msg->rcv.comp); \ } - + #define SENDCOMP_PARAM_ADD \ /* add ;comp=xxxx */ \ switch(send_info->comp){ \ @@ -956,7 +956,7 @@ void process_lumps( struct sip_msg* msg, break;\ default:\ LM_CRIT("unknown comp %d\n", msg->rcv.comp); \ - } + } #else #define RCVCOMP_PARAM_ADD #define SENDCOMP_PARAM_ADD @@ -1057,14 +1057,14 @@ void process_lumps( struct sip_msg* msg, case SUBST_SND_IP: \ if (send_sock){ \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]='['; offset++; \ }\ memcpy(new_buf+offset, send_address_str->s, \ send_address_str->len); \ offset+=send_address_str->len; \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]=']'; offset++; \ }\ }else{ \ @@ -1086,14 +1086,14 @@ void process_lumps( struct sip_msg* msg, if (send_sock){ \ /* address */ \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]='['; offset++; \ }\ memcpy(new_buf+offset, send_address_str->s, \ send_address_str->len); \ offset+=send_address_str->len; \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]=']'; offset++; \ }\ /* :port */ \

1 0

[kamailio/kamailio] nat_traversal: fixing ipv6 contact for fix_contact function in cfg. (#1319)
by Surendra Tiwari 17 Nov '17

17 Nov '17

- fix_contact for ipv6 addres,add the [] to the host part of contact header   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description when we detect the nat, we are using fix_contact to fix the contact header according to nat.but for ipv6, fix_contact doesn't add the [] to ip part of contact header.because of this we are getting bad contact header.we resolved this by adding [] to ipv6 address. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1319 -- Commit Summary -- * nat_traversal: correcting the ipv6 contact in fix_contact -- File Changes -- M src/modules/nat_traversal/nat_traversal.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1319.patch https://github.com/kamailio/kamailio/pull/1319.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/1319

2 3

git:master:6fc84ad9: Merge pull request #1319 from surendratiwari3/nat_traversal_ipv6_contact
by GitHub 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 6fc84ad9efe4962cc7668851f7ca61cfcc25675f URL: https://github.com/kamailio/kamailio/commit/6fc84ad9efe4962cc7668851f7ca61c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-17T13:07:56+01:00 Merge pull request #1319 from surendratiwari3/nat_traversal_ipv6_contact nat_traversal: fixing ipv6 contact for fix_contact function in cfg. --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/6fc84ad9efe4962cc7668851f7ca61c… Patch: https://github.com/kamailio/kamailio/commit/6fc84ad9efe4962cc7668851f7ca61c… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d3c6c95057..ae38d7653b 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1478,8 +1478,16 @@ FixContact(struct sip_msg *msg) return -1; } - len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, - newip.s, newport, after.len, after.s); + if (msg->rcv.src_ip.af==AF_INET6) + { + len = sprintf(buf, "%.*s[%s]:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } + else + { + len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } if (insert_new_lump_after(anchor, buf, len, (enum _hdr_types_t)HDR_CONTACT_F) == 0) { pkg_free(buf);

1 0

git:master:4838bca7: nat_traversal: correcting the ipv6 contact in fix_contact
by Surendra Tiwari 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 4838bca79d5eb82d133b295d6e601c1924d7ac11 URL: https://github.com/kamailio/kamailio/commit/4838bca79d5eb82d133b295d6e601c1… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2017-11-17T11:39:55Z nat_traversal: correcting the ipv6 contact in fix_contact - fix_contact for ipv6 addres,add the [] to the host part of contact header --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/4838bca79d5eb82d133b295d6e601c1… Patch: https://github.com/kamailio/kamailio/commit/4838bca79d5eb82d133b295d6e601c1… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d3c6c95057..ae38d7653b 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1478,8 +1478,16 @@ FixContact(struct sip_msg *msg) return -1; } - len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, - newip.s, newport, after.len, after.s); + if (msg->rcv.src_ip.af==AF_INET6) + { + len = sprintf(buf, "%.*s[%s]:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } + else + { + len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } if (insert_new_lump_after(anchor, buf, len, (enum _hdr_types_t)HDR_CONTACT_F) == 0) { pkg_free(buf);

1 0

[kamailio/kamailio] nat_traversal: fixing ipv6 contact for fix_contact function in cfg . (#1318)
by Surendra Tiwari 17 Nov '17

17 Nov '17

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1318 -- Commit Summary -- * nat_traversal: fixing ipv6 contact for fix_contact function in cfg -- File Changes -- M src/modules/nat_traversal/nat_traversal.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1318.patch https://github.com/kamailio/kamailio/pull/1318.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/1318

2 5

git:master:4d93fb69: nathelper: allow variable for flags parameter of fix_nated_sdp()
by Daniel-Constantin Mierla 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 4d93fb69805deea8c23ae2aa8b8743cc24ff2925 URL: https://github.com/kamailio/kamailio/commit/4d93fb69805deea8c23ae2aa8b8743c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-17T13:05:53+01:00 nathelper: allow variable for flags parameter of fix_nated_sdp() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/4d93fb69805deea8c23ae2aa8b8743c… Patch: https://github.com/kamailio/kamailio/commit/4d93fb69805deea8c23ae2aa8b8743c… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 283e75c89b..9f0032f31f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -289,26 +289,16 @@ SELECT_F(select_any_nameaddr) static int fixup_fix_sdp(void** param, int param_no) { - pv_elem_t *model; - str s; - if (param_no==1) { /* flags */ - return fixup_uint_null( param, param_no); + return fixup_igp_null(param, param_no); } - /* new IP */ - model=NULL; - s.s = (char*)(*param); s.len = strlen(s.s); - if(pv_parse_format(&s,&model)<0) { - LM_ERR("wrong format[%s]!\n", (char*)(*param)); - return E_UNSPEC; + if (param_no==2) { + /* new IP */ + return fixup_spve_all(param, param_no); } - if (model==NULL) { - LM_ERR("empty parameter!\n"); - return E_UNSPEC; - } - *param = (void*)model; - return 0; + LM_ERR("unexpected param no: %d\n", param_no); + return -1; } static int fixup_fix_nated_register(void** param, int param_no) @@ -1570,9 +1560,14 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) int ret; int count = 0; - level = (int)(long)str1; - if (str2 && pv_printf_s( msg, (pv_elem_p)str2, &ip)!=0) + if(fixup_get_ivalue(msg, (gparam_t*)str1, &level)!=0) { + LM_ERR("failed to get value for first parameter\n"); + return -1; + } + if(str2 && fixup_get_svalue(msg, (gparam_t*)str2, &ip)!=0) { + LM_ERR("failed to get value for second parameter\n"); return -1; + } if (extract_body(msg, &body) == -1) { LM_ERR("cannot extract body from msg!\n");

1 0

git:master:83c37041: core: udp - print up to first 100 chars from received packet
by Daniel-Constantin Mierla 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 83c370414cb288b113ad4f075a2261e7d701d6d3 URL: https://github.com/kamailio/kamailio/commit/83c370414cb288b113ad4f075a2261e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-17T11:02:04+01:00 core: udp - print up to first 100 chars from received packet --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/83c370414cb288b113ad4f075a2261e… Patch: https://github.com/kamailio/kamailio/commit/83c370414cb288b113ad4f075a2261e… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 5262162362..0392136385 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -425,6 +425,10 @@ int udp_rcv_loop() unsigned int fromlen; struct receive_info ri; sr_event_param_t evp = {0}; + char printbuf[512]; + int i; + int j; + int l; from=(union sockaddr_union*) pkg_malloc(sizeof(union sockaddr_union)); @@ -466,6 +470,23 @@ int udp_rcv_loop() /* we must 0-term the messages, receive_msg expects it */ buf[len]=0; /* no need to save the previous char */ + if(is_printable(L_DBG) && len>10) { + j = 0; + for(i=0; i<len && i<100; i++) { + if(isprint(buf[i])) { + printbuf[j++] = buf[i]; + } else { + l = snprintf(printbuf+j, 6, " %02X ", buf[i]); + if(l<0 || l>=6) { + LM_ERR("print buffer building failed\n"); + goto error; + } + j += l; + } + } + LM_DBG("received on udp socket: (%d/%d) [[%.*s]]\n", + j, len, len, printbuf); + } ri.src_su=*from; su2ip_addr(&ri.src_ip, from); ri.src_port=su_getport(from);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017