sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

[tracker] Comment added: app_lua: add rpc reload command
by sip-router 29 Mar '13

29 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Daniel-Constantin Mierla (miconda) ---------- + int sv_len = sr_lua_script_ver->len; + int sv[sv_len]; Declaring an array with the size in a variable is not C standard (at least not C89), so in some distros can cause troubles. Probably I will commit the patches soon and then add a workaround for it, unless you do one quickly. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=270#comment805 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.

1 0

git:master: Makefile.defs: version set to 4.1.0-dev2
by Daniel-Constantin Mierla 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: afc8b3e7ae13198c7bca42f7f7fc5499418cfa59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=afc8b3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 29 09:25:09 2013 +0100 Makefile.defs: version set to 4.1.0-dev2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 0bb95a4..937071b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -163,7 +163,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master: Makefile: pure target associated to maintainer-clean
by Daniel-Constantin Mierla 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: c77ec4ed4cc756373b0f20885d4f04d2276c00c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c77ec4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 29 09:23:43 2013 +0100 Makefile: pure target associated to maintainer-clean --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 42086dd..330c06e 100644 --- a/Makefile +++ b/Makefile @@ -1014,6 +1014,10 @@ clean_modules_cfg clean-modules-cfg: .PHONY: clean_makefile_vars clean-makefile-vars rm -f Makefile.vars +# clean everything generated - shortcut on maintainer-clean +.PHONY: pure +pure: maintainer-clean + .PHONY: dbschema dbschema: -@echo "Build database schemas"

1 0

git:master: snmpstats Adding more memory data variables
by Olle E. Johansson 29 Mar '13

29 Mar '13

Module: sip-router Branch: master Commit: c26d6bb13fb699ec2cb9e916d8a562d3ee4c8f0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c26d6bb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri Mar 29 09:38:29 2013 +0100 snmpstats Adding more memory data variables Also, remove dependency of the kex module by interfacing directly with the core the same way as the kex module does get memory information. --- modules/snmpstats/kamailioServer.c | 233 ++++++++++++++++++++-------------- modules/snmpstats/kamailioServer.h | 3 + modules/snmpstats/mibs/KAMAILIO-MIB | 129 +++++++++++++++++++ 3 files changed, 269 insertions(+), 96 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c26…

1 0

SNMPstats additions
by Olle E. Johansson 29 Mar '13

29 Mar '13

Hi! For some weird reason I decided to make the SNMPstats module a bit more useful and started adding new data to it, in order to learn how to work with net-snmp and try to learn where to find the data. Here's some new entries in the Kamailio MIB: Memory data: =========== KAMAILIO-MIB::kamailioSrvMaxMemory.0 = Gauge32: 33554432 KAMAILIO-MIB::kamailioSrvFreeMemory.0 = Gauge32: 31709088 Version data: =========== KAMAILIO-MIB::kamailioSrvCnfFullVersion.0 = STRING: kamailio 4.0.0 (i386/linux) 50af49 KAMAILIO-MIB::kamailioSrvCnfVerName.0 = STRING: kamailio KAMAILIO-MIB::kamailioSrvCnfVerVersion.0 = STRING: 4.0.0 KAMAILIO-MIB::kamailioSrvCnfVerArch.0 = STRING: i386 KAMAILIO-MIB::kamailioSrvCnfVerOs.0 = STRING: linux KAMAILIO-MIB::kamailioSrvCnfVerId.0 = STRING: 50af49 KAMAILIO-MIB::kamailioSrvCnfVerCompTime.0 = STRING: 12:12:27 Mar 24 2013 KAMAILIO-MIB::kamailioSrvCnfVerCompiler.0 = STRING: gcc 4.1.2 KAMAILIO-MIB::kamailioSrvCnfVerFlags.0 = STRING: STATS: Off, USE_IPV6, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES TCP Statistics and configuration data: ============================== KAMAILIO-MIB::kamailioNetTcpConnEstablished.0 = Counter32: 0 KAMAILIO-MIB::kamailioNetTcpConnFailed.0 = Counter32: 0 KAMAILIO-MIB::kamailioNetTcpConnReset.0 = Counter32: 0 KAMAILIO-MIB::kamailioNetTcpConnSuccess.0 = Counter32: 0 KAMAILIO-MIB::kamailioNetTcpConnOpened.0 = Gauge32: 0 KAMAILIO-MIB::kamailioNetTcpConnPassiveOpen.0 = Counter32: 0 KAMAILIO-MIB::kamailioNetTcpConnReject.0 = Counter32: 0 KAMAILIO-MIB::kamailioNetTcpEnabled.0 = INTEGER: true(1) KAMAILIO-MIB::kamailioNetTcpMaxConns.0 = INTEGER: 2048 KAMAILIO-MIB::kamailioNetTcpAsync.0 = INTEGER: true(1) The version part is complete, but TCP and memory can be expanded to cover at least the same data as we can get from the RPC interface. I would like to be able to list process memory data in a table so one can monitor both core and process memory using SNMP. In order to do that, I need to figure out how to create SNMP tables :-) It would also be nice to be able to expose some private counters from the configuration script, like "number of vulcan language messages" and "MESSAGE requests in Klingon". Any comments, ideas? /O

