sr-dev September 2012

sr-dev@lists.kamailio.org

32 participants
173 discussions

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 97e03b52f1e15d7f22416274cf696fb5c6a94758 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97e03b5… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 17 14:35:12 2012 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

11 years, 7 months

git:master: Revert "Do not perform a lookup for IPv4 addresses, if only listening on IPv6 sockets."

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 2d6a8e0ae7eb9bbf839227ae370ede7bf7d89ab1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d6a8e0… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 17 14:36:00 2012 +0200 Revert "Do not perform a lookup for IPv4 addresses, if only listening on IPv6 sockets." Can be done by configuration. This reverts commit e1b3961b16b76b02ae7ad5f52b2e9db126f81ff9. --- resolve.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resolve.h b/resolve.h index eeae6c2..8ce68e6 100644 --- a/resolve.h +++ b/resolve.h @@ -429,10 +429,8 @@ static inline struct hostent* _resolvehost(char* name) } #endif #endif - if (socket_types & SOCKET_T_IPV4) { - /* ipv4 */ - he=gethostbyname(name); - } + /* ipv4 */ + he=gethostbyname(name); #ifdef USE_IPV6 if(he==0 && cfg_get(core, core_cfg, dns_try_ipv6)){ #ifndef DNS_IP_HACK

11 years, 7 months

git:master: core:parser fix possible bug in msg_parser

by Marius Zbihlei

