sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

by Peter Dunkley

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14525ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 26 23:45:50 2013 +0100 core: auto-define cfg directive MOD_modname for each loaded module - example: if acc module is loaded, MOD_acc is defined in cfg - suggestion by Olle E. Johansson URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1dc02d… Author: Olle E. Johansson <oej(a)edvina.net> Date: Tue Mar 26 22:16:03 2013 +0100 snmpstats Add tcpasync and tcpmaxconns This is to test if I can reach core configuration settings for TCP. Tests prove that it's possible. Will go ahead and add other settings as well. One question is if we should allow changing these variables in SNMP, like we do over the RPC interface or selects. Let's think about that. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63a7289… Author: Olle E. Johansson <oej(a)edvina.net> Date: Tue Mar 26 21:29:48 2013 +0100 snmpstats Add IDs to sections in documentation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96596e2… Author: Carlos Ruiz Díaz <carlos.ruizdiaz(a)gmail.com> Date: Tue Mar 26 00:58:28 2013 -0300 cnxcc: added new module for credit control URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d269473… Author: Olle E. Johansson <oej(a)edvina.net> Date: Sun Mar 24 21:52:41 2013 +0100 snmpstats activate new parts of the KAMAILIO-MIB URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90c51c7… Author: Olle E. Johansson <oej(a)edvina.net> Date: Sun Mar 24 21:49:02 2013 +0100 snmpstats Add information about version and tcp connections Output from SNMPwalk with the new additions: 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::kamailioSrvMaxMemory.0 = Gauge32: 33554432 KAMAILIO-MIB::kamailioSrvFreeMemory.0 = Gauge32: 31709088 KAMAILIO-MIB::kamailioSrvCnfFullVersion.0 = STRING: kamailio 4.5.0 (i386/linux) 50af49 KAMAILIO-MIB::kamailioSrvCnfVerName.0 = STRING: kamailio KAMAILIO-MIB::kamailioSrvCnfVerVersion.0 = STRING: 4.5.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 2023 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 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d80ea02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 13:53:50 2013 +0100 usrloc: new option for db_mode - DB_READONLY (4) - location records are loaded only at startup - no write back to database, not even at shutdown - useful when registrations are replicated to another node that does the db storage at runtime - started from a patch by Marcus Hunger URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef8fae0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 13:24:58 2013 +0100 enum: define the max size for numbers - set it to 22 (previously hardcoded value was 17) - easier to adjust and check for overlenght - patch by Marcus Hunger URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61c706e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 13:07:39 2013 +0100 db_mysql: new module parameter - insert_delayed - if set to 1, then all INSERT API queries will be converted in INSERT DELAYED (only DB API insert, not for raw queries) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cbe03b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 12:50:50 2013 +0100 Makefile: exclude debian sym link when generating tarball URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7339d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 12:38:45 2013 +0100 msrp: fix compile warning of argument type in dbg message - reported by Olle E. Johansson URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb76415… Author: Olle E. Johansson <oej(a)edvina.net> Date: Sun Mar 24 11:45:43 2013 +0100 snmpstats Clear upp method-supported logic a bit and add "dialog-ng" for call statefullness URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3580d7f… Author: Olle E. Johansson <oej(a)edvina.net> Date: Sun Mar 24 11:38:27 2013 +0100 snmpstats Add SNMP support for shared memory This is just the first proof-of-concept addition, will add more of the core variables for memory and TCP connections URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1826a5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 23 10:44:31 2013 +0100 rr: use sips to build RR headers of R-URI has sips - reported by Hugh James, FS#277 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4baf038… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:23:49 2013 -0400 p_usrloc: commenting out unused db_timer_udomain() to get rid of compiler warnings URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6760960… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:16:27 2013 -0400 kamailio/utils/sercmd: remove unused but set variable URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7a41ef… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:15:08 2013 -0400 kamailio/utils/sercmd: remove unused but set variable URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff94115… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:13:27 2013 -0400 kamailio/utils/sercmd: remove unused but set variable URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=387adac… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:02:16 2013 -0400 auth_diameter: remove unused but set variable URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=941c48a… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:00:27 2013 -0400 auth_diameter: remove unused but set variable URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94e7ae7… Author: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Mar 20 17:31:34 2013 +0100 Updated example config for S-CSCF URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d8cec6… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Mar 20 15:39:12 2013 +0200 modules/drouting Improvement for do_routing in failure route Improvement for sort_order 2 : if the failure groups have repeating gateways the module will take care internally not to try again a gateway that was already tried. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6bb98dd… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: Wed Mar 20 14:27:30 2013 +0200 modules/carrierroute Improvement for cr_route in failure route Small improvement in cr_route() function - when it is called from failure_route it will take care not choose a previously choosen gateway. Added cr_reload sercmd. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0b01f7… Author: Henning Westerholt <hw(a)kamailio.org> Date: Tue Mar 19 15:32:25 2013 +0100 rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv

11 years, 8 months

#!IFMODULE

by Olle E. Johansson

Hi! Something I would like to see in Kamailio is something used heavily in Apache HTTPD, a config parser statement like #IFDEF for modules. WIth this a part of the config only applies if a module is loaded, like #!IFMODULE SNMPSTATS.SO modparam() #!ENDIF Another way to implement it would be to have modules publish a #!DEFINE, like #!IFDEF MOD_SNMPSTATS.SO Now, I don't know how Kamailio parses the configuration files. Is this at all possible? Either the module itself or the config file parser could inject these variables - but at module init it may be too late. Any ideas, someone who understands the config file parsing? /O

11 years, 8 months

git:master: core: auto-define cfg directive MOD_modname for each loaded module

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 14525efb68380b759347e64441cb90f97c1e3595 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14525ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 26 23:45:50 2013 +0100 core: auto-define cfg directive MOD_modname for each loaded module - example: if acc module is loaded, MOD_acc is defined in cfg - suggestion by Olle E. Johansson --- sr_module.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index 485f975..3cce9fe 100644 --- a/sr_module.c +++ b/sr_module.c @@ -64,6 +64,7 @@ #include "globals.h" #include "rpc_lookup.h" #include "sr_compat.h" +#include "ppcfg.h" #include <sys/stat.h> #include <regex.h> @@ -271,6 +272,7 @@ static int register_module(unsigned ver, union module_exports_u* e, { int ret, i; struct sr_module* mod; + char defmod[64]; ret=-1; @@ -366,6 +368,20 @@ static int register_module(unsigned ver, union module_exports_u* e, /* i==0 => success */ } + /* add cfg define for each module: MOD_modulename */ + if(strlen(mod->exports.name)>=60) { + LM_ERR("too long module name: %s\n", mod->exports.name); + goto error; + } + strcpy(defmod, "MOD_"); + strcat(defmod, mod->exports.name); + pp_define_set_type(0); + if(pp_define(strlen(defmod), defmod)<0) { + LM_ERR("unable to set cfg define for module: %s\n", + mod->exports.name); + goto error; + } + /* link module in the list */ mod->next=modules; modules=mod;

