sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

by Daniel-Constantin Mierla

Hello, you can find guidelines to write the commit message at: http://sip-router.org/wiki/devel/git-commit-guidelines The goal is to get to kind of common format to make life easier for tracking changes and building summaries out of the logs. Please add if you think something should be there in the commit messages. Thanks, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 7 months

git:master: port from kamailio 1.5 branch r5795, related to bug #2416621

by Henning Westerholt

Module: sip-router Branch: master Commit: 4ae3936acf4cf24fd28abcf46826277cb85c3a8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ae3936… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 16 14:11:04 2009 +0200 port from kamailio 1.5 branch r5795, related to bug #2416621 --- modules_k/nat_traversal/nat_traversal.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 86e2731..dfe7e4d 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1,6 +1,6 @@ /* $Id$ * - * Copyright (C) 2007-2008 Dan Pascu + * Copyright (C) 2007-2009 Dan Pascu * * This file is part of Kamailio, a free SIP server. * @@ -1406,23 +1406,26 @@ NAT_Keepalive(struct sip_msg *msg) static int FixContact(struct sip_msg *msg) { - str before_host, after; + str before_host, after, newip; + unsigned short port, newport; contact_t* contact; struct lump* anchor; struct sip_uri uri; - char *newip, *buf; - int len, newiplen, offset; + int len, offset; + char *buf; if (!get_contact_uri(msg, &uri, &contact)) return -1; - newip = ip_addr2a(&msg->rcv.src_ip); - newiplen = strlen(newip); + newip.s = ip_addr2a(&msg->rcv.src_ip); + newip.len = strlen(newip.s); + newport = msg->rcv.src_port; - // Don't do anything if the IP's are the same, just return success. - if (newiplen==uri.host.len && memcmp(uri.host.s, newip, newiplen)==0) { + port = uri.port_no ? uri.port_no : 5060; + + // Don't do anything if the address is the same, just return success. + if (STR_MATCH_STR(uri.host, newip) && port==newport) return 1; - } if (uri.port.len == 0) uri.port.s = uri.host.s + uri.host.len; @@ -1432,7 +1435,7 @@ FixContact(struct sip_msg *msg) after.s = uri.port.s + uri.port.len; after.len = contact->uri.s + contact->uri.len - after.s; - len = before_host.len + newiplen + after.len + 20; + len = before_host.len + newip.len + after.len + 20; // first try to alloc mem. if we fail we don't want to have the lump // deleted and not replaced. at least this way we keep the original. @@ -1451,7 +1454,7 @@ FixContact(struct sip_msg *msg) } len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, - newip, msg->rcv.src_port, after.len, after.s); + newip.s, newport, after.len, after.s); if (insert_new_lump_after(anchor, buf, len, HDR_CONTACT_F) == 0) { pkg_free(buf);

15 years, 7 months

git:master: Merge commit 'origin/ser_core_cvs'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: fa35f54d24d75902b21203da47a51f5e07d467bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa35f54… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 16 13:31:43 2009 +0200 Merge commit 'origin/ser_core_cvs' * commit 'origin/ser_core_cvs': make: use C_INCLUDES for includes tcp: stun fixes tcp: tcp_blocking_connect timeout fix tcp: stats: added init & destroy macros tcp: minor stats fixes tcp: internal macro-hooks for stats & events tcp: helper internal macros Do not try to backlist and do not try DNS failover for blind UACs as Safety check added to verify whether the static buffers have ---

15 years, 7 months

git:master: add Changelog from svn trunk (until r5792) after migration to git

by Henning Westerholt

Module: sip-router Branch: master Commit: 90506c13701a80e5386a7c4bccf3976d6e82dde2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90506c1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 16 13:13:55 2009 +0200 add Changelog from svn trunk (until r5792) after migration to git --- ChangeLog_k | 649 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 649 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=905…

15 years, 7 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, 7 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, 7 months

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, 7 months