Module: sip-router Branch: master Commit: cccdaead04411175c46dd660c91c037c45f80c33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cccdaea… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Sep 17 17:34:57 2012 +0300 core:parser fix possible bug in msg_parser If buffer was NULL, tmp was returned uninitialized, thus possible to cause problems --- parser/msg_parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index b279e47..7c9c04e 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -88,7 +88,7 @@ unsigned int global_req_flags = 0; char* get_hdr_field(char* const buf, char* const end, struct hdr_field* const hdr) { - char* tmp; + char *tmp = 0; char *match; struct via_body *vb; struct cseq_body* cseq_b;

11 years, 7 months

git:master: core: fixed some bening (-Wunused-var) warnings displayed by clang

by Marius Zbihlei

Module: sip-router Branch: master Commit: a6c250c091e29c1f4fd53782dfb723fa194fe03e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6c250c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Sep 17 17:21:37 2012 +0300 core: fixed some bening (-Wunused-var) warnings displayed by clang Core builds with no errors/warning --- action.c | 2 +- forward.c | 2 +- tcp_main.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/action.c b/action.c index 5e0875c..dbd528c 100644 --- a/action.c +++ b/action.c @@ -140,7 +140,7 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ if ((dst)[i+2].type == RVE_FREE_FIXUP_ST) {\ /* call free_fixup (which should restore the original string) */ \ - call_fixup((cmd)->free_fixup, &(dst)[i+2].u.data, i+1); \ + (void)call_fixup((cmd)->free_fixup, &(dst)[i+2].u.data, i+1); \ } else if ((dst)[i+2].type == FPARAM_DYN_ST) {\ /* completely frees fparam and restore original string */\ fparam_free_restore(&(dst)[i+2].u.data); \ diff --git a/forward.c b/forward.c index b259ecf..b0540d2 100644 --- a/forward.c +++ b/forward.c @@ -648,7 +648,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, if (msg_send(send_info, buf, len)<0){ ret=ser_error=E_SEND; #ifdef USE_DST_BLACKLIST - dst_blacklist_add(BLST_ERR_SEND, send_info, msg); + (void)dst_blacklist_add(BLST_ERR_SEND, send_info, msg); #endif #ifdef USE_DNS_FAILOVER continue; /* try another ip */ diff --git a/tcp_main.c b/tcp_main.c index a6e3019..e17d06a 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -709,7 +709,7 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, if (q->first && TICKS_LT(q->wr_timeout, t)){ if (unlikely(c->state==S_CONN_CONNECT)){ #ifdef USE_DST_BLACKLIST - dst_blacklist_su( BLST_ERR_CONNECT, c->rcv.proto, + (void)dst_blacklist_su( BLST_ERR_CONNECT, c->rcv.proto, &c->rcv.src_su, &c->send_flags, 0); #endif /* USE_DST_BLACKLIST */ TCP_EV_CONNECT_TIMEOUT(0, TCP_LADDR(c), TCP_LPORT(c), @@ -717,7 +717,7 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, TCP_STATS_CONNECT_FAILED(); }else{ #ifdef USE_DST_BLACKLIST - dst_blacklist_su( BLST_ERR_SEND, c->rcv.proto, + (void)dst_blacklist_su( BLST_ERR_SEND, c->rcv.proto, &c->rcv.src_su, &c->send_flags, 0); #endif /* USE_DST_BLACKLIST */ TCP_EV_SEND_TIMEOUT(0, &c->rcv); @@ -3433,7 +3433,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) /* timeout */ if (unlikely(tcpconn->state==S_CONN_CONNECT)){ #ifdef USE_DST_BLACKLIST - dst_blacklist_su( BLST_ERR_CONNECT, + (void)dst_blacklist_su( BLST_ERR_CONNECT, tcpconn->rcv.proto, &tcpconn->rcv.src_su, &tcpconn->send_flags, 0); @@ -3444,7 +3444,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) TCP_STATS_CONNECT_FAILED(); }else{ #ifdef USE_DST_BLACKLIST - dst_blacklist_su( BLST_ERR_SEND, + (void)dst_blacklist_su( BLST_ERR_SEND, tcpconn->rcv.proto, &tcpconn->rcv.src_su, &tcpconn->send_flags, 0); @@ -4222,7 +4222,7 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, if (unlikely(ev & POLLERR)){ if (unlikely(tcpconn->state==S_CONN_CONNECT)){ #ifdef USE_DST_BLACKLIST - dst_blacklist_su(BLST_ERR_CONNECT, tcpconn->rcv.proto, + (void)dst_blacklist_su(BLST_ERR_CONNECT, tcpconn->rcv.proto, &tcpconn->rcv.src_su, &tcpconn->send_flags, 0); #endif /* USE_DST_BLACKLIST */ @@ -4232,7 +4232,7 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, TCP_STATS_CONNECT_FAILED(); }else{ #ifdef USE_DST_BLACKLIST - dst_blacklist_su(BLST_ERR_SEND, tcpconn->rcv.proto, + (void)dst_blacklist_su(BLST_ERR_SEND, tcpconn->rcv.proto, &tcpconn->rcv.src_su, &tcpconn->send_flags, 0); #endif /* USE_DST_BLACKLIST */ @@ -4409,7 +4409,7 @@ static ticks_t tcpconn_main_timeout(ticks_t t, struct timer_ln* tl, void* data) if (tcp_async && _wbufq_non_empty(c) && TICKS_GE(t, c->wbuf_q.wr_timeout)){ if (unlikely(c->state==S_CONN_CONNECT)){ #ifdef USE_DST_BLACKLIST - dst_blacklist_su(BLST_ERR_CONNECT, c->rcv.proto, &c->rcv.src_su, + (void)dst_blacklist_su(BLST_ERR_CONNECT, c->rcv.proto, &c->rcv.src_su, &c->send_flags, 0); #endif /* USE_DST_BLACKLIST */ TCP_EV_CONNECT_TIMEOUT(0, TCP_LADDR(c), TCP_LPORT(c), TCP_PSU(c), @@ -4417,7 +4417,7 @@ static ticks_t tcpconn_main_timeout(ticks_t t, struct timer_ln* tl, void* data) TCP_STATS_CONNECT_FAILED(); }else{ #ifdef USE_DST_BLACKLIST - dst_blacklist_su(BLST_ERR_SEND, c->rcv.proto, &c->rcv.src_su, + (void)dst_blacklist_su(BLST_ERR_SEND, c->rcv.proto, &c->rcv.src_su, &c->send_flags, 0); #endif /* USE_DST_BLACKLIST */ TCP_EV_SEND_TIMEOUT(0, &c->rcv);

11 years, 7 months

git:master: Makefiles.defs: clang compiles to O9

by Marius Zbihlei

Module: sip-router Branch: master Commit: 5273948a6eeb6f6fe878696dce54880cabb0ef7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5273948… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Sep 17 17:21:02 2012 +0300 Makefiles.defs: clang compiles to O9 --- Makefile.defs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 3cd31e3..1645c34 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -935,9 +935,9 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,athlon64) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m32 + -O9 \ \ - \ - -mtune=$(CPU) + -mtune=$(CPU) LDFLAGS+=-m32 else # CC_NAME, clang ifeq ($(CC_NAME), icc) @@ -1031,7 +1031,7 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,opteron) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m64 \ - + -O9 LDFLAGS+=-m64 else # CC_NAME, clang ifeq ($(CC_NAME), icc)

11 years, 7 months

git:master: benchmark: fixed bug/typo in calculating time diff ; )

by Jason Penton

Module: sip-router Branch: master Commit: d9b009ef3c430f6ea064b4a72d5b94ce842ede1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9b009e… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Sep 17 10:55:48 2012 +0200 benchmark: fixed bug/typo in calculating time diff ;) --- modules_k/benchmark/benchmark.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/benchmark/benchmark.h b/modules_k/benchmark/benchmark.h index cc4e68e..dec7e44 100644 --- a/modules_k/benchmark/benchmark.h +++ b/modules_k/benchmark/benchmark.h @@ -88,8 +88,8 @@ inline unsigned long long bm_diff_time(bm_timeval_t *t1, bm_timeval_t *t2) { unsigned long long tdiff; - tdiff = t1->tv_sec - t1->tv_sec; - + tdiff = t2->tv_sec - t1->tv_sec; + #ifdef BM_CLOCK_REALTIME tdiff = tdiff*1000000000 + t2->tv_nsec - t1->tv_nsec; #else

11 years, 7 months

git:master: cfg.y : improved printing of error messages to stderr

by Marius Zbihlei

Module: sip-router Branch: master Commit: 9d5ef9925da0257a46afa7e8d8dfa1ce8920364a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d5ef99… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Sep 17 11:42:01 2012 +0300 cfg.y : improved printing of error messages to stderr The -E was ignored during the yyparse() stage, if log_stderr=no parameter in the cfg was set (default config) This caused problems debugging certain lodmodule errors. --- cfg.y | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 37859aa..8fdfcb5 100644 --- a/cfg.y +++ b/cfg.y @@ -853,7 +853,9 @@ assign_stm: | FORK EQUAL error { yyerror("boolean value expected"); } | FORK_DELAY EQUAL NUMBER { set_fork_delay($3); } | FORK_DELAY EQUAL error { yyerror("number expected"); } - | LOGSTDERROR EQUAL NUMBER { if (!config_check) log_stderr=$3; } + | LOGSTDERROR EQUAL NUMBER { if (!config_check) /* if set from cmd line, don't overwrite from yyparse()*/ + if(log_stderr == 0) log_stderr=$3; + } | LOGSTDERROR EQUAL error { yyerror("boolean value expected"); } | LOGFACILITY EQUAL ID { if ( (i_tmp=str2facility($3))==-1)

11 years, 7 months

git:master: Provide inline linkage for non-gcc compilers(like clang)

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2e5145ecdd8368c947ea93b98449ebd997824ce2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e5145e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Sep 17 10:17:41 2012 +0300 Provide inline linkage for non-gcc compilers(like clang) Inline method in headers should be declared extern. --- lib/srdb1/db_res.h | 12 ++++++------ lib/srdb1/db_row.h | 4 ++-- modules/ctl/binrpc_run.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/srdb1/db_res.h b/lib/srdb1/db_res.h index 82734b3..f8f909f 100644 --- a/lib/srdb1/db_res.h +++ b/lib/srdb1/db_res.h @@ -85,7 +85,7 @@ typedef struct db1_res { * \param _r the result that should be released * \return zero on success, negative on errors */ -inline int db_free_rows(db1_res_t* _r); +extern inline int db_free_rows(db1_res_t* _r); /** @@ -95,20 +95,20 @@ inline int db_free_rows(db1_res_t* _r); * \param _r the result that should be released * \return zero on success, negative on errors */ -inline int db_free_columns(db1_res_t* _r); +extern inline int db_free_columns(db1_res_t* _r); /** * Create a new result structure and initialize it. * \return a pointer to the new result on success, NULL on errors */ -inline db1_res_t* db_new_result(void); +extern inline db1_res_t* db_new_result(void); /** * Release memory used by a result structure. * \return zero on success, negative on errors */ -inline int db_free_result(db1_res_t* _r); +extern inline int db_free_result(db1_res_t* _r); /** * Allocate storage for column names and type in existing result structure. @@ -118,7 +118,7 @@ inline int db_free_result(db1_res_t* _r); * \param cols number of columns * \return zero on success, negative on errors */ -inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); +extern inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); /** @@ -126,6 +126,6 @@ inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); * \param _res result set * \return zero on success, negative on errors */ -inline int db_allocate_rows(db1_res_t* _res); +extern inline int db_allocate_rows(db1_res_t* _res); #endif /* DB1_RES_H */ diff --git a/lib/srdb1/db_row.h b/lib/srdb1/db_row.h index 855ed3d..6bee889 100644 --- a/lib/srdb1/db_row.h +++ b/lib/srdb1/db_row.h @@ -62,7 +62,7 @@ typedef struct db_row { * \param _r row that should be released * \return zero on success, negative on error */ -inline int db_free_row(db_row_t* _r); +extern inline int db_free_row(db_row_t* _r); /** @@ -71,6 +71,6 @@ inline int db_free_row(db_row_t* _r); * \param _row filled row * \return zero on success, negative on errors */ -inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row); +extern inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row); #endif /* DB1_ROW_H */ diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 3e3e33f..211d025 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -384,7 +384,7 @@ end: -inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) +static inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) { free_structs(&ctx->out.structs); if (ctx->out.pkt.body){

11 years, 7 months

git:3.3: modules_k/rls: Fixed race-condition on multi-server systems that can cause different NOTIFYs with the same CSeq

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: e9ccba247a1262c7b183fb66933d5ee06b765968 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9ccba2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Sep 16 23:46:07 2012 +0100 modules_k/rls: Fixed race-condition on multi-server systems that can cause different NOTIFYs with the same CSeq - Found by Hugh Waite @ Crocodile RCS and fixed by Peter Dunkley @ Crocodile RCS (cherry picked from commit 67df57c984e040a948d01d2c6bf1a9461d271f8e) --- modules_k/rls/rls_db.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 0e72991..09140c7 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -856,8 +856,8 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) subs_t *get_dialog_notify_rlsdb(str callid, str to_tag, str from_tag) { - db_key_t query_cols[3]; - db_val_t query_vals[3]; + db_key_t query_cols[4]; + db_val_t query_vals[4]; db_key_t result_cols[22]; int n_query_cols = 0, n_result_cols=0; int r_pres_uri_col,r_to_user_col,r_to_domain_col; @@ -905,6 +905,12 @@ subs_t *get_dialog_notify_rlsdb(str callid, str to_tag, str from_tag) query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val= from_tag; n_query_cols++; + + query_cols[n_query_cols] = &str_updated_col; + query_vals[n_query_cols].type = DB1_INT; + query_vals[n_query_cols].nul = 0; + query_vals[n_query_cols].val.int_val= NO_UPDATE_TYPE; + n_query_cols++; result_cols[r_pres_uri_col=n_result_cols++] = &str_presentity_uri_col; result_cols[r_to_user_col=n_result_cols++] = &str_to_user_col;

11 years, 7 months

git:3.3: modules_k/rls: Fixed segmentation fault in RLS when a resource-list is updated

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: d81bb6501c6b4de517a44af8fe9005dd128d0066 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d81bb65… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Sep 16 23:47:20 2012 +0100 modules_k/rls: Fixed segmentation fault in RLS when a resource-list is updated - Found and fixed by Hugh Waite @ Crocodile RCS (cherry picked from commit bde7e9465db9e7c9ecb485c57edabbd032f3b770) --- modules_k/rls/subscribe.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 8422f78..eabb3db 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -1058,15 +1058,13 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) { LM_DBG("Removing subscription for %.*s\n", tmp_str->len, tmp_str->s); s.expires = 0; - send_resource_subs(tmp_str->s, (void*)(&s)); + send_resource_subs(tmp_str->s, params); pkg_free(tmp_str->s); pkg_free(tmp_str); } } - else - { + if (rls_contact_list != NULL) list_free(&rls_contact_list); - } pkg_free(wuri.s); pkg_free(did_str.s);

11 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2012