sr-dev

sr-dev@lists.kamailio.org

4 participants
44157 discussions

git:ser_core_cvs: tcp: stats: added init & destroy macros

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 0dc023ec75c4331492f7d845bc445deb00ac4d9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0dc023e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 10 10:24:40 2009 +0000 tcp: stats: added init & destroy macros --- tcp_main.c | 2 ++ tcp_stats.h | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 5e08810..6f7271a 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3972,6 +3972,7 @@ void destroy_tcp() shm_free(tcpconn_id_hash); tcpconn_id_hash=0; } + DESTROY_TCP_STATS(); if (tcp_connections_no){ shm_free(tcp_connections_no); tcp_connections_no=0; @@ -4032,6 +4033,7 @@ int init_tcp() goto error; } *tcp_connections_no=0; + if (INIT_TCP_STATS()!=0) goto error; connection_id=shm_malloc(sizeof(int)); if (connection_id==0){ LOG(L_CRIT, "ERROR: init_tcp: could not alloc globals\n"); diff --git a/tcp_stats.h b/tcp_stats.h index 790518e..67c1ddc 100644 --- a/tcp_stats.h +++ b/tcp_stats.h @@ -27,6 +27,26 @@ #ifndef __tcp_stats_h #define __tcp_stats_h +#ifndef USE_TCP_STATS + +#define INIT_TCP_STATS() 0 /* success */ +#define DESTROY_TCP_STATS() + +#define TCP_STATS_ESTABLISHED(state) +#define TCP_STATS_CONNECT_FAILED() +#define TCP_STATS_LOCAL_REJECT() +#define TCP_STATS_CON_TIMEOUT() +#define TCP_STATS_CON_RESET() +#define TCP_STATS_SEND_TIMEOUT() +#define TCP_STATS_SENDQ_FULL() + +#else /* USE_TCP_STATS */ + +#define INIT_TCP_STATS() 0 /* success */ + +#define DESTROY_TCP_STATS() + + /** called each time a new tcp connection is established. * @param state - S_CONN_ACCEPT if it was the result of an accept() * - S_CONN_CONNECT if it was the result of a connect() @@ -65,7 +85,7 @@ */ #define TCP_STATS_SENDQ_FULL() - +#endif /* USE_TCP_STATS */ #endif /*__tcp_stats_h*/

15 years, 8 months

git:ser_core_cvs: tcp: minor stats fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 30745c9ddee5506dc09f7c1f57a05114e9cff257 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30745c9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 10 10:23:14 2009 +0000 tcp: minor stats fixes Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- tcp_main.c | 94 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 49 insertions(+), 45 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 28c5242..5e08810 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -506,49 +506,7 @@ again: else goto error_timeout; } if (errno!=EINPROGRESS && errno!=EALREADY){ - switch(errno){ - case ENETUNREACH: - case EHOSTUNREACH: -#ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist)) - dst_blacklist_su(BLST_ERR_CONNECT, type, - (union sockaddr_union*)servaddr, 0); -#endif /* USE_DST_BLACKLIST */ - TCP_EV_CONNECT_UNREACHABLE(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - case ETIMEDOUT: -#ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist)) - dst_blacklist_su(BLST_ERR_CONNECT, type, - (union sockaddr_union*)servaddr, 0); -#endif /* USE_DST_BLACKLIST */ - TCP_EV_CONNECT_TIMEOUT(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - case ECONNREFUSED: - case ECONNRESET: -#ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist)) - dst_blacklist_su(BLST_ERR_CONNECT, type, - (union sockaddr_union*)servaddr, 0); -#endif /* USE_DST_BLACKLIST */ - TCP_EV_CONNECT_RST(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - case EAGAIN: /* not posix, but supported on linux and bsd */ - TCP_EV_CONNECT_NO_MORE_PORTS(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - break; - default: - TCP_EV_CONNECT_ERR(errno, 0, 0, - (union sockaddr_union*)servaddr, type); - } - TCP_STATS_CONNECT_FAILED(); - LOG(L_ERR, "ERROR: tcp_blocking_connect %s: (%d) %s\n", - su2a((union sockaddr_union*)servaddr, addrlen), - errno, strerror(errno)); - goto error; + goto error_errno; } }else goto end; @@ -602,10 +560,54 @@ again: "%s\n", su2a((union sockaddr_union*)servaddr, addrlen), err, strerror(err)); - goto error; + errno=err; + goto error_errno; } } } +error_errno: + switch(errno){ + case ENETUNREACH: + case EHOSTUNREACH: +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_CONNECT, type, + (union sockaddr_union*)servaddr, 0); +#endif /* USE_DST_BLACKLIST */ + TCP_EV_CONNECT_UNREACHABLE(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + case ETIMEDOUT: +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_CONNECT, type, + (union sockaddr_union*)servaddr, 0); +#endif /* USE_DST_BLACKLIST */ + TCP_EV_CONNECT_TIMEOUT(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + case ECONNREFUSED: + case ECONNRESET: +#ifdef USE_DST_BLACKLIST + if (cfg_get(core, core_cfg, use_dst_blacklist)) + dst_blacklist_su(BLST_ERR_CONNECT, type, + (union sockaddr_union*)servaddr, 0); +#endif /* USE_DST_BLACKLIST */ + TCP_EV_CONNECT_RST(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + case EAGAIN: /* not posix, but supported on linux and bsd */ + TCP_EV_CONNECT_NO_MORE_PORTS(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + break; + default: + TCP_EV_CONNECT_ERR(errno, 0, 0, + (union sockaddr_union*)servaddr, type); + } + LOG(L_ERR, "ERROR: tcp_blocking_connect %s: (%d) %s\n", + su2a((union sockaddr_union*)servaddr, addrlen), + errno, strerror(errno)); + goto error; error_timeout: /* timeout */ #ifdef USE_DST_BLACKLIST @@ -614,11 +616,11 @@ error_timeout: (union sockaddr_union*)servaddr, 0); #endif /* USE_DST_BLACKLIST */ TCP_EV_CONNECT_TIMEOUT(0, 0, 0, (union sockaddr_union*)servaddr, type); - TCP_STATS_CONNECT_FAILED(); LOG(L_ERR, "ERROR: tcp_blocking_connect %s: timeout %d s elapsed " "from %d s\n", su2a((union sockaddr_union*)servaddr, addrlen), elapsed, cfg_get(tcp, tcp_cfg, connect_timeout_s)); error: + TCP_STATS_CONNECT_FAILED(); return -1; end: return 0; @@ -963,6 +965,8 @@ again: else if (errno!=EAGAIN && errno!=EWOULDBLOCK){ LOG(L_ERR, "tcp_blocking_write: failed to send: (%d) %s\n", errno, strerror(errno)); + TCP_EV_SEND_TIMEOUT(errno, &c->rcv); + TCP_STATS_SEND_TIMEOUT(); goto error; } }else if (n<len){

15 years, 8 months

git:ser_core_cvs: tcp: tcp_blocking_connect timeout fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 98d282a690331cb2f1bcd97f32d307f71290e752 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98d282a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 10 10:26:01 2009 +0000 tcp: tcp_blocking_connect timeout fix - tcp_blocking_connect timeout might have elapsed sooner then configured due to a bug in the way it was checked in the code. (affects tcp only in the old non-async mode) Author: Libor Chocholaty <libor(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- tcp_main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 6f7271a..4f93154 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -520,17 +520,15 @@ again: #endif while(1){ elapsed=(get_ticks()-ticks)*TIMER_TICK; - if (elapsed<to) - to-=elapsed; - else + if (elapsed>=to) goto error_timeout; #if defined(HAVE_SELECT) && defined(BLOCKING_USE_SELECT) sel_set=orig_set; - timeout.tv_sec=to; + timeout.tv_sec=to-elapsed; timeout.tv_usec=0; n=select(fd+1, 0, &sel_set, 0, &timeout); #else - n=poll(&pf, 1, to*1000); + n=poll(&pf, 1, (to-elapsed)*1000); #endif if (n<0){ if (errno==EINTR) continue;

15 years, 8 months

git:ser_core_cvs: Safety check added to verify whether the static buffers have

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: d1e2ffe61fb19810e7fc9bf23b21b8580cc6c696 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1e2ffe… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Apr 7 09:07:48 2009 +0000 Safety check added to verify whether the static buffers have been initialized. --- select_buf.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/select_buf.c b/select_buf.c index 1037391..3a6ae24 100644 --- a/select_buf.c +++ b/select_buf.c @@ -105,6 +105,15 @@ static int allocate_buffer(int req_size) { char* get_static_buffer(int req_size) { char *p = NULL; + +#ifdef EXTRA_DEBUG + if ((active_buffer < 0) || (active_buffer > MAX_BUFFERS-1)) { + LOG(L_CRIT, "BUG: buffers have not been initialized yet. " + "Call reset_static_buffer() before executing " + "a route block.\n"); + abort(); + } +#endif if ((buffer[active_buffer].size >= buffer[active_buffer].offset + req_size) || (allocate_buffer(req_size))) { /* enough space in current buffer or allocation successful */

15 years, 8 months

git:ser_core_cvs: Do not try to backlist and do not try DNS failover for blind UACs as

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 5525e5ccad77fb277be594a88e09e9ea19daf30e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5525e5c… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Apr 8 11:44:23 2009 +0000 Do not try to backlist and do not try DNS failover for blind UACs as they do not have a destination address. --- modules/tm/timer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tm/timer.c b/modules/tm/timer.c index a4ff7e5..0c0139a 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -449,7 +449,9 @@ inline static void final_response_handler( struct retr_buf* r_buf, DBG("DEBUG: final_response_handler:stop retr. and send CANCEL (%p)\n", t); #endif if ((r_buf->branch < MAX_BRANCHES) && /* r_buf->branch is always >=0 */ - (t->uac[r_buf->branch].last_received==0)){ + (t->uac[r_buf->branch].last_received==0) && + (t->uac[r_buf->branch].request.buffer!=NULL) /* not a blind UAC */ + ){ /* no reply received */ #ifdef USE_DST_BLACKLIST if (cfg_get(core, core_cfg, use_dst_blacklist)

15 years, 8 months

git:ser_core_cvs: tcp: helper internal macros

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: f73a84d57949101a9d0842d049fe7aab71d8613b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f73a84d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 9 19:10:31 2009 +0000 tcp: helper internal macros - helper macros for getting the local address & port, the peer address & port, the protocol and the compression from a tcp connection structure pointer. --- tcp_conn.h | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index 7ae829d..9db6308 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -188,6 +188,31 @@ struct tcp_connection{ }; +/* helper macros */ + +#define TCP_RCV_INFO(c) (&(c)->rcv) + +#define TCP_RCV_LADDR(r) (&((r).dst_ip)) +#define TCP_RCV_LPORT(r) ((r).dst_port) +#define TCP_RCV_PADDR(r) (&((r).src_ip)) +#define TCP_RCV_PPORT(r) ((r).src_port) +#define TCP_RCV_PSU(r) (&(r).src_su) +#define TCP_RCV_SOCK_INFO(r) ((r).bind_address) +#define TCP_RCV_PROTO(r) ((r).proto) +#ifdef USE_COMP +#define TCP_RCV_COMP(r) ((r).comp) +#else +#define TCP_RCV_COMP(r) 0 +#endif /* USE_COMP */ + +#define TCP_LADDR(c) TCP_RCV_LADDR(c->rcv) +#define TCP_LPORT(c) TCP_RCV_LPORT(c->rcv) +#define TCP_PADDR(c) TCP_RCV_PADDR(c->rcv) +#define TCP_PPORT(c) TCP_RCV_PPORT(c->rcv) +#define TCP_PSU(c) TCP_RCV_PSU(c->rcv) +#define TCP_SOCK_INFO(c) TCP_RCV_SOCK_INFO(c->rcv) +#define TCP_PROTO(c) TCP_RCV_PROTO(c->rcv) +#define TCP_COMP(c) TCP_RCV_COMP(c->rcv)

15 years, 8 months

git:master: port doc changes from kamailio 1.5 branch, r5794

by Henning Westerholt

Module: sip-router Branch: master Commit: 5bad9d33802f87be1fbce04b0f24b4aedf6c606c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bad9d3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 16 12:51:18 2009 +0200 port doc changes from kamailio 1.5 branch, r5794 --- modules/carrierroute/README | 8 ++++---- modules/carrierroute/doc/carrierroute_admin.xml | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/carrierroute/README b/modules/carrierroute/README index 67fbb2b..475138a 100644 --- a/modules/carrierroute/README +++ b/modules/carrierroute/README @@ -227,10 +227,10 @@ Chapter 1. Admin Guide is better to pass only IDs in AVPs to the routing functions. Basically this module could be used as an replacement for the - lcr and the dispatcher module, if you have certain performance, - flexibility and/or integration requirements that these modules - don't handle properly. But for small installations it probably - make more sense to use the lcr and dispatcher module. + lcr and the dispatcher module, if you have certain flexibility, + integration and/or performance requirements that can't be + satisfied with these modules. But for smaller installations it + probably make more sense to use the lcr and dispatcher module. If you want to use this module in failure routes, then you need to call "append_branch()" after rewriting the request URI in diff --git a/modules/carrierroute/doc/carrierroute_admin.xml b/modules/carrierroute/doc/carrierroute_admin.xml index d115478..317a54e 100644 --- a/modules/carrierroute/doc/carrierroute_admin.xml +++ b/modules/carrierroute/doc/carrierroute_admin.xml @@ -53,11 +53,10 @@ AVPs to the routing functions. </para> <para> - Basically this module could be used as an replacement for the lcr and the - dispatcher module, if you have certain performance, flexibility and/or - integration requirements that these modules don't handle properly. But for - small installations it probably make more sense to use the lcr and dispatcher - module. + Basically this module could be used as an replacement for the lcr and the + dispatcher module, if you have certain flexibility, integration and/or performance + requirements that can't be satisfied with these modules. But for smaller + installations it probably make more sense to use the lcr and dispatcher module. </para> <para> If you want to use this module in failure routes, then you need to call

15 years, 8 months

git:master: core: path_vec added to sip_msg structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d752afff9924e66da382a9dea48984761ad52b7f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d752aff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 16 12:14:37 2009 +0200 core: path_vec added to sip_msg structure - basic path support in core (not yet for request forwarding functions) --- parser/msg_parser.c | 27 +++++++++++++++++++++++++++ parser/msg_parser.h | 2 ++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 23201c5..5132112 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -698,6 +698,7 @@ void free_sip_msg(struct sip_msg* msg) { if (msg->new_uri.s) { pkg_free(msg->new_uri.s); msg->new_uri.len=0; } if (msg->dst_uri.s) { pkg_free(msg->dst_uri.s); msg->dst_uri.len=0; } + if (msg->path_vec.s) { pkg_free(msg->path_vec.s); msg->path_vec.len=0; } if (msg->headers) free_hdr_field_lst(msg->headers); if (msg->body && msg->body->free) msg->body->free(&msg->body); if (msg->add_rm) free_lump_list(msg->add_rm); @@ -750,6 +751,32 @@ void reset_dst_uri(struct sip_msg* msg) msg->dst_uri.len = 0; } +int set_path_vector(struct sip_msg* msg, str* path) +{ + char* ptr; + + if (!msg || !path) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { + memcpy(msg->path_vec.s, path->s, path->len); + msg->path_vec.len = path->len; + } else { + ptr = (char*)pkg_malloc(path->len); + if (!ptr) { + LM_ERR("not enough pkg memory\n"); + return -1; + } + + memcpy(ptr, path->s, path->len); + if (msg->path_vec.s) pkg_free(msg->path_vec.s); + msg->path_vec.s = ptr; + msg->path_vec.len = path->len; + } + return 0; +} struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht) { diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 8624035..dd1b327 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -328,6 +328,7 @@ typedef struct sip_msg { str set_global_port; struct socket_info* force_send_socket; /* force sending on this socket, if ser */ + str path_vec; } sip_msg_t; /* pointer to a fakes message which was never received ; @@ -437,4 +438,5 @@ void reset_dst_uri(struct sip_msg* msg); struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht); struct hdr_field* next_sibling_hdr(struct hdr_field *hf); +int set_path_vector(struct sip_msg* msg, str* path); #endif

15 years, 8 months

kamailio-3.0 git repository is gone

by Jan Janak

Hello, The temporary kamailio-3.0 git repository is gone. The repository was used to keep patches that made kamailio modules work with the sip-router core. All the patches are now integrated directly into the shared sip-router repository and thus the temporary kamailio-3.0 repository is no longer needed. Jan.

15 years, 8 months

git:master: makefile: fix install-man

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 89fd860c7b1ac4147e2ff56d3d479d6600fdc848 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89fd860… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 22:37:56 2009 +0200 makefile: fix install-man - fixed source path when installing modules man pages --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 89a5e10..3ad22d9 100644 --- a/Makefile +++ b/Makefile @@ -541,7 +541,7 @@ install-$(1)-man: $(1)-man $(man_prefix)/$(man_dir)/man7 $$(call try_err,\ $(INSTALL_TOUCH) $(man_prefix)/$(man_dir)/man7/"$$$$r".7 );\ $$(call try_err,\ - $(INSTALL_MAN) modules/"$$$$r"/"$$$$r".7 \ + $(INSTALL_MAN) $(1)/"$$$$r"/"$$$$r".7 \ $(man_prefix)/$(man_dir)/man7 ); \ fi ; \ fi ; \

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev