sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

[kamailio/kamailio] removing the condition for ipv6 outbound socket to build via correctly (#1291)

by Surendra Tiwari

#### 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/1291 -- Commit Summary -- * removing the condition for ipv6 outbound socket to build via correctly -- File Changes -- M src/core/msg_translator.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1291.patch https://github.com/kamailio/kamailio/pull/1291.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/1291

6 years, 5 months

git:master:1de15c06: core: safety checks to catch enclosed ipv6 addresses or hostnames in via build

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1de15c06b982b4b4a0d9860b51c2178745cd9af0 URL: https://github.com/kamailio/kamailio/commit/1de15c06b982b4b4a0d9860b51c2178… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T16:46:20+01:00 core: safety checks to catch enclosed ipv6 addresses or hostnames in via build --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/1de15c06b982b4b4a0d9860b51c2178… Patch: https://github.com/kamailio/kamailio/commit/1de15c06b982b4b4a0d9860b51c2178… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 3a24aa077a..725d6290c9 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2788,10 +2788,15 @@ char* via_builder( unsigned int *len, /* add [] only if ipv6 address is used; * if using pre-set no check is made */ if (send_sock->address.af==AF_INET6) { - line_buf[via_prefix_len]='['; - line_buf[via_prefix_len+1+address_str->len]=']'; - extra_len=1; - via_len+=2; /* [ ]*/ + /* lightweight safety checks if brackets set + * or non-ipv6 (e.g., advertised hostname) */ + if(address_str->s[0] != '[' + && memchr(address_str->s, ':', address_str->len)!=NULL) { + line_buf[via_prefix_len]='['; + line_buf[via_prefix_len+1+address_str->len]=']'; + extra_len=1; + via_len+=2; /* [ ]*/ + } } memcpy(line_buf+via_prefix_len+extra_len, address_str->s, address_str->len);

6 years, 5 months

git:master:e6abb930: core: remove condition for ipv6 outbound socket to build via header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e6abb9302c8b127b7ac15cd7e24075845e271bf1 URL: https://github.com/kamailio/kamailio/commit/e6abb9302c8b127b7ac15cd7e240758… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T16:34:32+01:00 core: remove condition for ipv6 outbound socket to build via header --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/e6abb9302c8b127b7ac15cd7e240758… Patch: https://github.com/kamailio/kamailio/commit/e6abb9302c8b127b7ac15cd7e240758… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index e58356999d..3a24aa077a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2785,10 +2785,9 @@ char* via_builder( unsigned int *len, pkg_free(line_buf); return 0; } - /* add [] only if ipv6 and outbound socket address is used; + /* add [] only if ipv6 address is used; * if using pre-set no check is made */ - if ((send_sock->address.af==AF_INET6) && - (address_str==&(send_sock->address_str))) { + if (send_sock->address.af==AF_INET6) { line_buf[via_prefix_len]='['; line_buf[via_prefix_len+1+address_str->len]=']'; extra_len=1;

6 years, 5 months

[kamailio/kamailio] Enable the same modules for RHEL 7 as for Centos 7. (#1293)

by oyvindkolbu

Currently OBS build more Centos 7 modules than for RHEL 7. The modules builds just fine on RHEL7, so enable them there as well. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1293 -- Commit Summary -- * Enable the same modules for RHEL 7 as for Centos 7. -- File Changes -- M pkg/kamailio/obs/kamailio.spec (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1293.patch https://github.com/kamailio/kamailio/pull/1293.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/1293

6 years, 5 months

git:master:612e96d8: pkg/obs: enable the same modules for RHEL 7 as for Centos 7

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 612e96d8a2cc2a9ac31a7fb05508084fb82dbcf5 URL: https://github.com/kamailio/kamailio/commit/612e96d8a2cc2a9ac31a7fb05508084… Author: Oyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T16:28:22+01:00 pkg/obs: enable the same modules for RHEL 7 as for Centos 7 - GH #1293 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/612e96d8a2cc2a9ac31a7fb05508084… Patch: https://github.com/kamailio/kamailio/commit/612e96d8a2cc2a9ac31a7fb05508084… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 740756ca26..b57c602e46 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -132,18 +132,18 @@ %if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 %define dist_name rhel %define dist_version %{?rhel} -%bcond_with cnxcc +%bcond_without cnxcc %bcond_with dnssec -%bcond_with geoip -%bcond_with http_async_client -%bcond_with jansson -%bcond_with json -%bcond_with kazoo -%bcond_with memcached +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without kazoo +%bcond_without memcached %bcond_without perl %bcond_without redis -%bcond_with sctp -%bcond_with websocket +%bcond_without sctp +%bcond_without websocket %bcond_without xmlrpc %endif

6 years, 5 months

git:master:223b8e47: sipcapture: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 223b8e4736fe8c803366b49e064438a5985182e1 URL: https://github.com/kamailio/kamailio/commit/223b8e4736fe8c803366b49e064438a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T10:31:47+01:00 sipcapture: exported functions to kemi framework --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/223b8e4736fe8c803366b49e064438a… Patch: https://github.com/kamailio/kamailio/commit/223b8e4736fe8c803366b49e064438a…

6 years, 5 months

git:master:2ffee710: sipcapture: removed unused param from w_float2int()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2ffee710e208fee7facaa013d3b233b264781b25 URL: https://github.com/kamailio/kamailio/commit/2ffee710e208fee7facaa013d3b233b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T09:58:45+01:00 sipcapture: removed unused param from w_float2int() - dedicated wrappers for cfg exported report_capture() variants --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/2ffee710e208fee7facaa013d3b233b… Patch: https://github.com/kamailio/kamailio/commit/2ffee710e208fee7facaa013d3b233b… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index d18424bb1a..4a4da5e131 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -151,9 +151,11 @@ static int w_sip_capture1(sip_msg_t *_m, char *_table, char *_p2); static int w_sip_capture2(sip_msg_t *_m, char *_table, char *_cmdata); static int w_sip_capture(struct sip_msg *_m, char *_table, _capture_mode_data_t *_cm_data); -static int w_report_capture(sip_msg_t *_m, char *_table, char *_corr, +static int w_report_capture1(sip_msg_t *_m, char *_table, char *_p2); +static int w_report_capture2(sip_msg_t *_m, char *_table, char *_corr); +static int w_report_capture3(sip_msg_t *_m, char *_table, char *_corr, char *_data); -static int w_float2int(sip_msg_t *_m, char *_val, char *_coof, char *s2); +static int w_float2int(sip_msg_t *_m, char *_val, char *_coof); static int sipcapture_parse_aleg_callid_headers(); int parse_aleg_callid_headers(str *headers_str, str *headers); @@ -299,11 +301,11 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"sip_capture", (cmd_function)w_sip_capture2, 2, sipcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture, 1, + {"report_capture", (cmd_function)w_report_capture1, 1, reportcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture, 2, + {"report_capture", (cmd_function)w_report_capture2, 2, reportcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture, 3, + {"report_capture", (cmd_function)w_report_capture3, 3, reportcapture_fixup, 0, ANY_ROUTE}, {"float2int", (cmd_function)w_float2int, 2, float2int_fixup, 0, ANY_ROUTE}, @@ -1066,7 +1068,7 @@ static int float2int_fixup(void **param, int param_no) } -static int w_float2int(struct sip_msg *_m, char *_val, char *_coof, char *s2) +static int w_float2int(sip_msg_t *_m, char *_val, char *_coof) { str value = {0}; str coof = {0}; @@ -1090,7 +1092,6 @@ static int w_float2int(struct sip_msg *_m, char *_val, char *_coof, char *s2) return ret ? ret : -1; } - static int w_sip_capture(sip_msg_t *_m, char *_table, _capture_mode_data_t *cm_data) { @@ -1119,7 +1120,17 @@ static int w_sip_capture2(sip_msg_t *_m, char *_table, char *_cmdata) return w_sip_capture(_m, _table, (_capture_mode_data_t*)_cmdata); } -static int w_report_capture(sip_msg_t *_m, char *_table, char *_corr, +static int w_report_capture1(sip_msg_t *_m, char *_table, char *_p2) +{ + return w_report_capture3(_m, _table, NULL, NULL); +} + +static int w_report_capture2(sip_msg_t *_m, char *_table, char *_corr) +{ + return w_report_capture3(_m, _table, _corr, NULL); +} + +static int w_report_capture3(sip_msg_t *_m, char *_table, char *_corr, char *_data) { str table = {0}; @@ -2358,7 +2369,8 @@ static const char *sipcapture_status_doc[2] = { rpc_export_t sipcapture_rpc[] = { {"sipcapture.status", sipcapture_rpc_status, sipcapture_status_doc, 0}, - {0, 0, 0, 0}}; + {0, 0, 0, 0} +}; static int sipcapture_init_rpc(void) { @@ -2559,8 +2571,7 @@ int receive_logging_json_msg(char *buf, unsigned int len, return -1; } -static int report_capture( - struct sip_msg *msg, str *_table, str *_corr, str *_data) +static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) { struct _sipcapture_object sco; db_key_t db_keys[RTCP_NR_KEYS]; @@ -2630,7 +2641,6 @@ static int report_capture( sco.node.s = tmp_node; sco.node.len = strlen(tmp_node); epoch_time_as_time_t = heptime->tv_sec; - ; } else { sco.tmstamp = (unsigned long long)tvb.tv_sec * 1000000 + tvb.tv_usec; /* micro ts */

6 years, 5 months

git:master:d0175784: sipcapture: remove unused parameter to w_sip_capture()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d0175784c466bc2717e5a71e9081958b7493110b URL: https://github.com/kamailio/kamailio/commit/d0175784c466bc2717e5a71e9081958… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T09:45:37+01:00 sipcapture: remove unused parameter to w_sip_capture() - dedicated wrappers for cfg exported sip_capture() variants --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/d0175784c466bc2717e5a71e9081958… Patch: https://github.com/kamailio/kamailio/commit/d0175784c466bc2717e5a71e9081958… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index fc4b1182f6..d18424bb1a 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -92,7 +92,7 @@ MODULE_VERSION #define EMPTY_STR(val) \ val.s = ""; \ -val.len = 0; + val.len = 0; #define TABLE_LEN 256 @@ -140,18 +140,20 @@ static int sipcapture_fixup(void **param, int param_no); static int reportcapture_fixup(void **param, int param_no); static int float2int_fixup(void **param, int param_no); -static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static int pv_get_hep(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_hep_name(pv_spec_p sp, str *in); -static int sip_capture( - struct sip_msg *msg, str *dtable, _capture_mode_data_t *cm_data); -static int report_capture( - struct sip_msg *msg, str *_table, str *_corr, str *_data); +static int sip_capture(sip_msg_t *msg, str *dtable, + _capture_mode_data_t *cm_data); +static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data); +static int w_sip_capture0(sip_msg_t *_m, char *_p1, char *_p2); +static int w_sip_capture1(sip_msg_t *_m, char *_table, char *_p2); +static int w_sip_capture2(sip_msg_t *_m, char *_table, char *_cmdata); static int w_sip_capture(struct sip_msg *_m, char *_table, - _capture_mode_data_t *_cm_data, char *s2); -static int w_report_capture( - struct sip_msg *_m, char *_table, char *_corr, char *_data); -static int w_float2int(struct sip_msg *_m, char *_val, char *_coof, char *s2); + _capture_mode_data_t *_cm_data); +static int w_report_capture(sip_msg_t *_m, char *_table, char *_corr, + char *_data); +static int w_float2int(sip_msg_t *_m, char *_val, char *_coof, char *s2); static int sipcapture_parse_aleg_callid_headers(); int parse_aleg_callid_headers(str *headers_str, str *headers); @@ -291,11 +293,11 @@ struct hep_timeinfo *heptime; * Exported functions */ static cmd_export_t cmds[] = { - {"sip_capture", (cmd_function)w_sip_capture, 0, 0, 0, + {"sip_capture", (cmd_function)w_sip_capture0, 0, 0, 0, ANY_ROUTE}, - {"sip_capture", (cmd_function)w_sip_capture, 1, sipcapture_fixup, 0, + {"sip_capture", (cmd_function)w_sip_capture1, 1, sipcapture_fixup, 0, ANY_ROUTE}, - {"sip_capture", (cmd_function)w_sip_capture, 2, sipcapture_fixup, 0, + {"sip_capture", (cmd_function)w_sip_capture2, 2, sipcapture_fixup, 0, ANY_ROUTE}, {"report_capture", (cmd_function)w_report_capture, 1, reportcapture_fixup, 0, ANY_ROUTE}, @@ -1089,8 +1091,8 @@ static int w_float2int(struct sip_msg *_m, char *_val, char *_coof, char *s2) } -static int w_sip_capture(struct sip_msg *_m, char *_table, - _capture_mode_data_t *cm_data, char *s2) +static int w_sip_capture(sip_msg_t *_m, char *_table, + _capture_mode_data_t *cm_data) { str table = {0}; @@ -1102,8 +1104,23 @@ static int w_sip_capture(struct sip_msg *_m, char *_table, return sip_capture(_m, (table.len > 0) ? &table : NULL, cm_data); } -static int w_report_capture( - struct sip_msg *_m, char *_table, char *_corr, char *_data) +static int w_sip_capture0(sip_msg_t *_m, char *_p1, char *_p2) +{ + return w_sip_capture(_m, NULL, NULL); +} + +static int w_sip_capture1(sip_msg_t *_m, char *_table, char *_p2) +{ + return w_sip_capture(_m, _table, NULL); +} + +static int w_sip_capture2(sip_msg_t *_m, char *_table, char *_cmdata) +{ + return w_sip_capture(_m, _table, (_capture_mode_data_t*)_cmdata); +} + +static int w_report_capture(sip_msg_t *_m, char *_table, char *_corr, + char *_data) { str table = {0}; str corr = {0};

6 years, 5 months

git:master:1708de3f: sipcapture: clang format the code, added missing copyright header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1708de3f4be4cc74a76a2d36d2cdca38ba918b8f URL: https://github.com/kamailio/kamailio/commit/1708de3f4be4cc74a76a2d36d2cdca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T09:28:28+01:00 sipcapture: clang format the code, added missing copyright header --- Modified: src/modules/sipcapture/hash_mode.c Modified: src/modules/sipcapture/hash_mode.h Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/hep.h Modified: src/modules/sipcapture/sipcapture.c Modified: src/modules/sipcapture/sipcapture.h --- Diff: https://github.com/kamailio/kamailio/commit/1708de3f4be4cc74a76a2d36d2cdca3… Patch: https://github.com/kamailio/kamailio/commit/1708de3f4be4cc74a76a2d36d2cdca3…

6 years, 5 months

git:master:5addc451: siptrace: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5addc451e07a4dce0c4d24585ed841b903166b10 URL: https://github.com/kamailio/kamailio/commit/5addc451e07a4dce0c4d24585ed841b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-01T09:17:02+01:00 siptrace: exported functions to kemi framework --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/5addc451e07a4dce0c4d24585ed841b… Patch: https://github.com/kamailio/kamailio/commit/5addc451e07a4dce0c4d24585ed841b…

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017