sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:master: snmpstats Add a few more TCP connection settings

by Olle E. Johansson

Module: sip-router Branch: master Commit: 57bb2450a5b0db4c18dd139ae3ae28f480b379c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57bb245… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Mar 28 21:30:57 2013 +0100 snmpstats Add a few more TCP connection settings --- modules/snmpstats/kamailioNet.c | 113 +++++++++++++++++++++++++++++++--- modules/snmpstats/kamailioNet.h | 3 + modules/snmpstats/mibs/KAMAILIO-MIB | 44 +++++++++++--- 3 files changed, 142 insertions(+), 18 deletions(-) diff --git a/modules/snmpstats/kamailioNet.c b/modules/snmpstats/kamailioNet.c index efac0b9..76b87c3 100644 --- a/modules/snmpstats/kamailioNet.c +++ b/modules/snmpstats/kamailioNet.c @@ -64,6 +64,9 @@ init_kamailioNet(void) 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 }; + const oid kamailioNetTcpConnTimeout_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,3,4 }; + const oid kamailioNetTcpSendTimeout_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,3,5 }; + const oid kamailioNetTcpConnLifetime_oid[] = { 1,3,6,1,4,1,34352,3,1,3,1,4,1,3,6 }; DEBUGMSGTL(("kamailioNet", "Initializing\n")); @@ -117,18 +120,23 @@ init_kamailioNet(void) kamailioNetTcpAsync_oid, OID_LENGTH(kamailioNetTcpAsync_oid), HANDLER_CAN_RONLY )); + netsnmp_register_scalar( + netsnmp_create_handler_registration("kamailioNetTcpConnTimeout", handle_kamailioNetTcpConnTimeout, + kamailioNetTcpConnTimeout_oid, OID_LENGTH(kamailioNetTcpConnTimeout_oid), + HANDLER_CAN_RONLY + )); + netsnmp_register_scalar( + netsnmp_create_handler_registration("kamailioNetTcpSendTimeout", handle_kamailioNetTcpSendTimeout, + kamailioNetTcpSendTimeout_oid, OID_LENGTH(kamailioNetTcpSendTimeout_oid), + HANDLER_CAN_RONLY + )); + netsnmp_register_scalar( + netsnmp_create_handler_registration("kamailioNetTcpConnLifetime", handle_kamailioNetTcpConnLifetime, + kamailioNetTcpConnLifetime_oid, OID_LENGTH(kamailioNetTcpConnLifetime_oid), + HANDLER_CAN_RONLY + )); } -#ifdef SKREP - con_timeout: 0 - connect_success: 0 - current_write_queue_size: 0 - local_reject: 0 - passive_open: 0 - send_timeout: 0 - sendq_full: 0 -#endif - int handle_kamailioNetTcpConnEstablished(netsnmp_mib_handler *handler, netsnmp_handler_registration *reginfo, @@ -400,3 +408,88 @@ handle_kamailioNetTcpAsync(netsnmp_mib_handler *handler, return SNMP_ERR_NOERROR; } + +int +handle_kamailioNetTcpConnTimeout(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.connect_timeout_s; + + 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_kamailioNetTcpConnTimeout\n", reqinfo->mode ); + return SNMP_ERR_GENERR; + } + + return SNMP_ERR_NOERROR; +} +int +handle_kamailioNetTcpSendTimeout(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.send_timeout; + + 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_kamailioNetTcpSendTimeout\n", reqinfo->mode ); + return SNMP_ERR_GENERR; + } + + return SNMP_ERR_NOERROR; +} +int +handle_kamailioNetTcpConnLifetime(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.con_lifetime; + + 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_kamailioNetTcpConnLifetime\n", reqinfo->mode ); + return SNMP_ERR_GENERR; + } + + return SNMP_ERR_NOERROR; +} diff --git a/modules/snmpstats/kamailioNet.h b/modules/snmpstats/kamailioNet.h index f037b3b..9690b3a 100644 --- a/modules/snmpstats/kamailioNet.h +++ b/modules/snmpstats/kamailioNet.h @@ -17,5 +17,8 @@ Netsnmp_Node_Handler handle_kamailioNetTcpConnReject; Netsnmp_Node_Handler handle_kamailioNetTcpEnabled; Netsnmp_Node_Handler handle_kamailioNetTcpMaxConns; Netsnmp_Node_Handler handle_kamailioNetTcpAsync; +Netsnmp_Node_Handler handle_kamailioNetTcpConnTimeout; +Netsnmp_Node_Handler handle_kamailioNetTcpSendTimeout; +Netsnmp_Node_Handler handle_kamailioNetTcpConnLifetime; #endif /* KAMAILIONET_H */ diff --git a/modules/snmpstats/mibs/KAMAILIO-MIB b/modules/snmpstats/mibs/KAMAILIO-MIB index 96bc9e9..0b896e0 100644 --- a/modules/snmpstats/mibs/KAMAILIO-MIB +++ b/modules/snmpstats/mibs/KAMAILIO-MIB @@ -318,7 +318,7 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN MAX-ACCESS read-only STATUS current DESCRIPTION - "Maximum number of TCP connections (configurable)" + "Maximum number of TCP connections (tcp_max_connections)" ::= { kamailioNetTcpConfig 2 } kamailioNetTcpAsync OBJECT-TYPE @@ -326,13 +326,41 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN MAX-ACCESS read-only STATUS current DESCRIPTION - "True if TCP Async is enabled in this server." + "True if TCP Async is enabled in this server (tcp_async)" ::= { kamailioNetTcpConfig 3 } - --- connect_timeout: 10 - --- send_timeout: 10 - --- connection_lifetime: 120 - --- max_connections(soft): 2048 + kamailioNetTcpConnTimeout OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "TCP Connection Timeout (tcp_connect_timeout)" + ::= { kamailioNetTcpConfig 4 } + + kamailioNetTcpSendTimeout OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Time in seconds after a TCP connection will be closed if it is not available for writing in this interval (tcp_send_timeout)" + ::= { kamailioNetTcpConfig 5 } + + kamailioNetTcpConnLifetime OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Lifetime in seconds for TCP sessions (tcp_connection_lifetime)" + ::= { kamailioNetTcpConfig 6 } + + kamailioNetTcpConnLifetime OBJECT-TYPE + SYNTAX Integer32 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Maximum number of tcp connections (tcp_max_connections)" + ::= { kamailioNetTcpConfig 7 } + --- max_tls_connections(soft): 2048 --- no_connect: 0 --- fd_cache: 1 @@ -388,12 +416,12 @@ KAMAILIO-MIB DEFINITIONS ::= BEGIN "Number of successful TCP connections" ::= { kamailioNetTcpStat 4 } - kamailioNetTcpConnOpened OBJECT-TYPE + kamailioNetTcpConnOpen OBJECT-TYPE SYNTAX Gauge32 MAX-ACCESS read-only STATUS current DESCRIPTION - "Number of current opened TCP connections" + "Number of current open TCP connections" ::= { kamailioNetTcpStat 5 } kamailioNetTcpConnPassiveOpen OBJECT-TYPE

11 years, 8 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) ---------- "At least there is inconsistency between documented behavior and database query for this matching mode." I'm confused. From what I read the documentation does not agree with the database query. We're using matching_mode=2. The docs say the following about matching_mode 2: "2 - CONTACT and PATH based matching algorithm. This mode is like mode 0 but allows for duplicate contacts from differing paths. If no path is available, it defaults to mode 0." Only matching_mode=1 uses call-ID according to the documentation. I'm looking at this: http://kamailio.org/docs/modules/3.3.x/modules_k/usrloc.html#matching-mode ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278#comment803 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, 8 months

SIP-I ?

by Javi Gallart

Hi list this may sound like and old ugly topic, but at the end of the day most of the traffic still starts/terminates in TDM networks. For those not familiar with it, the IPX (http://en.wikipedia.org/wiki/IP_exchange) mandates the usage of SIP-I between operators for transporting the call information over SIP. Kamailio is the core component of our infrastructure, and in order to route traffic between these kind of operators we might need to "understand" somehow SIP-I. So this is more or less like an open question: do you think it makes sense to write a kamailio module for decoding/encoding ISUP/MAP traffic, or do you think it fits better in another type of equipment closer to the "TDM border" (Yate, Freeswitch,...). Thanks in advance Javi

11 years, 8 months

git:hpw/branch_failure_route: modules/tm: Initial revision of branch_failure_route

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: 4e0cf550f75835b3f97bda9bb7934389a54b1f18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e0cf55… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Mar 19 15:41:55 2013 +0000 modules/tm: Initial revision of branch_failure_route - New branch_failure_route defined - cfg route is called but xlog() causes segfault --- modules/tm/h_table.h | 4 ++ modules/tm/t_fwd.c | 1 + modules/tm/t_hooks.h | 6 +++- modules/tm/t_lookup.c | 1 + modules/tm/t_reply.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ modules/tm/t_reply.h | 7 ++++ modules/tm/tm.c | 27 ++++++++++++++ modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 2 + 9 files changed, 145 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4e0…

11 years, 8 months

git:hpw/branch_failure_route: modules/tm: Fix setting instance in uac branches

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: 1d8597f99b43154c1a078ade47984e6faf9f149c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d8597f… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Mar 28 09:48:04 2013 +0000 modules/tm: Fix setting instance in uac branches --- modules/tm/t_fwd.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index f463db9..e070518 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -304,7 +304,7 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, can change/update msg->instance */ if (instance==&i_req->instance) instance=&instance_bak; - /* zero it first so that set_instancetor will work */ + /* zero it first so that set_instance will work */ i_req->instance.s=0; i_req->instance.len=0; if (unlikely(instance)){ @@ -419,6 +419,13 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, i_req->path_vec.s=0; i_req->path_vec.len=0; } + if (unlikely(instance && (i_req->instance.s!=instance->s || + i_req->instance.len!=instance->len))){ + i_req->instance=*instance; + }else if (unlikely(instance==0 && i_req->instance.len!=0)){ + i_req->instance.s=0; + i_req->instance.len=0; + } } if (likely(next_hop!=0 || (flags & UAC_DNS_FAILOVER_F))){

11 years, 8 months

git:hpw/branch_failure_route: Merge branch 'master' into hpw/ branch_failure_route

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: 464ce5d71d738f706f0d4a26573444809496068e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=464ce5d… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Mar 28 10:00:05 2013 +0000 Merge branch 'master' into hpw/branch_failure_route * master: (33 commits) core: set TOS for IPv6 UDP sockets rtpproxy: add missing wrapper function for unforce_rtp_proxy modules/outbound: further improvement to the use_outbound() check rtpproxy: support pvars in function parameters modules/rr: copy the flow-token for "incoming" messages when using outbound modules/outbound: improved check for outbound modules/rr: only use flow-token for routing if it doesn't point to the source of the request pkg/kamailio/(centos|fedora): Updated .spec after addition of cnxcc module Makefile.groups: cnxcc module added to extra list core: auto-define cfg directive MOD_modname for each loaded module snmpstats Add tcpasync and tcpmaxconns snmpstats Add IDs to sections in documentation cnxcc: added new module for credit control snmpstats activate new parts of the KAMAILIO-MIB snmpstats Add information about version and tcp connections usrloc: new option for db_mode - DB_READONLY (4) enum: define the max size for numbers db_mysql: new module parameter - insert_delayed Makefile: exclude debian sym link when generating tarball msrp: fix compile warning of argument type in dbg message ... ---

11 years, 8 months

[tracker] Comment added: app_lua: add rpc reload command (Attachment added)

by sip-router

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 - Víctor Seva (linuxmaniac) ---------- I've removed the lock for sr_lua_script_ver->len I've created a new parameter "reload" to activate/deactivate the reloading mechanism. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=270#comment802 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, 8 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 - Daniel-Constantin Mierla (miconda) ---------- OK, I will check the code. At least there is inconsistency between documented behavior and database query for this matching mode. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=278#comment801 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, 8 months

[tracker] Comment added: global variable "TOS" is not supported for IPv6 packets

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#279 - global variable "TOS" is not supported for IPv6 packets User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you try with commit: - http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=084be45… It compiles but had no option to test. For now is done to UDP sockets, if works then I will propagate to tcp/sctp and backport. Are the TOS values supposed to be different for IPv4/IPv6? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=279#comment800 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, 8 months

git:master: core: set TOS for IPv6 UDP sockets

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 084be456bc0fab015cf9964ac85651fa60ea77c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=084be45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 27 20:53:00 2013 +0100 core: set TOS for IPv6 UDP sockets - reported by Klaus Feichtinger, FS#179 --- udp_server.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/udp_server.c b/udp_server.c index 3889a65..d4efe13 100644 --- a/udp_server.c +++ b/udp_server.c @@ -321,11 +321,24 @@ int udp_init(struct socket_info* sock_info) } /* tos */ optval = tos; - if (setsockopt(sock_info->socket, IPPROTO_IP, IP_TOS, (void*)&optval, - sizeof(optval)) ==-1){ - LOG(L_WARN, "WARNING: udp_init: setsockopt tos: %s\n", strerror(errno)); - /* continue since this is not critical */ + if (addr->s.sa_family==AF_INET){ + if (setsockopt(sock_info->socket, IPPROTO_IP, IP_TOS, (void*)&optval, + sizeof(optval)) ==-1){ + LOG(L_WARN, "WARNING: udp_init: setsockopt tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#ifdef USE_IPV6 + } else if (addr->s.sa_family==AF_INET6){ + if (setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_TCLASS, + (void*)&optval, sizeof(optval)) ==-1) { + LOG(L_WARN, "WARNING: udp_init: setsockopt v6 tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#endif } + #if defined (__OS_linux) && defined(UDP_ERRORS) optval=1; /* enable error receiving on unconnected sockets */

11 years, 8 months

← Newer
1
...
7
8
9
10
11
12
13
...
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