git:ser_core_cvs: tcp: internal macro-hooks for stats & events

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 7bb2b4ca371c5c97305c446be64f5ce42371a906 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bb2b4c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 9 19:10:56 2009 +0000 tcp: internal macro-hooks for stats & events - added macros for tcp statistics (for now empty, keeping more statistics will only involve redefining them): TCP_STATS_ESTABLISHED(state) - new connection established TCP_STATS_CONNECT_FAILED() - new outgoing connection failed TCP_STATS_LOCAL_REJECT() - new incoming connection rejected (max. no exceeded) TCP_STATS_CON_TIMEOUT() - connection closed for being idle too long TCP_STATS_SEND_TIMEOUT() - send fails due to a timeout TCP_STATS_SENDQ_FULL() - send fails because of the buffering capacity being exceed (async mode only) - added macros for various tcp events (for now some of them are used for logging): TCP_EV_CONNECT_RST(...) - connect attempt received RST TCP_EV_CONNECT_UNREACHABLE(...) TCP_EV_CONNECT_TIMEOUT(...) TCP_EV_CONNECT_NO_MORE_PORTS(...) TCP_EV_CONNECT_ERR(...) - other connect error TCP_EV_SEND_TIMEOUT(...) TCP_EV_SENDQ_FULL(...) TCP_EV_IDLE_CONN_CLOSED(...) --- tcp_ev.h | 97 ++++++++++++++++++ tcp_main.c | 328 +++++++++++++++++++++++++++++++++++++++++++++++------------ tcp_read.c | 53 ++++++++-- tcp_stats.h | 72 +++++++++++++ 4 files changed, 475 insertions(+), 75 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7bb…

15 years, 7 months

git:ser_core_cvs: tcp: stun fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 0e3dd037b5d332ae0c46dfba1ad8200fe971eafc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e3dd03… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 10 11:26:11 2009 +0000 tcp: stun fixes --- tcp_read.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index 8bec92f..ab69242 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -414,7 +414,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r->state=H_STUN_MSG; /* body will used as pointer to the last used byte */ r->body=p; - body_len = 0; + r->content_len = 0; DBG("stun msg detected\n"); }else #endif @@ -456,14 +456,13 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) #ifdef USE_STUN case H_STUN_MSG: if ((r->pos - r->body) >= sizeof(struct stun_hdr)) { - r->content_len = 0; /* copy second short from buffer where should be body * length */ memcpy(&body_len, &r->start[sizeof(unsigned short)], sizeof(unsigned short)); - body_len = ntohs(r->content_len); + body_len = ntohs(body_len); /* check if there is valid magic cookie */ memcpy(&mc, &r->start[sizeof(unsigned int)], @@ -490,6 +489,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) SHA_DIGEST_LENGTH; } } + r->content_len=body_len; } else { p = r->pos; @@ -498,15 +498,18 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) case H_STUN_READ_BODY: /* check if the whole body was read */ + body_len=r->content_len; if ((r->pos - r->body) >= body_len) { r->body += body_len; p = r->body; if (is_msg_complete(r) != 0) { + r->content_len=0; goto skip; } else { /* set content_len to length of fingerprint */ body_len = sizeof(struct stun_attr)+SHA_DIGEST_LENGTH; + r->content_len=body_len; } } else { @@ -516,12 +519,14 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) case H_STUN_FP: /* content_len contains length of fingerprint in this place! */ + body_len=r->content_len; if ((r->pos - r->body) >= body_len) { r->body += body_len; p = r->body; r->state = H_STUN_END; r->flags |= F_TCP_REQ_COMPLETE | F_TCP_REQ_HAS_CLEN; /* hack to avoid error check */ + r->content_len=0; goto skip; } else {

15 years, 7 months

git:ser_core_cvs: make: use C_INCLUDES for includes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 16155740689d81cb58ad6e7b9350ec0747c5f9cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1615574… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 10 12:28:00 2009 +0000 make: use C_INCLUDES for includes --- Makefile.defs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 68e1e98..9135117 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1651,7 +1651,7 @@ endif #add libssl if needed ifeq ($(CORE_TLS), 1) -C_DEFS+= -I$(LOCALBASE)/ssl/include +C_INCLUDES+= -I$(LOCALBASE)/ssl/include LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ $(TLS_EXTRA_LIBS) # NOTE: depending on the way in which libssl was compiled you might @@ -1660,7 +1660,7 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ endif ifneq ($(STUN),) -C_DEFS+= -I$(LOCALBASE)/ssl/include +C_INCLUDES+= -I$(LOCALBASE)/ssl/include LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lcrypto endif

15 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009