2 3

git:4.0: modules/outbound: updated edge proxy example in README
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: 4.0 Commit: c3f2d14337093843a81353aef34c078dc7e53787 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3f2d14… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 01:08:02 2013 +0000 modules/outbound: updated edge proxy example in README (cherry picked from commit 60953cd884af7d070ce44844a874f2bd75833998) --- modules/outbound/README | 161 ++++++++++++++++++++++--------- modules/outbound/doc/outbound_admin.xml | 159 +++++++++++++++++++++--------- 2 files changed, 225 insertions(+), 95 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c3f…

1 0

git:4.0: modules/outbound: improved check for outbound
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: 4.0 Commit: 9df1edfb18f1ec0846ca474f510532050b55fc80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9df1edf… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 16:32:59 2013 +0000 modules/outbound: improved check for outbound (cherry picked from commit b2fb355fe5c9c64727d873cbe8d6fd883ebd2537) --- modules/outbound/ob_mod.c | 139 ++++++++++++++++++++++++++++++++------------ 1 files changed, 101 insertions(+), 38 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index fb110d8..a58fdff 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -206,7 +206,7 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) if (flow_token.s == NULL) { - LM_INFO("no flow-token provided\n"); + LM_DBG("no flow-token provided\n"); return -2; } @@ -275,29 +275,10 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) return 0; } -int use_outbound(struct sip_msg *msg) +static int use_outbound_register(struct sip_msg *msg) { contact_t *contact; - rr_t *rt; - struct sip_uri puri; - param_hooks_t hooks; - param_t *params; - int ret; - - /* If Outbound is forced return success without any further checks */ - if (ob_force_flag != -1 && isflagset(msg, ob_force_flag) > 0) - { - LM_INFO("outbound forced\n"); - return 1; - } - - /* Use Outbound when there is a single Via: header and: - # It's a REGISTER request with a Contact-URI containing a ;reg-id - parameter, or - # The Contact-URI has an ;ob parameter, or - # The top Route-URI points to use and has an ;ob parameter - */ - + /* Check there is a single Via: */ if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 || msg->via2->error != PARSE_OK)) @@ -306,8 +287,7 @@ int use_outbound(struct sip_msg *msg) return 0; } - /* Look for ;reg-id in REGISTER Contact-URIs and ;ob in any - Contact-URIs */ + /* Look for ;reg-id in Contact-URIs */ if (msg->contact || (parse_headers(msg, HDR_CONTACT_F, 0) != -1 && msg->contact)) { @@ -323,21 +303,29 @@ int use_outbound(struct sip_msg *msg) return 0; } - if (msg->REQ_METHOD == METHOD_REGISTER && contact->reg_id) + if (contact->reg_id) { LM_INFO("found REGISTER with ;reg-id paramter on" " Contact-URI - outbound used\n"); return 1; } - if (hooks.contact.ob) - { - LM_INFO("found ;ob parameter on Contact-URI - outbound" - " used\n"); - return 1; - } } + LM_INFO("outbound not used\n"); + return 0; +} + +static int use_outbound_non_reg(struct sip_msg *msg) +{ + contact_t *contact; + rr_t *rt; + struct sip_uri puri; + param_hooks_t hooks; + param_t *params; + int ret; + struct receive_info rcv; + /* Check to see if the top Route-URI is me and has a ;ob parameter */ if (msg->route || (parse_headers(msg, HDR_ROUTE_F, 0) != -1 && msg->route)) @@ -359,13 +347,6 @@ int use_outbound(struct sip_msg *msg) LM_ERR("parsing Route-URI\n"); return 0; } - if (parse_params(&puri.params, CLASS_URI, &hooks, - &params) != 0) - { - LM_ERR("parsing Route-URI parameters\n"); - return 0; - } - ret = check_self(&puri.host, puri.port_no ? puri.port_no : SIP_PORT, 0); if (ret < 1 || (ret == 1 && puri.gr.s != NULL)) @@ -377,10 +358,65 @@ int use_outbound(struct sip_msg *msg) return 0; } + if (parse_params(&puri.params, CLASS_URI, &hooks, + &params) != 0) + { + LM_ERR("parsing Route-URI parameters\n"); + return 0; + } + if (hooks.uri.ob) { LM_INFO("found ;ob parameter on Route-URI - outbound" " used\n"); + + if (decode_flow_token(&rcv, puri.user) == 0) + { + if (!ip_addr_cmp(&rcv.src_ip, &msg->rcv.src_ip) + || rcv.src_port != msg->rcv.src_port) + { + LM_INFO("\"incoming\" request found\n"); + return 2; + } + } + + LM_INFO("\"outgoing\" request found\n"); + return 1; + } + } + + /* Look for ;ob in Contact-URIs */ + if (msg->contact + || (parse_headers(msg, HDR_CONTACT_F, 0) != -1 && msg->contact)) + { + if (parse_contact(msg->contact) < 0) + { + LM_ERR("parsing Contact: header body\n"); + return 0; + } + contact = ((contact_body_t *) msg->contact->parsed)->contacts; + if (!contact) + { + LM_ERR("empty Contact:\n"); + return 0; + } + + if (parse_uri(contact->uri.s, contact->uri.len, &puri) + < 0) + { + LM_ERR("parsing Contact-URI\n"); + return 0; + } + if (parse_params(&puri.params, CLASS_CONTACT, &hooks, &params) + != 0) + { + LM_ERR("parsing Contact-URI parameters\n"); + return 0; + } + if (hooks.contact.ob) + { + LM_INFO("found ;ob parameter on Contact-URI - outbound" + " used\n"); return 1; } } @@ -389,6 +425,33 @@ int use_outbound(struct sip_msg *msg) return 0; } +int use_outbound(struct sip_msg *msg) +{ + if (msg->first_line.type != SIP_REQUEST) + { + LM_ERR("use_outbound called for something that isn't a SIP" + " request\n"); + return 0; + } + + /* If Outbound is forced return success without any further checks */ + if (ob_force_flag != -1 && isflagset(msg, ob_force_flag) > 0) + { + LM_DBG("outbound forced\n"); + return 1; + } + + LM_INFO("Analysing %.*s for outbound markers\n", + msg->first_line.u.request.method.len, + msg->first_line.u.request.method.s); + + if (msg->REQ_METHOD == METHOD_REGISTER) + return use_outbound_register(msg); + else + return use_outbound_non_reg(msg); + +} + int bind_ob(struct ob_binds *pxb) { if (pxb == NULL)

1 0

git:4.0: modules/outbound: further improvement to the use_outbound() check
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: 4.0 Commit: 291900478f16272222b7c9138685ef871ece0875 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2919004… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 16:51:52 2013 +0000 modules/outbound: further improvement to the use_outbound() check (cherry picked from commit a5f8f4cd4da60168fd73d7999c09181582ec5943) --- modules/outbound/ob_mod.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index a58fdff..3f76433 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -385,6 +385,14 @@ static int use_outbound_non_reg(struct sip_msg *msg) } } + /* Check there is a single Via: */ + if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 + || msg->via2->error != PARSE_OK)) + { + LM_INFO("second Via: found - outbound not used\n"); + return 0; + } + /* Look for ;ob in Contact-URIs */ if (msg->contact || (parse_headers(msg, HDR_CONTACT_F, 0) != -1 && msg->contact))

