sr-dev August 2013

sr-dev@lists.kamailio.org

29 participants
148 discussions

git:carstenbock/db_cassandra_deb: Added db_cassandra packaging

by Carsten Bock

Module: sip-router Branch: carstenbock/db_cassandra_deb Commit: 42ce9344e19ac8b102722737a48d784c9954bec7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42ce934… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Aug 22 17:34:29 2013 +0200 Added db_cassandra packaging --- Makefile.groups | 3 +++ pkg/kamailio/deb/wheezy/control | 10 ++++++++++ pkg/kamailio/deb/wheezy/rules | 2 +- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index 6c4c5f0..174414d 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -340,6 +340,9 @@ module_group_ksctp=$(mod_list_sctp) # pkg auth_ephemeral module module_group_kautheph=$(mod_list_autheph) +# pkg db_cassandra module +module_group_kcassandra=$(mod_list_cassandra) + # list of static modules # static_modules:= diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index ce58700..272cb2e 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -448,3 +448,13 @@ Description: Kamailio - Websocket Module . This package contains the module implementing WebSocket transport layer. +Package: kamailio-cassandra-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libthrift-dev +Description: Kamailio - Cassandra Module + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package contains the modules for using cassandra as a database backend. + diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 1c3587d..c2f9625 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -42,7 +42,7 @@ MODULES_SP= PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached tls \ snmpstats carrierroute xmpp cpl redis python geoip \ - sqlite json mono ims outbound websocket + sqlite json mono ims outbound websocket cassandra # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) LIBDIR ?= lib

11 years, 4 months

git:master: Added support for max-time update of monitored calls

by Carlos Ruiz Diaz

Module: sip-router Branch: master Commit: 0efe5a4d9adb08575938d2c4eb83ec3a79d38e20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0efe5a4… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Thu Aug 22 11:16:31 2013 -0400 Added support for max-time update of monitored calls - updated example config file - updated documentation --- modules/cnxcc/README | 110 +++++++++++++++++++++++++++--- modules/cnxcc/cnxcc_mod.c | 93 +++++++++++++++++++++++++ modules/cnxcc/doc/cnxcc_admin.xml | 45 ++++++++++++- modules/cnxcc/example/kamailio-cnxcc.cfg | 38 +++++++++- 4 files changed, 272 insertions(+), 14 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0ef…

11 years, 4 months

git:carstenbock/utils_post: Define missing fixup_functions.

by Carsten Bock

Module: sip-router Branch: carstenbock/utils_post Commit: d84cced413b6dbb495eb56a99b955b10c3785211 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d84cced… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Aug 22 16:36:48 2013 +0200 Define missing fixup_functions. --- modules/utils/utils.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 735ea0d..13b7f07 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -89,8 +89,10 @@ static int child_init(int); static void destroy(void); /* Fixup functions to be defined later */ -static int fixup_http_query(void** param, int param_no); -static int fixup_free_http_query(void** param, int param_no); +static int fixup_http_query_get(void** param, int param_no); +static int fixup_free_http_query_get(void** param, int param_no); +static int fixup_http_query_post(void** param, int param_no); +static int fixup_free_http_query_post(void** param, int param_no); /* Wrappers for http_query to be defined later */ static int w_http_query(struct sip_msg* _m, char* _url, char* _result);

11 years, 4 months

git:master: core: fix condition to lookup envet_route[core: receive-parse-error]

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 86bdfaa3efe7804bcfde3da4f63b252c74e417b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86bdfaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 22 15:44:05 2013 +0200 core: fix condition to lookup envet_route[core:receive-parse-error] - reported by Juha Heinanen --- events.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/events.c b/events.c index 2518486..ae4fead 100644 --- a/events.c +++ b/events.c @@ -48,9 +48,11 @@ void sr_core_ert_init(void) /* 0 - is not a valid index in event_route blocks list */ _sr_core_ert_list.init_parse_error = route_get(&event_rt, "core:receive-parse-error"); - if(_sr_core_ert_list.init_parse_error>=0 - && event_rt.rlist[_sr_core_ert_list.init_parse_error]!=NULL) { + if(_sr_core_ert_list.init_parse_error<=0 + || event_rt.rlist[_sr_core_ert_list.init_parse_error]==NULL) { _sr_core_ert_list.init_parse_error = -1; + } else { + LM_DBG("event_route[core:receive-parse-error] is defined\n"); } }