11 years, 9 months

git:master: snmpstats Add tcpasync and tcpmaxconns

by Olle E. Johansson

Module: sip-router Branch: master Commit: e1dc02d523867fc9934e862397e6da6b256c7b1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1dc02d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Mar 26 22:16:03 2013 +0100 snmpstats Add tcpasync and tcpmaxconns This is to test if I can reach core configuration settings for TCP. Tests prove that it's possible. Will go ahead and add other settings as well. One question is if we should allow changing these variables in SNMP, like we do over the RPC interface or selects. Let's think about that. --- modules/snmpstats/kamailioNet.c | 75 +++++++++++++++++++++++++++++++++++ modules/snmpstats/kamailioNet.h | 2 + modules/snmpstats/mibs/KAMAILIO-MIB | 43 ++++++++++++++++++- 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/modules/snmpstats/kamailioNet.c b/modules/snmpstats/kamailioNet.c index 535077d..efac0b9 100644 --- a/modules/snmpstats/kamailioNet.c +++ b/modules/snmpstats/kamailioNet.c @@ -42,6 +42,7 @@ #include "utilities.h" #include "../../lib/kcore/statistics.h" #include "../../globals.h" +#include "../../tcp_options.h" /* * Note: this file originally auto-generated by mib2c using @@ -61,6 +62,8 @@ init_kamailioNet(void) const oid kamailioNetTcpConnPassiveOpen_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,2,6 }; const oid kamailioNetTcpConnReject_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,2,8 }; const oid kamailioNetTcpEnabled_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,3,1 }; + const oid kamailioNetTcpMaxConns_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,3,2 }; + const oid kamailioNetTcpAsync_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,3,3 }; DEBUGMSGTL(("kamailioNet", "Initializing\n")); @@ -104,6 +107,16 @@ init_kamailioNet(void) kamailioNetTcpEnabled_oid, OID_LENGTH(kamailioNetTcpEnabled_oid), HANDLER_CAN_RONLY )); + netsnmp_register_scalar( + netsnmp_create_handler_registration("kamailioNetTcpMaxConns", handle_kamailioNetTcpMaxConns, + kamailioNetTcpMaxConns_oid, OID_LENGTH(kamailioNetTcpMaxConns_oid), + HANDLER_CAN_RONLY + )); + netsnmp_register_scalar( + netsnmp_create_handler_registration("kamailioNetTcpAsync", handle_kamailioNetTcpAsync, + kamailioNetTcpAsync_oid, OID_LENGTH(kamailioNetTcpAsync_oid), + HANDLER_CAN_RONLY + )); } #ifdef SKREP @@ -325,3 +338,65 @@ handle_kamailioNetTcpEnabled(netsnmp_mib_handler *handler, return SNMP_ERR_NOERROR; } + +int +handle_kamailioNetTcpMaxConns(netsnmp_mib_handler *handler, + netsnmp_handler_registration *reginfo, + netsnmp_agent_request_info *reqinfo, + netsnmp_request_info *requests) +{ + struct cfg_group_tcp t; + unsigned int maxconn; + + tcp_options_get(&t); + maxconn = t.max_connections; + + switch(reqinfo->mode) { + + case MODE_GET: + snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER, + (u_char *) &maxconn, sizeof(int)); + break; + + + default: + /* we should never get here, so this is a really bad error */ + snmp_log(LOG_ERR, "unknown mode (%d) in handle_kamailioNetTcpMaxConns\n", reqinfo->mode ); + return SNMP_ERR_GENERR; + } + + return SNMP_ERR_NOERROR; +} +int +handle_kamailioNetTcpAsync(netsnmp_mib_handler *handler, + netsnmp_handler_registration *reginfo, + netsnmp_agent_request_info *reqinfo, + netsnmp_request_info *requests) +{ + struct cfg_group_tcp t; + unsigned int value; + + tcp_options_get(&t); + value = t.async; + /* We are never called for a GETNEXT if it's registered as a + "instance", as it's "magically" handled for us. */ + + /* a instance handler also only hands us one request at a time, so + we don't need to loop over a list of requests; we'll only get one. */ + + switch(reqinfo->mode) { + + case MODE_GET: + snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER, + (u_char *) &value, sizeof(int)); + break; + + + default: + /* we should never get here, so this is a really bad error */ + snmp_log(LOG_ERR, "unknown mode (%d) in handle_kamailioNetTcpAsync\n", reqinfo->mode ); + return SNMP_ERR_GENERR; + } + + return SNMP_ERR_NOERROR; +} diff --git a/modules/snmpstats/kamailioNet.h b/modules/snmpstats/kamailioNet.h index 96ceedc..f037b3b 100644 --- a/modules/snmpstats/kamailioNet.h +++ b/modules/snmpstats/kamailioNet.h @@ -15,5 +15,7 @@ Netsnmp_Node_Handler handle_kamailioNetTcpConnOpened; Netsnmp_Node_Handler handle_kamailioNetTcpConnPassiveOpen; Netsnmp_Node_Handler handle_kamailioNetTcpConnReject; Netsnmp_Node_Handler handle_kamailioNetTcpEnabled; +Netsnmp_Node_Handler handle_kamailioNetTcpMaxConns; +Netsnmp_Node_Handler handle_kamailioNetTcpAsync; #endif /* KAMAILIONET_H */ diff --git a/modules/snmpstats/mibs/KAMAILIO-MIB b/modules/snmpstats/mibs/KAMAILIO-MIB index a6901e5..96bc9e9 100644 --- a/modules/snmpstats/mibs/KAMAILIO-MIB +++ b/modules/snmpstats/mibs/KAMAILIO-MIB @@ -193,7 +193,6 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN "Architecture Kamailio is compiled for" ::= { kamailioSrvConfig 4 } - kamailioSrvCnfVerOs OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only @@ -202,7 +201,6 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN "Operating System Kamailio is compiled for" ::= { kamailioSrvConfig 5 } - kamailioSrvCnfVerId OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only @@ -211,7 +209,6 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN "Kamailio Version ID" ::= { kamailioSrvConfig 6 } - kamailioSrvCnfVerCompTime OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only @@ -316,6 +313,46 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN "True if TCP is enabled in this server." ::= { kamailioNetTcpConfig 1 } + kamailioNetTcpMaxConns OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum number of TCP connections (configurable)" + ::= { kamailioNetTcpConfig 2 } + + kamailioNetTcpAsync OBJECT-TYPE + SYNTAX TruthValue + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "True if TCP Async is enabled in this server." + ::= { kamailioNetTcpConfig 3 } + + --- connect_timeout: 10 + --- send_timeout: 10 + --- connection_lifetime: 120 + --- max_connections(soft): 2048 + --- max_tls_connections(soft): 2048 + --- no_connect: 0 + --- fd_cache: 1 + --- async: 1 + --- connect_wait: 1 + --- conn_wq_max: 32768 + --- wq_max: 10485760 + --- defer_accept: 0 + --- delayed_ack: 0 + --- syncnt: 0 + --- linger2: 0 + --- keepalive: 1 + --- keepidle: 0 + --- keepintvl: 0 + --- keepcnt: 0 + --- crlf_ping: 1 + --- accept_aliases: 0 + --- alias_flags: 1 + --- new_conn_alias_flags: 2 + -- -- TCP connection statistic objects --