1 0

git:4.0: modules/rr: copy the flow-token for "incoming" messages when using outbound
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: 4.0 Commit: 1a8843319ac00020ed291d2904b202698c3bb1c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a88433… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 16:33:17 2013 +0000 modules/rr: copy the flow-token for "incoming" messages when using outbound (cherry picked from commit 0c1725c8ccb08280a9c161e34fa9e43347cae7b0) --- modules/rr/record.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 64 insertions(+), 3 deletions(-) diff --git a/modules/rr/record.c b/modules/rr/record.c index f4a7810..784ec90 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -37,6 +37,7 @@ #include "../../dprint.h" #include "../../parser/parse_uri.h" #include "../../parser/parse_from.h" +#include "../../parser/parse_rr.h" #include "../../str.h" #include "../../data_lump.h" #include "record.h" @@ -294,6 +295,51 @@ lump_err: return -4; } +/*! + * \brief Copy flow-token from top-Route: to a string + * + * Copy the user part of the top-Route: to a string (allocating private memory + * for this). + * \param token where the user-part of the top-Route: will be copied to + * \param _m the SIP message to extract the top-Route: from + * \return 0 on success, negative on failure + */ +static int copy_flow_token(str *token, struct sip_msg *_m) +{ + rr_t *rt; + struct sip_uri puri; + + if (_m->route + || (parse_headers(_m, HDR_ROUTE_F, 0) != -1 && _m->route)) { + if (parse_rr(_m->route) < 0) { + LM_ERR("parsing Route: header body\n"); + return -1; + } + rt = (rr_t *) _m->route->parsed; + if (!rt) { + LM_ERR("empty Route:\n"); + return -1; + } + if (parse_uri(rt->nameaddr.uri.s, rt->nameaddr.uri.len, + &puri) < 0) { + LM_ERR("parsing Route-URI\n"); + return -1; + } + + token->s = pkg_malloc(puri.user.len * sizeof(char)); + if (token->s == NULL) { + LM_ERR("allocating memory\n"); + return -1; + } + memcpy(token->s, puri.user.s, puri.user.len); + token->len = puri.user.len; + return 0; + } + + LM_ERR("no Route: headers found\n"); + return -1; +} + /*! * \brief Insert a new Record-Route header field with lr parameter @@ -322,11 +368,16 @@ int record_route(struct sip_msg* _m, str *params) return -1; } } - } else if (use_ob) { + } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } + } else if (use_ob == 2) { + if (copy_flow_token(&user, _m) != 0) { + LM_ERR("copying outbound flow-token\n"); + return -1; + } } if (append_fromtag) { @@ -411,11 +462,16 @@ int record_route_preset(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } - } else if (use_ob) { + } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } + } else if (use_ob == 2) { + if (copy_flow_token(&user, _m) != 0) { + LM_ERR("copying outbound flow-token\n"); + return -1; + } } if (append_fromtag) { @@ -634,11 +690,16 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } - } else if (use_ob) { + } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } + } else if (use_ob == 2) { + if (copy_flow_token(&user, _m) != 0) { + LM_ERR("copying outbound flow-token\n"); + return -1; + } } if (append_fromtag) {