11 years, 4 months

[tracker] Comment added: modules/lcr just needs some "\n" on the LM_DBG statements

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#334 - modules/lcr just needs some "\n" on the LM_DBG statements User who did this - Kevin Scott Adams (TheGrandWazoo) ---------- You are welcome. Thanks for the module. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=334#comment1062 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 4 months

[tracker] Comment added: add arbitrary params in Path header

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#332 - add arbitrary params in Path header User who did this - Seudin Kasumovic (seudin) ---------- There is no specific reason for stick to avp only, but I followed logic of other modules where use avp var in module params. So, what vars are allowed (safe) to be used in module params? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=332#comment1061 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 4 months

git:master: core: execute event_route[core:receive-parse-error] block on error of initial sip message parsing

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2d826efb7dbcf9b3b49c376bcd079ab1e7642a44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d826ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 22 13:01:55 2013 +0200 core: execute event_route[core:receive-parse-error] block on error of initial sip message parsing - note that the SIP message is broken in this case, but it gets access to source and local socket addresses (ip, port, proto, af) as well as the whole message buffer and its size --- events.c | 35 +++++++++++++++++++++++++++++++++++ events.h | 8 ++++++++ main.c | 4 ++++ receive.c | 1 + 4 files changed, 48 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c index 95bce9b..2518486 100644 --- a/events.c +++ b/events.c @@ -27,11 +27,46 @@ #include "dprint.h" #include "mem/mem.h" +#include "route.h" #include "events.h" static sr_event_cb_t _sr_events_list; static int _sr_events_inited = 0; +typedef struct _sr_core_ert { + int init_parse_error; +} sr_core_ert_t; + +static sr_core_ert_t _sr_core_ert_list; + +/** + * + */ +void sr_core_ert_init(void) +{ + memset(&_sr_core_ert_list, 0, sizeof(sr_core_ert_t)); + /* 0 - is not a valid index in event_route blocks list */ + _sr_core_ert_list.init_parse_error = route_get(&event_rt, + "core:receive-parse-error"); + if(_sr_core_ert_list.init_parse_error>=0 + && event_rt.rlist[_sr_core_ert_list.init_parse_error]!=NULL) { + _sr_core_ert_list.init_parse_error = -1; + } +} + +/** + * + */ +void sr_core_ert_run(sip_msg_t *msg, int e) +{ + switch(e) { + case SR_CORE_ERT_RECEIVE_PARSE_ERROR: + if(likely(_sr_core_ert_list.init_parse_error<=0)) + return; + break; + } +} + /** * */ diff --git a/events.h b/events.h index d9e27b1..376da07 100644 --- a/events.h +++ b/events.h @@ -59,4 +59,12 @@ int sr_event_register_cb(int type, sr_event_cb_f f); int sr_event_exec(int type, void *data); int sr_event_enabled(int type); + +/* shortcut types for core event routes */ +/* initial parsing error in message receive function */ +#define SR_CORE_ERT_RECEIVE_PARSE_ERROR 1 + +void sr_core_ert_init(void); +void sr_core_ert_run(sip_msg_t *msg, int e); + #endif diff --git a/main.c b/main.c index 24d3dc8..05d431e 100644 --- a/main.c +++ b/main.c @@ -145,6 +145,7 @@ #include "script_cb.h" #include "nonsip_hooks.h" #include "ut.h" +#include "events.h" #include "signals.h" #ifdef USE_RAW_SOCKS #include "raw_sock.h" @@ -2253,6 +2254,9 @@ try_again: if (pv_reinit_buffer()<0) goto error; + /* init lookup for core event routes */ + sr_core_ert_init(); + if (dont_fork_cnt) dont_fork = dont_fork_cnt; /* override by command line */ diff --git a/receive.c b/receive.c index 6b5740f..7dcc26f 100644 --- a/receive.c +++ b/receive.c @@ -146,6 +146,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) "core parsing of SIP message failed (%s:%d/%d)\n", ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, (int)msg->rcv.proto); + sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); goto error02; } DBG("After parse_msg...\n");

