sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
318 discussions

git:4.0: pkg/debian: set version to 4.0.5 in specs

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 1a5c2d6f97585a7f0dc19102b46136ad4a5346cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a5c2d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 20 17:21:11 2013 +0100 pkg/debian: set version to 4.0.5 in specs --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/lenny/changelog | 6 ++++++ pkg/kamailio/deb/lucid/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 6 files changed, 36 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 7e8459b..2315545 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.5) unstable; urgency=low + + * update to 4.0.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Fri, 20 Dec 2013 17:10:20 +0100 + kamailio (4.0.4) unstable; urgency=low * update to 4.0.4 from upstream diff --git a/pkg/kamailio/deb/lenny/changelog b/pkg/kamailio/deb/lenny/changelog index 7e8459b..2315545 100644 --- a/pkg/kamailio/deb/lenny/changelog +++ b/pkg/kamailio/deb/lenny/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.5) unstable; urgency=low + + * update to 4.0.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Fri, 20 Dec 2013 17:10:20 +0100 + kamailio (4.0.4) unstable; urgency=low * update to 4.0.4 from upstream diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index 7e8459b..2315545 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.5) unstable; urgency=low + + * update to 4.0.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Fri, 20 Dec 2013 17:10:20 +0100 + kamailio (4.0.4) unstable; urgency=low * update to 4.0.4 from upstream diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 8867e3c..a906e8c 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.5) unstable; urgency=low + + * update to 4.0.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Fri, 20 Dec 2013 17:10:20 +0100 + kamailio (4.0.4) unstable; urgency=low * update to 4.0.4 from upstream diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 7e8459b..2315545 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.5) unstable; urgency=low + + * update to 4.0.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Fri, 20 Dec 2013 17:10:20 +0100 + kamailio (4.0.4) unstable; urgency=low * update to 4.0.4 from upstream diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 7e8459b..2315545 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.0.5) unstable; urgency=low + + * update to 4.0.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Fri, 20 Dec 2013 17:10:20 +0100 + kamailio (4.0.4) unstable; urgency=low * update to 4.0.4 from upstream

10 years, 11 months

git:4.0: maxforwards: use standard format instead of GNU old-style field designator

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 298913ee2e36d11c26ce5c320059e822c97d31e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=298913e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:23:17 2013 +0100 maxforwards: use standard format instead of GNU old-style field designator (cherry picked from commit cd04947b0ccb1c861274483f458bfc7f4329accb) --- modules/maxfwd/maxfwd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/maxfwd/maxfwd.c b/modules/maxfwd/maxfwd.c index 01e64a6..371a1aa 100644 --- a/modules/maxfwd/maxfwd.c +++ b/modules/maxfwd/maxfwd.c @@ -55,7 +55,7 @@ struct cfg_group_maxfwd { }; static struct cfg_group_maxfwd default_maxfwd_cfg = { - max_limit:16 + .max_limit=16 }; static void *maxfwd_cfg = &default_maxfwd_cfg;

10 years, 11 months

git:4.0: ratelimit: signed check for pipe number in rpc_set_queue()

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 53655beed57d0165931790683046614e70a8acfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53655be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:34:49 2013 +0100 ratelimit: signed check for pipe number in rpc_set_queue() - rpc can reand signed value (cherry picked from commit ed034d4d9096d8c77269828c8efdafb26eac5372) --- modules/ratelimit/ratelimit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 2aab068..8165ff8 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -1189,7 +1189,7 @@ static void rpc_set_queue(rpc_t *rpc, void *c) { if (rpc->scan(c, "dSd", &queue_no, &method, &pipe_no) < 3) return; - if (pipe_no >= MAX_PIPES || pipe_no < 0) { + if (pipe_no >= MAX_PIPES || (int)pipe_no < 0) { LM_ERR("Invalid pipe number: %d\n", pipe_no); rpc->fault(c, 400, "Invalid pipe number"); return;

10 years, 11 months

git:4.0: pike: memset of address print buffer with proper size

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 58206a77d9ba2335793f66adc27f4eb89e062bb9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58206a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:30:49 2013 +0100 pike: memset of address print buffer with proper size (cherry picked from commit d54eb083f59fb55ccbc79e49b5b3e05426bd3795) --- modules/pike/pike_top.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/pike/pike_top.c b/modules/pike/pike_top.c index c3d001e..8399602 100644 --- a/modules/pike/pike_top.c +++ b/modules/pike/pike_top.c @@ -13,14 +13,15 @@ static struct TopListItem_t *top_list_root = 0; static struct TopListItem_t *top_list_iter = 0; -static char buff[128]; +#define PIKE_BUFF_SIZE 128 +static char buff[PIKE_BUFF_SIZE]; struct TopListItem_t *pike_top_get_root() { return top_list_root; } char *pike_top_print_addr( unsigned char *ip, int iplen, char *buff, int buffsize ) { unsigned short *ipv6_ptr = (unsigned short *)ip; - memset( buff, 0, sizeof(buff)); + memset(buff, 0, PIKE_BUFF_SIZE*sizeof(char)); DBG("pike:top:print_addr(iplen: %d, buffsize: %d)", iplen, buffsize);

10 years, 11 months

git:4.0: tls: removed unsigned int comparison with <0

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: e9ef639beb37e1379a2a62bfaac13a4b64ba7d75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9ef639… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 19:03:08 2013 +0100 tls: removed unsigned int comparison with <0 (cherry picked from commit 7d6dc390bac2b49615444bcbad74cd39f3c82302) --- modules/tls/tls_config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tls/tls_config.c b/modules/tls/tls_config.c index 0083893..caf8a60 100644 --- a/modules/tls/tls_config.c +++ b/modules/tls/tls_config.c @@ -91,7 +91,7 @@ static int parse_ipv4(struct ip_addr* ip, cfg_token_t* token, ip->len = 4; if (str2int(&token->val, &v) < 0) goto err; - if (v < 0 || v > 255) goto err; + if (v > 255) goto err; ip->u.addr[0] = v; @@ -104,7 +104,7 @@ static int parse_ipv4(struct ip_addr* ip, cfg_token_t* token, if (ret < 0) return -1; if (ret > 0 || t.type != CFG_TOKEN_ALPHA) goto err; if (str2int(&t.val, &v) < 0) goto err; - if (v < 0 || v > 255) goto err; + if (v > 255) goto err; ip->u.addr[i] = v; }

10 years, 11 months

git:4.0: ctl: removed not needed extra paranthesis

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: ea6b37271c7ca222650a58dc717b7a203483cc6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea6b372… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:20:16 2013 +0100 ctl: removed not needed extra paranthesis (cherry picked from commit efda774f6391f1e909a9967898c64fb25f53eeba) --- modules/ctl/fifo_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ctl/fifo_server.c b/modules/ctl/fifo_server.c index c72dcbe..d5f849f 100644 --- a/modules/ctl/fifo_server.c +++ b/modules/ctl/fifo_server.c @@ -757,7 +757,7 @@ process: ERR("File separator missing\n"); goto consume; } - if ((file_sep == context.method)) { + if (file_sep == context.method) { ERR("Empty command\n"); goto consume; }

10 years, 11 months

git:4.0: pv: use int index for looking up flag index

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 3bfbc96ae673a570e6bc56a89e8ca6e677eb9388 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bfbc96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:15:22 2013 +0100 pv: use int index for looking up flag index - some functions used for check may return negative on error (cherry picked from commit 30359b3cfce2ce909153e06b1954778c4eababa7) --- modules/pv/pv_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index ac0b638..0a0483c 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -2711,12 +2711,12 @@ error: int pv_parse_flag_param(pv_spec_p sp, str *in) { - unsigned int n; + int n; if(sp==NULL || in==NULL || in->len<=0) return -1; - if (str2int(in, &n) != 0) + if (str2sint(in, &n) != 0) { if ((n = get_flag_no(in->s, in->len)) < 0) {

10 years, 11 months

git:4.0: usrloc: avoid double locking when preloading attributes

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 2e08848cdb16fa717897b6b70fde4dc9ef3c34a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e08848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 9 10:06:15 2013 +0100 usrloc: avoid double locking when preloading attributes - reported by Seudin Kasumovic, FS#378 (cherry picked from commit 888635bfa3719afeeea6f5f0d407aa862ceb34ac) (cherry picked from commit 8df9d2336e7de2648288cf8ff6821e6820d88da9) --- modules/usrloc/udomain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index d3275b8..9eeb950 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -1265,8 +1265,7 @@ int uldb_preload_attrs(udomain_t *_d) suri = user; } - lock_udomain(_d, &suri); - if (get_urecord_by_ruid(_d, ul_get_aorhash(&suri), &ruid, &r, &c) > 0) { + if (get_urecord_by_ruid(_d, ul_get_aorhash(&suri), &ruid, &r, &c) < 0) { /* delete attrs records from db table */ LM_INFO("no contact record for this ruid\n"); uldb_delete_attrs(_d->name, &user, &domain, &ruid); @@ -1282,8 +1281,9 @@ int uldb_preload_attrs(udomain_t *_d) LM_INFO("cannot add values to contact xavp\n"); } } + /* get_urecord_by_ruid() locks the slot */ + unlock_udomain(_d, &suri); } - unlock_udomain(_d, &user); } if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) {

10 years, 11 months

git:4.0: db_flatstore: update timestamp for kamailio specific rpc rotate

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: aee55e1bdc9fefd2082ba1e13d88a1ab2c70a37f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aee55e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 16 09:26:03 2013 +0100 db_flatstore: update timestamp for kamailio specific rpc rotate - do also in 'rotate' command, not only in 'k_rotate' - from a patch by Abdelkader Allam (cherry picked from commit b15aefa31e45f1ad6a45b64905f9fae24e0f790e) (cherry picked from commit d75bc3b69151a9d0391309e6bb51784f3b6b9a83) --- modules/db_flatstore/flat_rpc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/flat_rpc.c b/modules/db_flatstore/flat_rpc.c index 2fe0d0f..5145d83 100644 --- a/modules/db_flatstore/flat_rpc.c +++ b/modules/db_flatstore/flat_rpc.c @@ -32,6 +32,7 @@ #include "flat_rpc.h" #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include <time.h> @@ -43,6 +44,7 @@ */ static void rotate(rpc_t* rpc, void* c) { + *km_flat_rotate = time(0); *flat_rotate = time(0); }

10 years, 11 months

git:4.0: core: fixed several clang compiler warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: b4f7f2e8a0cf1178b31ed7a7a84725fd25b36940 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4f7f2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 17:16:25 2013 +0100 core: fixed several clang compiler warnings (cherry picked from commit f0fb6f1e9fbb2f7f0c2bed5ba0d50a56cf5cf444) (cherry picked from commit 90681624c54f0ec0b1259e205bcc0274316b4549) Conflicts: parser/parse_fline.c --- dset.c | 4 ++-- flags.c | 2 +- msg_translator.c | 2 +- parser/parse_fline.c | 4 ++-- select_buf.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dset.c b/dset.c index 31b8b38..61c30a5 100644 --- a/dset.c +++ b/dset.c @@ -89,7 +89,7 @@ branch_t *get_sip_branch(int idx) return NULL; if(idx<0) { - if(nr_branches + idx >= 0) + if((int)nr_branches + idx >= 0) return &branches[nr_branches+idx]; return NULL; } @@ -108,7 +108,7 @@ int drop_sip_branch(int idx) { if(nr_branches==0 || idx>=nr_branches) return 0; - if(idx<0 && nr_branches+idx<0) + if(idx<0 && (int)nr_branches+idx<0) return 0; /* last branch */ if(idx==nr_branches-1) diff --git a/flags.c b/flags.c index 1523d0b..becb569 100644 --- a/flags.c +++ b/flags.c @@ -74,7 +74,7 @@ int flag_in_range( flag_t flag ) { flag, MAX_FLAG ); return 0; } - if (flag<0) { + if ((int)flag<0) { LOG(L_ERR, "ERROR: message flag (%d) must be in range %d..%d\n", flag, 0, MAX_FLAG ); return 0; diff --git a/msg_translator.c b/msg_translator.c index fa7834f..c39188b 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1580,7 +1580,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto) */ /* no need for Content-Length if it's and UDP packet and * it hasn't Content-Length already */ - if ((msg->content_length==0)){ + if (msg->content_length==0){ /* content-length doesn't exist, append it */ /* msg->unparsed should point just before the final crlf * - whole message was parsed by the above parse_headers diff --git a/parser/parse_fline.c b/parser/parse_fline.c index 25ab944..926ddc6 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -233,8 +233,8 @@ error: if (prn) { for (t=0; t<offset; t++) if (*(buffer+t)) *(prn+t)=*(buffer+t); - else *(prn+t)='�'; - LOG(L_INFO, "ERROR: parsed so far: %.*s\n", offset, ZSW(prn) ); + else *(prn+t)=176; /* '�' */ + LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) ); pkg_free( prn ); }; error1: diff --git a/select_buf.c b/select_buf.c index b3463a8..7277d48 100644 --- a/select_buf.c +++ b/select_buf.c @@ -162,7 +162,7 @@ int int_to_static_buffer(str* res, int val) { char *c; c = int2str(abs(val), &res->len); - res->s = get_static_buffer(res->len+(val<0)?1:0); + res->s = get_static_buffer(res->len+((val<0)?1:0)); if (!res->s) return -1; if (val < 0) { res->s[0] = '-';

10 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013