sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:4.3:62243d31: rtpproxy: fix mismatching internal value for column setid
by Daniel-Constantin Mierla 19 Nov '15

19 Nov '15

Module: kamailio Branch: 4.3 Commit: 62243d315df63909b079f731f25de23a638bcdf6 URL: https://github.com/kamailio/kamailio/commit/62243d315df63909b079f731f25de23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-19T13:31:35+01:00 rtpproxy: fix mismatching internal value for column setid - on a report by Jan Hazenberg (cherry picked from commit b89534385ef881719c85534ab7a32a500be2aa9c) --- Modified: modules/rtpproxy/rtpproxy_db.c --- Diff: https://github.com/kamailio/kamailio/commit/62243d315df63909b079f731f25de23… Patch: https://github.com/kamailio/kamailio/commit/62243d315df63909b079f731f25de23… --- diff --git a/modules/rtpproxy/rtpproxy_db.c b/modules/rtpproxy/rtpproxy_db.c index 02dcde1..2034ee4 100644 --- a/modules/rtpproxy/rtpproxy_db.c +++ b/modules/rtpproxy/rtpproxy_db.c @@ -34,7 +34,7 @@ static db1_con_t *rtpp_db_handle = NULL; str rtpp_db_url = {NULL, 0}; str rtpp_table_name = str_init("rtpproxy"); -str rtpp_set_name_col = str_init("set_name"); +str rtpp_setid_col = str_init("setid"); str rtpp_url_col = str_init("url"); str rtpp_weight_col = str_init("weight"); str rtpp_flags_col = str_init("flags"); @@ -67,7 +67,7 @@ static int rtpp_load_db(void) db1_res_t *res = NULL; db_val_t *values = NULL; db_row_t *rows = NULL; - db_key_t query_cols[] = {&rtpp_set_name_col, &rtpp_url_col, &rtpp_weight_col, &rtpp_flags_col}; + db_key_t query_cols[] = {&rtpp_setid_col, &rtpp_url_col, &rtpp_weight_col, &rtpp_flags_col}; str set, url; int weight, flags;

1 0

git:master:b8953438: rtpproxy: fix mismatching internal value for column setid
by Daniel-Constantin Mierla 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: b89534385ef881719c85534ab7a32a500be2aa9c URL: https://github.com/kamailio/kamailio/commit/b89534385ef881719c85534ab7a32a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-19T13:31:10+01:00 rtpproxy: fix mismatching internal value for column setid - on a report by Jan Hazenberg --- Modified: modules/rtpproxy/rtpproxy_db.c --- Diff: https://github.com/kamailio/kamailio/commit/b89534385ef881719c85534ab7a32a5… Patch: https://github.com/kamailio/kamailio/commit/b89534385ef881719c85534ab7a32a5… --- diff --git a/modules/rtpproxy/rtpproxy_db.c b/modules/rtpproxy/rtpproxy_db.c index 02dcde1..2034ee4 100644 --- a/modules/rtpproxy/rtpproxy_db.c +++ b/modules/rtpproxy/rtpproxy_db.c @@ -34,7 +34,7 @@ static db1_con_t *rtpp_db_handle = NULL; str rtpp_db_url = {NULL, 0}; str rtpp_table_name = str_init("rtpproxy"); -str rtpp_set_name_col = str_init("set_name"); +str rtpp_setid_col = str_init("setid"); str rtpp_url_col = str_init("url"); str rtpp_weight_col = str_init("weight"); str rtpp_flags_col = str_init("flags"); @@ -67,7 +67,7 @@ static int rtpp_load_db(void) db1_res_t *res = NULL; db_val_t *values = NULL; db_row_t *rows = NULL; - db_key_t query_cols[] = {&rtpp_set_name_col, &rtpp_url_col, &rtpp_weight_col, &rtpp_flags_col}; + db_key_t query_cols[] = {&rtpp_setid_col, &rtpp_url_col, &rtpp_weight_col, &rtpp_flags_col}; str set, url; int weight, flags;

1 0