11 years, 9 months

[tracker] Comment added: usrloc module stops updating some records in db_mode 2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Jordan (jordan) ---------- Is there any additional information I can provide to help this issue? ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278#comment796 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, 9 months

git:master: snmpstats Add IDs to sections in documentation

by Olle E. Johansson

Module: sip-router Branch: master Commit: 63a72893c84aad1edd7b139dbe36e3c337d4e9ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63a7289… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Mar 26 21:29:48 2013 +0100 snmpstats Add IDs to sections in documentation --- modules/snmpstats/README | 16 ++++++++-------- modules/snmpstats/doc/snmpstats_admin.xml | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/snmpstats/README b/modules/snmpstats/README index 75e2bd3..a8dd9ca 100644 --- a/modules/snmpstats/README +++ b/modules/snmpstats/README @@ -254,10 +254,10 @@ Chapter 1. Admin Guide * usrloc - all scalars and tables relating to users and contacts are dependent on the usrloc module. If the module is not loaded, the respective tables will be empty. - * dialog - all scalars relating to the number of dialogs are - dependent on the presence of the dialog module. Furthermore, if the - module is not loaded, then the kamailioDialogLimitMinorEvent, and - kamailioDialogLimitMajorEvent alarm will be disabled. + * dialog or dialog-ng - all scalars relating to the number of dialogs + are dependent on the presence of a dialog module. Furthermore, if + the module is not loaded, then the kamailioDialogLimitMinorEvent, + and kamailioDialogLimitMajorEvent alarm will be disabled. The contents of the kamailioSIPMethodSupportedTable change depending on which modules are loaded. @@ -429,7 +429,7 @@ modparam("snmpstats", "export_registrar", 1) There are several things that need to be done to get the SNMPStats module compiled and up and running. -6.1. Compiling the SNMPStats Module +6.1. Compiling the SNMPStats Module In order for the SNMPStats module to compile, you will need at least version 5.3 of the NetSNMP source code. The source can be found at: @@ -451,7 +451,7 @@ modparam("snmpstats", "export_registrar", 1) recommended you install NetSNMP from source to avoid bringing in excessive dependencies to the SNMPStats module. -6.2. Configuring NetSNMP to allow connections from the SNMPStats module. +6.2. Configuring NetSNMP to allow connections from the SNMPStats module. The SNMPStats module will communicate with the NetSNMP Master Agent. This communication happens over a protocol known as AgentX. This means @@ -483,7 +483,7 @@ modparam("snmpstats", "export_registrar", 1) This tells NetSNMP to act as a master agent, listening on the localhost UDP interface at port 705. -6.3. Configuring the SNMPStats module for communication with a Master Agent +6.3. Configuring the SNMPStats module for communication with a Master Agent The previous section explained how to set up a NetSNMP master agent to accept AgentX connections. We now need to tell the SNMPStats module how @@ -503,7 +503,7 @@ modparam("snmpstats", "export_registrar", 1) be present on the same machine as Kamailio. localhost could be replaced with any other machine. -6.4. Testing for a proper Configuration +6.4. Testing for a proper Configuration As a quick test to make sure that the SNMPStats module sub-agent can succesfully connect to the NetSNMP Master agent, start snmpd with the diff --git a/modules/snmpstats/doc/snmpstats_admin.xml b/modules/snmpstats/doc/snmpstats_admin.xml index 490d3cc..241e0a4 100644 --- a/modules/snmpstats/doc/snmpstats_admin.xml +++ b/modules/snmpstats/doc/snmpstats_admin.xml @@ -203,8 +203,8 @@ <listitem> <para> - <emphasis>dialog</emphasis> - all scalars relating to the number of dialogs are - dependent on the presence of the dialog module. Furthermore, if the module is + <emphasis>dialog or dialog-ng</emphasis> - all scalars relating to the number of dialogs are + dependent on the presence of a dialog module. Furthermore, if the module is not loaded, then the kamailioDialogLimitMinorEvent, and kamailioDialogLimitMajorEvent alarm will be disabled. </para> @@ -243,7 +243,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id ="snmpstats.p.sipentitytape"> <title><varname>sipEntityType</varname> (String) </title> <para> @@ -275,7 +275,7 @@ modparam("snmpstats", "sipEntityType", "proxyServer") </para> </section> - <section> + <section id ="snmpstats.p.MsqQueueMinorTreshold"> <title><varname>MsgQueueMinorThreshold</varname> (Integer)</title> <para> @@ -300,7 +300,7 @@ modparam("snmpstats", "MsgQueueMinorThreshold", 2000) </para> </section> - <section> + <section id ="snmpstats.p.MsqQueueMajorTreshold"> <title><varname>MsgQueueMajorThreshold</varname> (Integer)</title> <para> @@ -325,7 +325,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000) </para> </section> - <section> + <section id ="snmpstats.p.dlg_minor_treshold"> <title><varname>dlg_minor_threshold</varname> (Integer)</title> <para> @@ -349,7 +349,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000) </para> </section> - <section> + <section id ="snmpstats.p.dlg_major_treshold"> <title><varname>dlg_major_threshold</varname> (Integer)</title> <para> @@ -373,7 +373,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000) </para> </section> - <section> + <section id ="snmpstats.p.snmpgetPath"> <title><varname>snmpgetPath</varname> (String)</title> <para> @@ -399,7 +399,7 @@ modparam("snmpstats", "snmpgetPath", "/my/custom/path/") </example> </section> - <section> + <section id ="snmpstats.p.snmpCommunity"> <title><varname>snmpCommunity</varname> (String)</title> <para> @@ -425,7 +425,7 @@ modparam("snmpstats", "snmpCommunity", "customCommunityString") </example> </section> - <section> + <section id ="snmpstats.p.export_registrar"> <title><varname>export_registrar</varname> (int)</title> <para>