1 0

git:4.0: modules/outbound: free shared memory for flow-token key during shutdown
by Peter Dunkley 29 Mar '13

29 Mar '13

Module: sip-router Branch: 4.0 Commit: 527db661fa3f3bc3899eaf9c264c9080cc757318 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=527db66… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 14:54:41 2013 +0000 modules/outbound: free shared memory for flow-token key during shutdown (cherry picked from commit 9d9d51438acd1d534f14ecbc8eb0030b45333177) --- modules/outbound/ob_mod.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 4c4e7ea..7cf0c74 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -43,6 +43,7 @@ MODULE_VERSION #define OB_KEY_LEN 20 static int mod_init(void); +static void destroy(void); static unsigned int ob_force_flag = (unsigned int) -1; static str ob_key = {0, 0}; @@ -73,7 +74,7 @@ struct module_exports exports= 0, /* extra processes */ mod_init, /* module initialization function */ 0, /* response function */ - 0, /* destroy function */ + destroy, /* destroy function */ 0 /* per-child initialization function */ }; @@ -100,6 +101,11 @@ static int mod_init(void) return 0; } +static void destroy(void) +{ + shm_free(ob_key.s); +} + /* Structure of flow-token <HMAC-SHA1-80><protocol><dst_ip><dst_port><src_ip><src_port>

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013