git:master:d2416957: kamctl: require db or ctl engine made specific for dispatcher subcommands
by Daniel-Constantin Mierla 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: d2416957e4caec8a64abec82029ea18c52a7bc2d URL: https://github.com/kamailio/kamailio/commit/d2416957e4caec8a64abec82029ea18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-19T13:31:10+01:00 kamctl: require db or ctl engine made specific for dispatcher subcommands --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/d2416957e4caec8a64abec82029ea18… Patch: https://github.com/kamailio/kamailio/commit/d2416957e4caec8a64abec82029ea18… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 39e89eb..22d9643 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1583,15 +1583,15 @@ cr() { ### DISPATCHER management # dispatcher() { - require_dbengine - require_ctlengine case $1 in show) + require_dbengine mecho "dispatcher gateways" QUERY="select * FROM $DISPATCHER_TABLE ORDER BY $DISPATCHER_SETID_COLUMN; " $DBROCMD "$QUERY" ;; addgw|add) + require_dbengine shift if [ $# -lt 2 ] ; then merr "too few parameters" @@ -1638,6 +1638,7 @@ dispatcher() { ;; rmgw|rm) + require_dbengine shift if [ $# -ne 1 ] ; then merr "missing gateway id to be removed" @@ -1654,10 +1655,12 @@ dispatcher() { ;; reload) + require_ctlengine $CTLCMD ds_reload ;; dump) + require_ctlengine $CTLCMD ds_list ;;

1 0

git:4.3:c064b97f: core: exit with failure code if a child dies
by Camille Oudot 19 Nov '15

19 Nov '15

Module: kamailio Branch: 4.3 Commit: c064b97f79e4a4c757166704b67b98d36340d7cc URL: https://github.com/kamailio/kamailio/commit/c064b97f79e4a4c757166704b67b98d… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-11-19T12:43:21+01:00 core: exit with failure code if a child dies (cherry picked from commit dd7854ea6f7efa6899bf59bb0d5069f0daf1def9) --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/c064b97f79e4a4c757166704b67b98d… Patch: https://github.com/kamailio/kamailio/commit/c064b97f79e4a4c757166704b67b98d… --- diff --git a/main.c b/main.c index a990cf7..30519fb 100644 --- a/main.c +++ b/main.c @@ -745,7 +745,11 @@ void handle_sigs(void) /* exit */ shutdown_children(SIGTERM, 1); LM_DBG("terminating due to SIGCHLD\n"); - exit(0); + if (WIFSIGNALED(chld_status)) { + exit(1); + } else { + exit(0); + } break; case SIGHUP: /* ignoring it*/

1 0