11 years, 9 months

git:hpw/branch_failure_route: modules/tm: Create branch-failure event route

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: 54a98bc741daba4d0c14c587d22dddf3c01a2e30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54a98bc… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Mar 26 11:40:38 2013 +0000 modules/tm: Create branch-failure event route --- modules/tm/t_reply.c | 41 +++++++++++++---------------------------- modules/tm/t_reply.h | 1 + modules/tm/tm.c | 37 ++++++++----------------------------- 3 files changed, 22 insertions(+), 57 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 7314a21..7bf3a8f 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -173,7 +173,7 @@ char *tm_tag_suffix; /* where to go if there is no positive reply (>=300) */ static int goto_on_failure=0; /* where to go if a failure is returned on a branch */ -static int goto_on_branch_failure=0; +int goto_on_branch_failure=0; /* where to go on receipt of reply */ static int goto_on_reply=0; /* where to go on receipt of reply without transaction context */ @@ -264,20 +264,6 @@ void t_on_failure( unsigned int go_to ) } -void t_on_branch_failure( unsigned int go_to ) -{ - struct cell *t = get_t(); - - /* in REPLY_ROUTE and FAILURE_ROUTE T will be set to current transaction; - * in REQUEST_ROUTE T will be set only if the transaction was already - * created; if not -> use the static variable */ - if (!t || t==T_UNDEFINED ) - goto_on_branch_failure=go_to; - else - t->on_branch_failure = go_to; -} - - void t_on_reply( unsigned int go_to ) { struct cell *t = get_t(); @@ -1067,20 +1053,18 @@ int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl, struct sip_msg *shmem_msg = t->uas.request; int on_branch_failure; - on_branch_failure = t->uac[picked_branch].on_branch_failure; - /* failure_route for a local UAC? */ if (!shmem_msg) { LOG(L_WARN,"Warning: run_branch_failure_handlers: no UAC support (%d, %d) \n", - on_branch_failure, t->tmcb_hl.reg_types); + goto_on_branch_failure, t->tmcb_hl.reg_types); return 0; } /* don't start faking anything if we don't have to */ - if (unlikely(!on_branch_failure && !has_tran_tmcbs( t, TMCB_ON_BRANCH_FAILURE))) { + if (unlikely(!goto_on_branch_failure && !has_tran_tmcbs( t, TMCB_ON_BRANCH_FAILURE))) { LOG(L_WARN, "Warning: run_failure_handlers: no branch_failure handler (%d, %d)\n", - on_branch_failure, t->tmcb_hl.reg_types); + goto_on_branch_failure, t->tmcb_hl.reg_types); return 1; } @@ -1090,19 +1074,17 @@ int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl, } /* fake also the env. conforming to the fake msg */ faked_env( t, &faked_req); + set_route_type(BRANCH_FAILURE_ROUTE); + set_t(t, picked_branch); /* DONE with faking ;-) -> run the branch_failure handlers */ if (unlikely(has_tran_tmcbs( t, TMCB_ON_BRANCH_FAILURE)) ) { run_trans_callbacks( TMCB_ON_BRANCH_FAILURE, t, &faked_req, rpl, code); } - if (on_branch_failure) { - /* avoid recursion -- if branch_failure_route forwards, and does not - * set next branch failure route, branch_failure_route will not be reentered - * on branch failure */ - t->on_branch_failure=0; + if (goto_on_branch_failure) { if (exec_pre_script_cb(&faked_req, BRANCH_FAILURE_CB_TYPE)>0) { /* run a branch_failure_route action if some was marked */ - if (run_top_route(branch_failure_rt.rlist[on_branch_failure], &faked_req, 0)<0) + if (run_top_route(event_rt.rlist[goto_on_branch_failure], &faked_req, 0)<0) LOG(L_ERR, "ERROR: run_branch_failure_handlers: Error in run_top_route\n"); exec_post_script_cb(&faked_req, BRANCH_FAILURE_CB_TYPE); } @@ -1334,8 +1316,11 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, Trans->uac[branch].last_received=new_code; /* New branch failure route code */ - if (unlikely(has_tran_tmcbs( Trans, TMCB_ON_BRANCH_FAILURE_RO|TMCB_ON_BRANCH_FAILURE) - || Trans->uac[branch].on_branch_failure )) { + /* also append the current reply to the transaction to + * make it available in failure routes - a kind of "fake" + * save of the final reply per branch */ + Trans->uac[branch].reply = reply; + if (unlikely(Trans->uac[branch].on_branch_failure )) { extra_flags= ((Trans->uac[branch].request.flags & F_RB_TIMEOUT)? FL_TIMEOUT:0) | diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 5717a8f..a3a3c68 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -61,6 +61,7 @@ enum rps { extern char tm_tags[TOTAG_VALUE_LEN]; extern char *tm_tag_suffix; +extern int goto_on_branch_failure; extern int goto_on_sl_reply; extern int failure_reply_mode; diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 22d4156..e2790b3 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -190,7 +190,6 @@ MODULE_VERSION static int fixup_hostport2proxy(void** param, int param_no); static int fixup_proto_hostport2proxy(void** param, int param_no); static int fixup_on_failure(void** param, int param_no); -static int fixup_on_branch_failure(void** param, int param_no); static int fixup_on_reply(void** param, int param_no); static int fixup_on_branch(void** param, int param_no); static int fixup_t_reply(void** param, int param_no); @@ -273,7 +272,6 @@ inline static int w_t_forward_nonack_sctp(struct sip_msg*, char* str,char*); inline static int w_t_forward_nonack_to(struct sip_msg* msg, char* str,char*); inline static int w_t_relay_cancel(struct sip_msg *p_msg, char *_foo, char *_bar); inline static int w_t_on_failure(struct sip_msg* msg, char *go_to, char *foo); -inline static int w_t_on_branch_failure(struct sip_msg* msg, char *go_to, char *foo); inline static int w_t_on_branch(struct sip_msg* msg, char *go_to, char *foo); inline static int w_t_on_reply(struct sip_msg* msg, char *go_to, char *foo ); inline static int t_check_status(struct sip_msg* msg, char *match, char *foo); @@ -411,14 +409,12 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE}, {"t_on_failure", w_t_on_failure, 1, fixup_on_failure, REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE }, - {"t_on_branch_failure",w_t_on_branch_failure, 1, fixup_on_branch_failure, - REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE }, {"t_on_reply", w_t_on_reply, 1, fixup_on_reply, REQUEST_ROUTE | FAILURE_ROUTE | TM_ONREPLY_ROUTE | BRANCH_ROUTE }, {"t_on_branch", w_t_on_branch, 1, fixup_on_branch, REQUEST_ROUTE | FAILURE_ROUTE }, {"t_check_status", t_check_status, 1, fixup_t_check_status, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE }, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_FAILURE_ROUTE}, {"t_write_req", t_write_req, 2, fixup_t_write, REQUEST_ROUTE | FAILURE_ROUTE }, {"t_write_unix", t_write_unix, 2, fixup_t_write, @@ -605,21 +601,6 @@ static int fixup_on_failure(void** param, int param_no) } -static int fixup_on_branch_failure(void** param, int param_no) -{ - if (param_no==1){ - if(strlen((char*)*param)<=1 - && (*(char*)(*param)==0 || *(char*)(*param)=='0')) { - *param = (void*)0; - return 0; - } - return fixup_routes("t_on_branch_failure", &branch_failure_rt, param); - } - return 0; -} - - - static int fixup_on_reply(void** param, int param_no) { if (param_no==1){ @@ -751,7 +732,6 @@ static int script_init( struct sip_msg *foo, unsigned int flags, void *bar) message's t_on_failure value */ t_on_failure( 0 ); - t_on_branch_failure(0); t_on_reply(0); t_on_branch(0); /* reset the kr status */ @@ -874,6 +854,9 @@ static int mod_init(void) return -1; } + goto_on_branch_failure = route_lookup(&event_rt, "tm:branch-failure"); + if (goto_on_branch_failure >= 0 && event_rt.rlist[goto_on_branch_failure]==0) + goto_on_branch_failure = -1; /* disable */ #ifdef WITH_EVENT_LOCAL_REQUEST goto_on_local_req=route_lookup(&event_rt, "tm:local-request"); if (goto_on_local_req>=0 && event_rt.rlist[goto_on_local_req]==0) @@ -998,7 +981,10 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) } status = int2str( lowest_status , 0); break; - + case BRANCH_FAILURE_ROUTE: +#warning add the status for branch failure route + status = int2str(t->uac[get_t_branch()].last_received, 0); + break; default: LOG(L_ERR,"ERROR:t_check_status: unsupported route type %d\n", get_route_type()); @@ -1387,11 +1373,6 @@ inline static int w_t_on_failure( struct sip_msg* msg, char *go_to, char *foo) return 1; } -inline static int w_t_on_branch_failure( struct sip_msg* msg, char *go_to, char *foo) -{ - t_on_branch_failure( (unsigned int )(long) go_to ); - return 1; -} inline static int w_t_on_branch( struct sip_msg* msg, char *go_to, char *foo) { @@ -1435,7 +1416,6 @@ static int w_t_is_set(struct sip_msg* msg, char *target, char *foo ) else r = t->on_reply; break; -#warning need to add branch_failure_route } if(r) return 1; return -1; @@ -1449,7 +1429,6 @@ static int fixup_t_is_set(void** param, int param_no) if((len==13 && strncmp((char*)*param, "failure_route", 13)==0) || (len==13 && strncmp((char*)*param, "onreply_route", 13)==0) || (len==12 && strncmp((char*)*param, "branch_route", 12)==0)) { -#warning need to add branch_failure_route return 0; }

11 years, 9 months

git:hpw/branch_failure_route: modules/tm: Update t_next_contact_flows for use in branch_failure event_route

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: 76a967f1db16540257fe8a54fe85e3993060b304 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76a967f… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Mar 26 12:10:11 2013 +0000 modules/tm: Update t_next_contact_flows for use in branch_failure event_route - Rename to t_next_contact_flow as only one flow will be used - Selects and uses the next flow with the same instance_id as the failed branch --- modules/tm/t_serial.c | 261 ++++++++++++++----------------------------------- modules/tm/t_serial.h | 2 +- modules/tm/tm.c | 6 +- 3 files changed, 76 insertions(+), 193 deletions(-) diff --git a/modules/tm/t_serial.c b/modules/tm/t_serial.c index 570d02c..3a9e6de 100644 --- a/modules/tm/t_serial.c +++ b/modules/tm/t_serial.c @@ -588,7 +588,7 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) vavp = xavp_get(&ruid_name, xavp->val.v.xavp); ruid = vavp->val.v.s; - if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, 0, 0, + if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, &instance, 0, &ruid) != 1) { LM_ERR("appending branch failed\n"); free_instance_list(il); @@ -622,15 +622,17 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value) * Returns 1, if contact_flows_avp was not empty and a destination set was * successfully added. Returns -2, if contact_flows_avp was empty and thus * there was nothing to do. Returns -1 in case of an error. */ -int t_next_contact_flows(struct sip_msg* msg, char* key, char* value) +int t_next_contact_flow(struct sip_msg* msg, char* key, char* value) { str uri, dst_uri, path, instance, host, ruid; + str this_instance; + int this_branch; struct socket_info *sock; unsigned int flags; sr_xavp_t *xavp_list, *xavp, *next_xavp, *vavp; char *tmp; int port, proto; - struct instance_list *il, *ilp; + int q_dummy; /* Check if contact_flows_avp has been defined */ if (contact_flows_avp.len == 0) { @@ -640,208 +642,89 @@ int t_next_contact_flows(struct sip_msg* msg, char* key, char* value) } /* Load Request-URI and branches */ - - /* Find first contact_flows_avp value */ - xavp_list = xavp_get(&contact_flows_avp, NULL); - if (!xavp_list) { - LM_DBG("no contacts in contact_flows_avp - we are done!\n"); - return -2; - } - - xavp = xavp_list; - next_xavp = xavp_get_next(xavp); - - vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; - - vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); - if (vavp != NULL) { - dst_uri = vavp->val.v.s; - } else { - dst_uri.s = 0; - dst_uri.len = 0; - } - - vavp = xavp_get(&path_name, xavp->val.v.xavp); - if (vavp != NULL) { - path = vavp->val.v.s; - } else { - path.s = 0; - path.len = 0; - } - - vavp = xavp_get(&sock_name, xavp->val.v.xavp); - if (vavp != NULL) { - tmp = vavp->val.v.s.s; - if (parse_phostport(tmp, &host.s, &host.len, &port, &proto) != 0) { - LM_ERR("parsing of socket info <%s> failed\n", tmp); - xavp_destroy_list(&xavp_list); - return -1; + this_branch = get_t_branch(); + uri.s = get_branch(this_branch, &uri.len, &q_dummy, NULL, NULL, NULL, NULL, &this_instance); + + /* Find first contact_flows_avp value */ + xavp_list = xavp_get(&contact_flows_avp, NULL); + if (!xavp_list) { + LM_DBG("no contacts in contact_flows_avp - we are done!\n"); + return -2; } - sock = grep_sock_info(&host, (unsigned short)port, - (unsigned short)proto); - if (sock == 0) { - xavp_destroy_list(&xavp_list); - return -1; - } - } else { - sock = NULL; - } - - vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; - - vavp = xavp_get(&instance_name, xavp->val.v.xavp); - il = (struct instance_list *)0; - if ((vavp != NULL) && next_xavp) { - instance = vavp->val.v.s; - il = (struct instance_list *)pkg_malloc(sizeof(struct instance_list)); - if (!il) { - LM_ERR("no memory for instance list entry\n"); - return -1; - } - il->instance.s = pkg_malloc(instance.len); - if (!il->instance.s) { - pkg_free(il); - LM_ERR("no memory for instance list instance\n"); - return -1; - } - il->instance.len = instance.len; - memcpy(il->instance.s, instance.s, instance.len); - il->next = (struct instance_list *)0; - } - - vavp = xavp_get(&ruid_name, xavp->val.v.xavp); - ruid = vavp->val.v.s; - - /* Rewrite Request-URI */ - rewrite_uri(msg, &uri); - - if (dst_uri.len) { - set_dst_uri(msg, &dst_uri); - } else { - reset_dst_uri(msg); - } - - if (path.len) { - set_path_vector(msg, &path); - } else { - reset_path_vector(msg); - } - - set_force_socket(msg, sock); - - set_ruid(msg, &ruid); - - setbflagsval(0, flags); - /* Append branches until out of branches. */ - /* Do not include a branch that has same instance value as some */ - /* previous branch. */ + xavp = xavp_list; - xavp_rm(xavp, NULL); - xavp = next_xavp; + while (xavp) { + next_xavp = xavp_get_next(xavp); - while (xavp) { - - next_xavp = xavp_get_next(xavp); - - vavp = xavp_get(&instance_name, xavp->val.v.xavp); - if (vavp != NULL) { - instance = vavp->val.v.s; - ilp = il; - while (ilp) { - if ((instance.len == ilp->instance.len) && - (strncmp(instance.s, ilp->instance.s, instance.len) == 0)) - break; - ilp = ilp->next; - } - if (ilp) { - /* skip already appended instance */ - xavp = next_xavp; - continue; - } - if (next_xavp) { - ilp = (struct instance_list *) - pkg_malloc(sizeof(struct instance_list)); - if (!ilp) { - LM_ERR("no memory for new instance list entry\n"); - free_instance_list(il); - return -1; + vavp = xavp_get(&instance_name, xavp->val.v.xavp); + if (vavp == NULL) + { + /* Does not match this instance */ + goto next_xavp; } - ilp->instance.s = pkg_malloc(instance.len); - if (!ilp->instance.s) { - pkg_free(il); - LM_ERR("no memory for instance list instance\n"); - return -1; + else + { + instance = vavp->val.v.s; + if ((instance.len != this_instance.len) || + (strncmp(instance.s, this_instance.s, instance.len) != 0)) + /* Does not match this instance */ + goto next_xavp; } - ilp->instance.len = instance.len; - memcpy(ilp->instance.s, instance.s, instance.len); - ilp->next = il; - il = ilp; - } else { - LM_ERR("instance missing from contact_flow_avp contact\n"); - free_instance_list(il); - return -1; - } - } - vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; + vavp = xavp_get(&uri_name, xavp->val.v.xavp); + uri = vavp->val.v.s; - vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); - if (vavp != NULL) { - dst_uri = vavp->val.v.s; - } else { - dst_uri.len = 0; - } + vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); + if (vavp != NULL) { + dst_uri = vavp->val.v.s; + } else { + dst_uri.len = 0; + } - vavp = xavp_get(&path_name, xavp->val.v.xavp); - if (vavp != NULL) { - path = vavp->val.v.s; - } else { - path.len = 0; - } + vavp = xavp_get(&path_name, xavp->val.v.xavp); + if (vavp != NULL) { + path = vavp->val.v.s; + } else { + path.len = 0; + } - vavp = xavp_get(&sock_name, xavp->val.v.xavp); - if (vavp != NULL) { - tmp = vavp->val.v.s.s; - if (parse_phostport(tmp, &host.s, &host.len, &port, &proto) != 0) { - LM_ERR("parsing of socket info <%s> failed\n", tmp); - free_instance_list(il); - xavp_destroy_list(&xavp_list); - return -1; - } - sock = grep_sock_info(&host, (unsigned short)port, + vavp = xavp_get(&sock_name, xavp->val.v.xavp); + if (vavp != NULL) { + tmp = vavp->val.v.s.s; + if (parse_phostport(tmp, &host.s, &host.len, &port, &proto) != 0) { + LM_ERR("parsing of socket info <%s> failed\n", tmp); + xavp_rm(xavp, NULL); + return -1; + } + sock = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); - if (sock == 0) { - free_instance_list(il); - xavp_destroy_list(&xavp_list); - return -1; - } - } else { - sock = NULL; - } + if (sock == 0) { + xavp_rm(xavp, NULL); + return -1; + } + } else { + sock = NULL; + } - vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + vavp = xavp_get(&flags_name, xavp->val.v.xavp); + flags = vavp->val.v.i; - vavp = xavp_get(&ruid_name, xavp->val.v.xavp); - ruid = vavp->val.v.s; + vavp = xavp_get(&ruid_name, xavp->val.v.xavp); + ruid = vavp->val.v.s; - if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, 0, 0, + if (append_branch(msg, &uri, &dst_uri, &path, 0, flags, sock, &instance, 0, &ruid) != 1) { - LM_ERR("appending branch failed\n"); - free_instance_list(il); - xavp_destroy_list(&xavp_list); - return -1; - } + LM_ERR("appending branch failed\n"); + xavp_destroy_list(&xavp_list); + return -1; + } - xavp_rm(xavp, NULL); - xavp = next_xavp; - } + xavp_rm(xavp, NULL); +next_xavp: + xavp = next_xavp; + } - free_instance_list(il); - return 1; + return 1; } diff --git a/modules/tm/t_serial.h b/modules/tm/t_serial.h index b1c8181..0794e31 100644 --- a/modules/tm/t_serial.h +++ b/modules/tm/t_serial.h @@ -34,4 +34,4 @@ int t_load_contacts(struct sip_msg* msg, char* key, char* value); int t_next_contacts(struct sip_msg* msg, char* key, char* value); -int t_next_contact_flows(struct sip_msg* msg, char* key, char* value); +int t_next_contact_flow(struct sip_msg* msg, char* key, char* value); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e2790b3..782ce3f 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -475,8 +475,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE | FAILURE_ROUTE}, {"t_next_contacts", t_next_contacts, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"t_next_contact_flows", t_next_contact_flows, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, + {"t_next_contact_flow", t_next_contact_flow, 0, 0, + REQUEST_ROUTE | BRANCH_FAILURE_ROUTE}, /* not applicable from the script */ {"load_tm", (cmd_function)load_tm, NO_SCRIPT, 0, 0}, @@ -1444,7 +1444,7 @@ inline static int _w_t_relay_to(struct sip_msg *p_msg , struct cell *t; int res; - if (is_route_type(FAILURE_ROUTE)) { + if (is_route_type(FAILURE_ROUTE|BRANCH_FAILURE_ROUTE)) { t=get_t(); if (!t || t==T_UNDEFINED) { LOG(L_CRIT, "BUG: w_t_relay_to: undefined T\n");

11 years, 9 months

git:hpw/branch_failure_route: core: Add defines required for a new branch_failure_route type

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: 0b79baecf4a36a47522fd222614e370c5d044e8f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b79bae… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Mar 26 11:43:35 2013 +0000 core: Add defines required for a new branch_failure_route type --- route.h | 1 + script_cb.c | 2 +- script_cb.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/route.h b/route.h index 8f25fe3..8cdcd2a 100644 --- a/route.h +++ b/route.h @@ -53,6 +53,7 @@ #define ERROR_ROUTE (1 << 5) #define LOCAL_ROUTE (1 << 6) #define CORE_ONREPLY_ROUTE (1 << 7) +#define BRANCH_FAILURE_ROUTE (1 << 8) #define ONREPLY_ROUTE (TM_ONREPLY_ROUTE|CORE_ONREPLY_ROUTE) #define EVENT_ROUTE REQUEST_ROUTE #define ANY_ROUTE (0xFFFFFFFF) diff --git a/script_cb.c b/script_cb.c index a10df7d..fe17819 100644 --- a/script_cb.c +++ b/script_cb.c @@ -53,7 +53,7 @@ #include "mem/mem.h" /* Number of cb types = last cb type */ -#define SCRIPT_CB_NUM EVENT_CB_TYPE +#define SCRIPT_CB_NUM (MAX_CB_TYPE-1) static struct script_cb *pre_script_cb[SCRIPT_CB_NUM]; static struct script_cb *post_script_cb[SCRIPT_CB_NUM]; diff --git a/script_cb.h b/script_cb.h index af557c7..fbfbbfc 100644 --- a/script_cb.h +++ b/script_cb.h @@ -49,14 +49,14 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); */ enum script_cb_flag { REQUEST_CB=1, FAILURE_CB=2, ONREPLY_CB=4, BRANCH_CB=8, ONSEND_CB=16, ERROR_CB=32, - LOCAL_CB=64, EVENT_CB=128 }; + LOCAL_CB=64, EVENT_CB=128, BRANCH_FAILURE_CB=256 }; /* Callback types used for executing the callbacks. * Keep in sync with script_cb_flag!!! */ enum script_cb_type { REQUEST_CB_TYPE=1, FAILURE_CB_TYPE, ONREPLY_CB_TYPE, BRANCH_CB_TYPE, ONSEND_CB_TYPE, ERROR_CB_TYPE, - LOCAL_CB_TYPE, EVENT_CB_TYPE }; + LOCAL_CB_TYPE, EVENT_CB_TYPE, BRANCH_FAILURE_CB_TYPE, MAX_CB_TYPE }; struct script_cb{ cb_function *cbf;

11 years, 9 months

git:hpw/branch_failure_route: Revert "core: Initial revision of branch_failure_route"

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: 054af083489cba1d7072768734abdc5cf8ef916b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=054af08… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Mar 26 11:22:31 2013 +0000 Revert "core: Initial revision of branch_failure_route" Remove new branch_failure_route in favour of an event_route This reverts commit a5946574cb9917f0a9a90ea547c9357f3f6477bd. --- cfg.lex | 3 --- cfg.y | 24 ------------------------ route.c | 4 ---- route.h | 2 -- script_cb.c | 2 +- script_cb.h | 5 ++--- 6 files changed, 3 insertions(+), 37 deletions(-) diff --git a/cfg.lex b/cfg.lex index bafab4b..5a7ce8a 100644 --- a/cfg.lex +++ b/cfg.lex @@ -200,7 +200,6 @@ ERROR error ROUTE route ROUTE_REQUEST request_route ROUTE_FAILURE failure_route -ROUTE_BRANCH_FAILURE branch_failure_route ROUTE_REPLY reply_route ROUTE_ONREPLY onreply_route ROUTE_BRANCH branch_route @@ -624,8 +623,6 @@ IMPORTFILE "import_file" <INITIAL>{ROUTE_REPLY} { count(); yylval.strval=yytext; return ROUTE_REPLY; } <INITIAL>{ROUTE_FAILURE} { count(); yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH_FAILURE} { count(); yylval.strval=yytext; - return ROUTE_BRANCH_FAILURE; } <INITIAL>{ROUTE_BRANCH} { count(); yylval.strval=yytext; return ROUTE_BRANCH; } <INITIAL>{ROUTE_SEND} { count(); yylval.strval=yytext; return ROUTE_SEND; } <INITIAL>{ROUTE_EVENT} { count(); yylval.strval=yytext; return ROUTE_EVENT; } diff --git a/cfg.y b/cfg.y index 477991f..0c4fb5d 100644 --- a/cfg.y +++ b/cfg.y @@ -314,7 +314,6 @@ extern char *finame; %token ROUTE %token ROUTE_REQUEST %token ROUTE_FAILURE -%token ROUTE_BRANCH_FAILURE %token ROUTE_ONREPLY %token ROUTE_REPLY %token ROUTE_BRANCH @@ -706,7 +705,6 @@ statement: | module_stm | {rt=REQUEST_ROUTE;} route_stm | {rt=FAILURE_ROUTE;} failure_route_stm - | {rt=BRANCH_FAILURE_ROUTE;} branch_failure_route_stm | onreply_route_stm | {rt=BRANCH_ROUTE;} branch_route_stm | {rt=ONSEND_ROUTE;} send_route_stm @@ -1972,28 +1970,6 @@ failure_route_stm: | ROUTE_FAILURE error { yyerror("invalid failure_route statement"); } ; -branch_failure_route_stm: - ROUTE_BRANCH_FAILURE LBRACK route_name RBRACK LBRACE actions RBRACE { - #ifdef SHM_MEM - if (!shm_initialized() && init_shm()<0) { - yyerror("Can't initialize shared memory"); - YYABORT; - } - #endif /* SHM_MEM */ - i_tmp=route_get(&branch_failure_rt, $3); - if (i_tmp==-1){ - yyerror("internal error"); - YYABORT; - } - if (branch_failure_rt.rlist[i_tmp]){ - yyerror("duplicate route"); - YYABORT; - } - push($6, &branch_failure_rt.rlist[i_tmp]); - } - | ROUTE_BRANCH_FAILURE error { yyerror("invalid branch_failure_route statement"); } - ; - route_reply_main: ROUTE_ONREPLY { ; } | ROUTE_REPLY { ; } diff --git a/route.c b/route.c index 42fc496..17c1b56 100644 --- a/route.c +++ b/route.c @@ -102,7 +102,6 @@ struct route_list main_rt; struct route_list onreply_rt; struct route_list failure_rt; -struct route_list branch_failure_rt; struct route_list branch_rt; struct route_list onsend_rt; struct route_list event_rt; @@ -143,7 +142,6 @@ void destroy_routes() destroy_rlist(&main_rt); destroy_rlist(&onreply_rt); destroy_rlist(&failure_rt); - destroy_rlist(&branch_failure_rt); destroy_rlist(&branch_rt); destroy_rlist(&event_rt); } @@ -212,8 +210,6 @@ int init_routes() goto error; if (init_rlist("failure", &failure_rt, FAILURE_RT_NO, RT_HASH_SIZE)<0) goto error; - if (init_rlist("branch_failure", &branch_failure_rt, FAILURE_RT_NO, RT_HASH_SIZE)<0) - goto error; if (init_rlist("branch", &branch_rt, BRANCH_RT_NO, RT_HASH_SIZE)<0) goto error; if (init_rlist("on_send", &onsend_rt, ONSEND_RT_NO, RT_HASH_SIZE)<0) diff --git a/route.h b/route.h index f824c0e..8f25fe3 100644 --- a/route.h +++ b/route.h @@ -53,7 +53,6 @@ #define ERROR_ROUTE (1 << 5) #define LOCAL_ROUTE (1 << 6) #define CORE_ONREPLY_ROUTE (1 << 7) -#define BRANCH_FAILURE_ROUTE (1 << 8) #define ONREPLY_ROUTE (TM_ONREPLY_ROUTE|CORE_ONREPLY_ROUTE) #define EVENT_ROUTE REQUEST_ROUTE #define ANY_ROUTE (0xFFFFFFFF) @@ -86,7 +85,6 @@ extern struct route_list main_rt; /* main reply route table */ extern struct route_list onreply_rt; extern struct route_list failure_rt; -extern struct route_list branch_failure_rt; extern struct route_list branch_rt; extern struct route_list onsend_rt; extern struct route_list event_rt; diff --git a/script_cb.c b/script_cb.c index 27156e2..a10df7d 100644 --- a/script_cb.c +++ b/script_cb.c @@ -53,7 +53,7 @@ #include "mem/mem.h" /* Number of cb types = last cb type */ -#define SCRIPT_CB_NUM (CB_TYPE_MAX-1) +#define SCRIPT_CB_NUM EVENT_CB_TYPE static struct script_cb *pre_script_cb[SCRIPT_CB_NUM]; static struct script_cb *post_script_cb[SCRIPT_CB_NUM]; diff --git a/script_cb.h b/script_cb.h index 596a503..af557c7 100644 --- a/script_cb.h +++ b/script_cb.h @@ -49,15 +49,14 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); */ enum script_cb_flag { REQUEST_CB=1, FAILURE_CB=2, ONREPLY_CB=4, BRANCH_CB=8, ONSEND_CB=16, ERROR_CB=32, - LOCAL_CB=64, EVENT_CB=128, BRANCH_FAILURE_CB=256 }; + LOCAL_CB=64, EVENT_CB=128 }; /* Callback types used for executing the callbacks. * Keep in sync with script_cb_flag!!! */ enum script_cb_type { REQUEST_CB_TYPE=1, FAILURE_CB_TYPE, ONREPLY_CB_TYPE, BRANCH_CB_TYPE, ONSEND_CB_TYPE, ERROR_CB_TYPE, - LOCAL_CB_TYPE, EVENT_CB_TYPE, BRANCH_FAILURE_CB_TYPE, - CB_TYPE_MAX}; + LOCAL_CB_TYPE, EVENT_CB_TYPE }; struct script_cb{ cb_function *cbf;

11 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013