11 years, 4 months

git:4.0: core: print src address details if initial message parsing fails

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 2a224a569cea270d8db84438f163b9f309569df9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a224a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 22 00:14:53 2013 +0200 core: print src address details if initial message parsing fails - reported by Juha Heinanen (cherry picked from commit 3ccf4b43e81bd2654cb306a3c2cc21b97cb51f62) --- receive.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/receive.c b/receive.c index a4018ff..6b5740f 100644 --- a/receive.c +++ b/receive.c @@ -143,7 +143,9 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if (parse_msg(buf,len, msg)!=0){ LOG(cfg_get(core, core_cfg, corelog), - "ERROR: receive_msg: parse_msg failed\n"); + "core parsing of SIP message failed (%s:%d/%d)\n", + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, + (int)msg->rcv.proto); goto error02; } DBG("After parse_msg...\n");

11 years, 4 months

[tracker] Task closed: modules/lcr just needs some "\n" on the LM_DBG statements

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#334 - modules/lcr just needs some "\n" on the LM_DBG statements User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: Thanks for the patch. I just applied it. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=334 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 4 months

git:4.0: modules/lcr: added some linefeed chars missing from syslog messages

by Juha Heinanen

Module: sip-router Branch: 4.0 Commit: fd4a2dde96a692c165f382839c3bef8636dfd9e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd4a2dd… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Aug 22 08:20:52 2013 +0300 modules/lcr: added some linefeed chars missing from syslog messages - Patch provided by Kevin Scott Adams. (cherry picked from commit d03651fb4c3a6b50923029e121eed201fb1ff550) --- modules/lcr/lcr_mod.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 9c5ff3f..b204721 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1235,7 +1235,7 @@ int reload_tables() request_uri_re = from_uri_re = 0; do { - LM_DBG("loading, cycle %d with <%d> rows", n++, RES_ROW_N(res)); + LM_DBG("loading, cycle %d with <%d> rows\n", n++, RES_ROW_N(res)); for (i = 0; i < RES_ROW_N(res); i++) { request_uri_re = from_uri_re = 0; @@ -1447,7 +1447,7 @@ int reload_tables() n = 0; do { - LM_DBG("loading, cycle %d with <%d> rows", n++, RES_ROW_N(res)); + LM_DBG("loading, cycle %d with <%d> rows\n", n++, RES_ROW_N(res)); for (i = 0; i < RES_ROW_N(res); i++) { row = RES_ROWS(res) + i; if ((VAL_NULL(ROW_VALUES(row)) == 1) || @@ -1898,7 +1898,7 @@ static int load_gws(struct sip_msg* _m, int argc, action_u_t argv[]) if ((rule->from_uri_len != 0) && (pcre_exec(rule->from_uri_re, NULL, from_uri.s, from_uri.len, 0, 0, NULL, 0) < 0)) { - LM_DBG("from uri <%.*s> did not match to from regex <%.*s>", + LM_DBG("from uri <%.*s> did not match to from regex <%.*s>\n", from_uri.len, from_uri.s, rule->from_uri_len, rule->from_uri); goto next; @@ -1908,7 +1908,7 @@ static int load_gws(struct sip_msg* _m, int argc, action_u_t argv[]) if ((rule->request_uri_len != 0) && (pcre_exec(rule->request_uri_re, NULL, request_uri->s, request_uri->len, 0, 0, NULL, 0) < 0)) { - LM_DBG("request uri <%.*s> did not match to request regex <%.*s>", + LM_DBG("request uri <%.*s> did not match to request regex <%.*s>\n", request_uri->len, request_uri->s, rule->request_uri_len, rule->request_uri); goto next; @@ -2284,7 +2284,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) delete_avp(defunct_gw_avp_type, defunct_gw_avp); val.n = gw_index; add_avp(defunct_gw_avp_type, defunct_gw_avp, val); - LM_DBG("added defunct_gw_avp <%u>", addr.u.addr32[0]); + LM_DBG("added defunct_gw_avp <%u>\n", addr.u.addr32[0]); } return 1;

11 years, 4 months

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2013