sr-dev

sr-dev@lists.kamailio.org

15 participants
44233 discussions

by Juha Heinanen

currently i have to make these hacks in order to rename sercmd and DEFAULT_CTL_SOCKET: # Rename sercmd and DEFAULT_CTL_SOCKET sed -i -e 's/NAME=sercmd/NAME=sip-proxy_ctl/' utils/sercmd/Makefile sed -i -e 's!sercmd/sercmd!sercmd/sip-proxy_ctl!' Makefile sed -i -e 's/ser_ctl/sip-proxy_ctl/' modules/ctl/ctl_defaults.h those hack should not be needed and renaming should happen automatically based on MAIN_NAME or SHORT_NAME. i tried once to hack the makefiles for that, but was not successful. -=- juha

15 years, 3 months

[ openser-Bugs-2877313 ] fix_nated_contact() then encode_contact() causes core dump

by SourceForge.net

Bugs item #2877313, was opened at 2009-10-12 21:35 Message generated for change (Tracker Item Submitted) made by You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2877313&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver devel Status: Open Resolution: None Priority: 5 Private: No Submitted By: https://www.google.com/accounts () Assigned to: Nobody/Anonymous (nobody) Summary: fix_nated_contact() then encode_contact() causes core dump Initial Comment: When one runs fix_nated_contact() from the nathelper module for it's intended purpose (it must complete successfully) and then run encode_contact() from the siputils module (it also must complete) Kamailio always core-dumps with: CRITICAL:core:del_lump: offset exceeds message size (202688 > 602) aborting... This seems to have something to do with re-writing the contact header twice and not fixing the message size the second time but I can't say for sure. I have a core file, but it seems rather large (44M). It can be uploaded if need be. This is occurring with both the release 1.5.2tls & 1.6.0notls dev trunk. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2877313&group_…

15 years, 3 months

sr crash at start when ip address does not exist

by jh＠tutpro.com

today when io tried to start a couple of days old sr, it crashed at start like this: #0 cfg_update_local (no_cbs=0) at cfg/cfg_struct.h:257 257 cfg_child_cb = cfg_child_cb->next; (gdb) where #0 cfg_update_local (no_cbs=0) at cfg/cfg_struct.h:257 #1 0x08086b2f in cleanup (show_status=0) at main.c:519 #2 0x080870d1 in shutdown_children (sig=<value optimized out>, show_status=0) at main.c:648 #3 0x0808b04b in main (argc=Cannot access memory at address 0x0 ) at main.c:2245 the reason may be that the address that sr is supposed to be listening at, does not exist, but no matter what, sr must not crash: Oct 12 11:47:56 localhost kernel: [ 4371.305724] sip-proxy[7470]: segfault at 1c ip 08085c34 sp bfa62af0 error 4 in sip-proxy[8048000+164000] Oct 12 11:47:56 localhost /usr/sbin/sip-proxy[7470]: INFO: <core> [udp_server.c:217]: INFO: udp_init: SO_RCVBUF is finally 262142 Oct 12 11:47:56 localhost /usr/sbin/sip-proxy[7470]: ERROR: <core> [udp_server.c:388]: ERROR: udp_init: bind(6, 0x8219380, 16) on 192.98.101.10: Cannot assign requested address -- juha

15 years, 3 months