[kamailio] core: exit with failure code if a child dies (#403)
by Camille Oudot 19 Nov '15

19 Nov '15

I made this patch to ensure kamailio exits with an unclean status if it stops due to a child exits. This allows systemd's unit `Restart=on-failure` parameter to actually automatically restart kamailio, in a segfault or any other signal-throwing situation. The side effect is that it would trigger a kamailio restart if one of the children is stopped with a TERM signal, but I considered here that the only clean way to stop kamailio is to send a signal to the main attendant process, and not to a child. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/403 -- Commit Summary -- * core: exit with failure code if a child dies -- File Changes -- M main.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/403.patch https://github.com/kamailio/kamailio/pull/403.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/403

2 3

git:master:a5b5091a: Merge pull request #403 from kamailio/child_stop_fail_status
by Camille Oudot 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: a5b5091ad937bbb5336b86ebb5ca2de7556b8e67 URL: https://github.com/kamailio/kamailio/commit/a5b5091ad937bbb5336b86ebb5ca2de… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-11-19T12:26:22+01:00 Merge pull request #403 from kamailio/child_stop_fail_status core: exit with failure code if a child dies --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/a5b5091ad937bbb5336b86ebb5ca2de… Patch: https://github.com/kamailio/kamailio/commit/a5b5091ad937bbb5336b86ebb5ca2de… --- diff --git a/main.c b/main.c index c9a6a12..94f64ff 100644 --- a/main.c +++ b/main.c @@ -755,7 +755,11 @@ void handle_sigs(void) /* exit */ shutdown_children(SIGTERM, 1); LM_DBG("terminating due to SIGCHLD\n"); - exit(0); + if (WIFSIGNALED(chld_status)) { + exit(1); + } else { + exit(0); + } break; case SIGHUP: /* ignoring it*/

1 0

git:master:dd7854ea: core: exit with failure code if a child dies
by Camille Oudot 19 Nov '15

19 Nov '15

Module: kamailio Branch: master Commit: dd7854ea6f7efa6899bf59bb0d5069f0daf1def9 URL: https://github.com/kamailio/kamailio/commit/dd7854ea6f7efa6899bf59bb0d5069f… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-11-19T11:16:11+01:00 core: exit with failure code if a child dies --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/dd7854ea6f7efa6899bf59bb0d5069f… Patch: https://github.com/kamailio/kamailio/commit/dd7854ea6f7efa6899bf59bb0d5069f… --- diff --git a/main.c b/main.c index c9a6a12..94f64ff 100644 --- a/main.c +++ b/main.c @@ -755,7 +755,11 @@ void handle_sigs(void) /* exit */ shutdown_children(SIGTERM, 1); LM_DBG("terminating due to SIGCHLD\n"); - exit(0); + if (WIFSIGNALED(chld_status)) { + exit(1); + } else { + exit(0); + } break; case SIGHUP: /* ignoring it*/

1 0

git:master:1a059109: usrloc: log details of contact when inserting in db failes
by Daniel-Constantin Mierla 18 Nov '15

18 Nov '15

Module: kamailio Branch: master Commit: 1a05910912fbf9baaf821cc30fac7485c1e67622 URL: https://github.com/kamailio/kamailio/commit/1a05910912fbf9baaf821cc30fac748… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-18T14:43:22+01:00 usrloc: log details of contact when inserting in db failes --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/1a05910912fbf9baaf821cc30fac748… Patch: https://github.com/kamailio/kamailio/commit/1a05910912fbf9baaf821cc30fac748… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index a645e42..68e0359 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -680,7 +680,8 @@ int db_insert_ucontact(ucontact_t* _c) } if (ul_dbf.insert(ul_dbh, keys, vals, nr_cols) < 0) { - LM_ERR("inserting contact in db failed\n"); + LM_ERR("inserting contact in db failed %.*s (%.*s)\n", + _c->aor->len, ZSW(_c->aor->s), _c->ruid.len, ZSW(_c->ruid.s)); return -1; }

1 0

git:master:44fdac69: carrierroute: fix failureroute db_load_description
by Lucian Balaceanu 18 Nov '15

18 Nov '15

Module: kamailio Branch: master Commit: 44fdac69eb864125b4d02af0c650ce735dcf7aa8 URL: https://github.com/kamailio/kamailio/commit/44fdac69eb864125b4d02af0c650ce7… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2015-11-18T13:45:34+02:00 carrierroute: fix failureroute db_load_description - safeguarding shm_str_dup call in add_failure_route_rule function --- Modified: modules/carrierroute/cr_rule.c --- Diff: https://github.com/kamailio/kamailio/commit/44fdac69eb864125b4d02af0c650ce7… Patch: https://github.com/kamailio/kamailio/commit/44fdac69eb864125b4d02af0c650ce7… --- diff --git a/modules/carrierroute/cr_rule.c b/modules/carrierroute/cr_rule.c index a9e6bba..fa3e8ee 100644 --- a/modules/carrierroute/cr_rule.c +++ b/modules/carrierroute/cr_rule.c @@ -360,7 +360,7 @@ struct failure_route_rule *add_failure_route_rule(struct failure_route_rule **fr shm_frr->mask = mask; shm_frr->next_domain = next_domain; - if (shm_str_dup(&shm_frr->comment, comment) != 0) { + if (comment && shm_str_dup(&shm_frr->comment, comment) != 0) { goto mem_error; }

1 0

git:master:70ecc623: Accept a list of headers for callid_aleg_header
by Giacomo Vacca 18 Nov '15

18 Nov '15

Module: kamailio Branch: master Commit: 70ecc623b1ae032a986f37547a7a81f332aedfcb URL: https://github.com/kamailio/kamailio/commit/70ecc623b1ae032a986f37547a7a81f… Author: Giacomo Vacca <gv(a)rtcsoft.net> Committer: Giacomo Vacca <gv(a)rtcsoft.net> Date: 2015-10-29T17:35:27+01:00 Accept a list of headers for callid_aleg_header --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/70ecc623b1ae032a986f37547a7a81f… Patch: https://github.com/kamailio/kamailio/commit/70ecc623b1ae032a986f37547a7a81f… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 0151fce..256ddc7 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -95,6 +95,8 @@ MODULE_VERSION #define NR_KEYS 40 #define RTCP_NR_KEYS 12 +#define MAX_HEADERS 16 + /*multiple table mode*/ enum e_mt_mode{ mode_random = 1, @@ -138,6 +140,9 @@ static int w_sip_capture(struct sip_msg* _m, char* _table, _capture_mode_data_t 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); +static int sipcapture_parse_aleg_callid_headers(); +int parse_aleg_callid_headers(str *headers_str, str *headers); + int init_rawsock_children(void); int extract_host_port(void); int raw_capture_socket(struct ip_addr* ip, str* iface, int port_start, int port_end, int proto); @@ -216,6 +221,9 @@ str raw_socket_listen = { 0, 0 }; str raw_interface = { 0, 0 }; char *authkey = NULL, *correlation_id = NULL; +str callid_aleg_headers[MAX_HEADERS]; +int n_callid_aleg_headers = 0; + struct ifreq ifr; /* interface structure */ #ifdef __OS_linux @@ -738,6 +746,10 @@ static int mod_init(void) { pkg_free(def_params); + if (sipcapture_parse_aleg_callid_headers() < 0) { + return -1; + } + #ifdef STATISTICS @@ -1692,10 +1704,15 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * } /* callid_aleg - default is X-CID but configurable via modul params */ - if((tmphdr[0] = get_hdr_by_name(msg, callid_aleg_header.s, callid_aleg_header.len)) != NULL) { - sco.callid_aleg = tmphdr[0]->body; - } - else { EMPTY_STR(sco.callid_aleg);} + EMPTY_STR(sco.callid_aleg); + int index; + for (index = 0; index < n_callid_aleg_headers; index++) { + if((tmphdr[0] = get_hdr_by_name(msg, callid_aleg_headers[index].s, callid_aleg_headers[index].len)) != NULL) { + LM_DBG("MATCHED header %.*s\n", callid_aleg_headers[index].len, callid_aleg_headers[index].s); + sco.callid_aleg = tmphdr[0]->body; + break; + } + } /* VIA 1 */ sco.via_1 = msg->h_via1->body; @@ -2527,3 +2544,53 @@ static int report_capture(struct sip_msg *msg, str *_table, str* _corr, str *_d } +// Algorithm optimized by coudot +int parse_aleg_callid_headers(str *headers_str, str *headers){ + if (headers_str->len == 0) { + return 0; + } + + int index = 0; + int begin = 0; + int current = 0; + + while ((index < headers_str->len) && (current < MAX_HEADERS)) { + // End of headers string + if ((index == headers_str->len - 1) && (headers_str->s[index] != ';')) { + headers[current].s = headers_str->s + begin; + headers[current].len = index + 1 - begin; + current++; + break; + } + else if (headers_str->s[index] == ';') { + // Skip empty header + if (begin == index) { + begin++; + } + else { + // Another header identified + headers[current].s = headers_str->s + begin; + headers[current].len = index - begin; + current++; + begin = index + 1; + } + } + // Move to next char + index++; + } + + // current now holds the number of headers + return current; +} + +static int sipcapture_parse_aleg_callid_headers() { + int i; + n_callid_aleg_headers = parse_aleg_callid_headers(&callid_aleg_header, callid_aleg_headers); + LM_DBG("Number of headers:%d\n", n_callid_aleg_headers); + + for (i=0; i < n_callid_aleg_headers; i++) { + LM_DBG("Header: %.*s\n", callid_aleg_headers[i].len, callid_aleg_headers[i].s); + } + + return n_callid_aleg_headers; +}

2 1

← Newer
1
...
16
17
18
19
20
21
22
...
32
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 2015