git:sr_3.0: userblacklist(k): gcc 2.95 compile fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 275899b1395c07b5ab83552a24fca06aa3835c85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=275899b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:08:29 2009 +0200 userblacklist(k): gcc 2.95 compile fixes - variables must be declared at the beginning of a block --- modules_k/userblacklist/db.c | 8 ++++---- modules_k/userblacklist/userblacklist.c | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules_k/userblacklist/db.c b/modules_k/userblacklist/db.c index fc8c915..dd7c986 100644 --- a/modules_k/userblacklist/db.c +++ b/modules_k/userblacklist/db.c @@ -46,6 +46,10 @@ int db_build_userbl_tree(const str *username, const str *domain, const str *tabl db_key_t key[2] = { &userblacklist_username_col, &userblacklist_domain_col }; db_val_t val[2]; + db1_res_t *res; + int i; + int n = 0; + void *nodeflags; VAL_TYPE(val) = VAL_TYPE(val + 1) = DB1_STR; VAL_NULL(val) = VAL_NULL(val + 1) = 0; VAL_STR(val).s = username->s; @@ -53,10 +57,6 @@ int db_build_userbl_tree(const str *username, const str *domain, const str *tabl VAL_STR(val + 1).s = domain->s; VAL_STR(val + 1).len = domain->len; - db1_res_t *res; - int i; - int n = 0; - void *nodeflags; if (userblacklist_dbf.use_table(userblacklist_dbh, table) < 0) { LM_ERR("cannot use table '%.*s'.\n", table->len, table->s); diff --git a/modules_k/userblacklist/userblacklist.c b/modules_k/userblacklist/userblacklist.c index e893571..83a4f6e 100644 --- a/modules_k/userblacklist/userblacklist.c +++ b/modules_k/userblacklist/userblacklist.c @@ -380,6 +380,8 @@ static int check_blacklist_fixup(void **arg, int arg_no) { char *table = (char *)(*arg); struct dtrie_node_t *node = NULL; + struct check_blacklist_fs_t *new_arg; + if (arg_no != 1) { LM_ERR("wrong number of parameters\n"); return -1; @@ -402,7 +404,7 @@ static int check_blacklist_fixup(void **arg, int arg_no) return -1; } - struct check_blacklist_fs_t *new_arg = (struct check_blacklist_fs_t*)pkg_malloc(sizeof(struct check_blacklist_fs_t)); + new_arg = pkg_malloc(sizeof(struct check_blacklist_fs_t)); if (!new_arg) { PKG_MEM_ERROR; return -1; @@ -475,15 +477,17 @@ static int reload_sources(void) { int result = 0; str tmp; + struct source_t *src; + int n; /* critical section start: avoids dirty reads when updating d-tree */ lock_get(lock); - struct source_t *src = sources->head; + src = sources->head; while (src) { tmp.s = src->table; tmp.len = strlen(src->table); - int n = db_reload_source(&tmp, src->dtrie_root); + n = db_reload_source(&tmp, src->dtrie_root); if (n < 0) { LM_ERR("cannot reload source from '%.*s'\n", tmp.len, tmp.s); result = -1;

15 years, 3 months

git:sr_3.0: siputils(k): gcc 2.95 compile fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 19bd6bd8c4cedc561497c8ff7ccd8d326ca59a2a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19bd6bd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:06:35 2009 +0200 siputils(k): gcc 2.95 compile fixes - variables must be declared at the beginning of a block --- modules_k/siputils/contact_ops.c | 5 ++- modules_k/siputils/ring.c | 46 ++++++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 872c239..a796610 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -210,6 +210,7 @@ decode_contact_header (struct sip_msg *msg,char *unused1,char *unused2) #ifdef DEBUG + str* ruri; fprintf (stdout,"---START--------DECODE CONTACT HEADER-----------------\n"); #endif @@ -227,9 +228,9 @@ decode_contact_header (struct sip_msg *msg,char *unused1,char *unused2) #ifdef DEBUG fprintf (stdout,"Using separator %c\n",separator); - str* ruri; ruri = GET_RURI(msg); - fprintf (stdout,"[len = %d]New uri is->%*.s\n",ruri->len,ruri->len,ruri->s); + fprintf (stdout,"[len = %d]New uri is->%.*s\n", + ruri->len,ruri->len,ruri->s); ruri = &msg->first_line.u.request.uri; fprintf (stdout, "INITIAL.s=[%.*s]\n", ruri->len, ruri->s); #endif diff --git a/modules_k/siputils/ring.c b/modules_k/siputils/ring.c index 8c69a96..7528c12 100644 --- a/modules_k/siputils/ring.c +++ b/modules_k/siputils/ring.c @@ -192,10 +192,10 @@ static void remove_timeout(unsigned int index) static void insert(str callid) { unsigned int index = hash(callid.s, callid.len) & HASHTABLEMASK; - + struct ring_record_t* rr; + remove_timeout(index); - - struct ring_record_t* rr = shm_malloc(sizeof(struct ring_record_t)); + rr = shm_malloc(sizeof(struct ring_record_t)); assert(rr); rr->next = NULL; @@ -224,10 +224,11 @@ static void insert(str callid) static int contains(str callid) { unsigned int index = hash(callid.s, callid.len) & HASHTABLEMASK; + struct ring_record_t* rr; remove_timeout(index); - struct ring_record_t* rr = (*hashtable)[index].head; + rr = (*hashtable)[index].head; while (rr) { if (strncmp(rr->callid, callid.s, callid.len) == 0) return 1; rr = rr->next; @@ -245,25 +246,38 @@ static int conv183(struct sip_msg *msg) /* content-length and content-type headers are removed */ char *del1_start = strstr(msg->buf, "Content-Length:"); char *del2_start = strstr(msg->buf, "Content-Type:"); + char *del1_end; + char *del2_end; + char *eoh; + char *chunk1_start; + int chunk1_len; + char *chunk1_dst; + char *chunk2_start; + int chunk2_len; + char *chunk2_dst; + char *chunk3_start; + int chunk3_len; + char *chunk3_dst; + if (del1_start>del2_start) { char *tmp = del1_start; del1_start = del2_start; del2_start = tmp; } - char *del1_end = NULL; + del1_end = NULL; if (del1_start) { del1_end = strstr(del1_start, "\r\n"); if (del1_end) del1_end+=2; } - char *del2_end = NULL; + del2_end = NULL; if (del2_start) { del2_end = strstr(del2_start, "\r\n"); if (del2_end) del2_end+=2; } /* 180 message does not need session description */ - char *eoh = strstr(msg->buf, "\r\n\r\n"); + eoh = strstr(msg->buf, "\r\n\r\n"); if (eoh) eoh+=2; if ((!del1_start) || (!del2_start) || (!del1_end) || (!del2_end) || (!eoh)) { @@ -288,17 +302,17 @@ static int conv183(struct sip_msg *msg) strncpy(msg->first_line.u.reply.reason.s, "Ringing ", msg->first_line.u.reply.reason.len); /* calculate addresses of chunks to be moved */ - char *chunk1_start = del1_end; - int chunk1_len = del2_start-del1_end; - char *chunk1_dst = del1_start; + chunk1_start = del1_end; + chunk1_len = (int)(long)(del2_start-del1_end); + chunk1_dst = del1_start; - char *chunk2_start = del2_end; - int chunk2_len = eoh-del2_end; - char *chunk2_dst = chunk1_dst+chunk1_len; + chunk2_start = del2_end; + chunk2_len = (int)(long)(eoh-del2_end); + chunk2_dst = chunk1_dst+chunk1_len; - char *chunk3_start = "Content-Length: 0\r\n\r\n"; - int chunk3_len = strlen(chunk3_start); - char *chunk3_dst = chunk2_dst+chunk2_len; + chunk3_start = "Content-Length: 0\r\n\r\n"; + chunk3_len = strlen(chunk3_start); + chunk3_dst = chunk2_dst+chunk2_len; // move chunks memmove(chunk1_dst, chunk1_start, chunk1_len);

15 years, 3 months

git:sr_3.0: statistics(k): minor warning in printf fmt

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 3cacd9314a90bf128a93cad066b4f3db0908fc1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cacd93… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:07:15 2009 +0200 statistics(k): minor warning in printf fmt --- modules_k/statistics/statistics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/statistics/statistics.c b/modules_k/statistics/statistics.c index ee6e61b..9cf0bcb 100644 --- a/modules_k/statistics/statistics.c +++ b/modules_k/statistics/statistics.c @@ -123,7 +123,7 @@ static int fixup_stat(void** param, int param_no) /* is it pv? */ if (s.s[0]=='$') { if (fixup_pvar_null(param, 1)!=0) { - LM_ERR("invalid pv %.s as parameter\n",s.s); + LM_ERR("invalid pv %s as parameter\n",s.s); return E_CFG; } sopv->pv = (pv_spec_t*)(*param);

15 years, 3 months

git:sr_3.0: compile: don't warn on old gcc versions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 18d2bb2c8a72f508a93a0e802f439390731909a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18d2bb2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 16:39:38 2009 +0200 compile: don't warn on old gcc versions --- compiler_opt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/compiler_opt.h b/compiler_opt.h index 7fe2c21..fd39638 100644 --- a/compiler_opt.h +++ b/compiler_opt.h @@ -52,7 +52,7 @@ #else /* __GNUC__ */ -#warning "No compiler optimizations supported try gcc 4.x" +/* #warning "No compiler optimizations supported try gcc 4.x" */ #define likely(expr) (expr) #define unlikely(expr) (expr)

15 years, 3 months

git:sr_3.0: cfgutils(k): gcc 2.95 compile fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 90031b9224f2cf74c37770f6da8300969f4a63dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90031b9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:03:48 2009 +0200 cfgutils(k): gcc 2.95 compile fixes - variables must be declared at the beginning of a block --- modules_k/cfgutils/cfgutils.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules_k/cfgutils/cfgutils.c b/modules_k/cfgutils/cfgutils.c index 8b6f37f..828a460 100644 --- a/modules_k/cfgutils/cfgutils.c +++ b/modules_k/cfgutils/cfgutils.c @@ -488,11 +488,6 @@ error: */ static int MD5File(char *dest, const char *file_name) { - if (!dest || !file_name) { - LM_ERR("invalid parameter value\n"); - return -1; - } - MD5_CTX context; FILE *input; unsigned char buffer[32768]; @@ -500,6 +495,12 @@ static int MD5File(char *dest, const char *file_name) unsigned int counter, size; struct stat stats; + + if (!dest || !file_name) { + LM_ERR("invalid parameter value\n"); + return -1; + } + if (stat(file_name, &stats) != 0) { LM_ERR("could not stat file %s\n", file_name); return -1; @@ -588,12 +589,13 @@ static int get_prob(struct sip_msg *bar, char *foo1, char *foo2) static int rand_event(struct sip_msg *bar, char *foo1, char *foo2) { + double tmp; /* most of the time this will be disabled completly. Tis will also fix the * problem with the corner cases if rand() returned zero or RAND_MAX */ if ((*probability) == 0) return -1; if ((*probability) == 100) return 1; - double tmp = ((double) rand() / RAND_MAX); + tmp = ((double) rand() / RAND_MAX); LM_DBG("generated random %f\n", tmp); if (tmp < ((double) (*probability) / 100)) { LM_DBG("return true\n");

15 years, 3 months

git:sr_3.0: registrar(k): gcc 2.95 compile fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 744634370288693d7c2c0ea88af14aff45add729 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7446343… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:05:33 2009 +0200 registrar(k): gcc 2.95 compile fixes - variables must be declared at the beginning of a block --- modules_k/registrar/common.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/common.c b/modules_k/registrar/common.c index e6cb541..8dbd5e1 100644 --- a/modules_k/registrar/common.c +++ b/modules_k/registrar/common.c @@ -50,8 +50,6 @@ int extract_aor(str* _uri, str* _a) { static char aor_buf[MAX_AOR_LEN]; - memset(aor_buf, 0, MAX_AOR_LEN); - str tmp; struct sip_uri puri; int user_len; @@ -59,6 +57,7 @@ int extract_aor(str* _uri, str* _a) struct usr_avp *avp; str *uri; + memset(aor_buf, 0, MAX_AOR_LEN); if (aor_avp_name.n!=0) { avp = search_first_avp( aor_avp_type, aor_avp_name, &avp_val, 0); if (avp && is_avp_str_val(avp)) {

15 years, 3 months

git:sr_3.0: db_mysql: compile fix for gcc 2.95

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 030ed0e68b4c4a00a9462646b969fb5c5b1fe282 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=030ed0e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 16:41:32 2009 +0200 db_mysql: compile fix for gcc 2.95 - variables must be declared at the beginning of a block --- modules/db_mysql/km_my_con.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index b938117..953c574 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -136,9 +136,10 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) */ void db_mysql_free_connection(struct pool_con* con) { + struct my_con * _c; + if (!con) return; - struct my_con * _c; _c = (struct my_con*) con; if (_c->res) mysql_free_result(_c->res);

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev