sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
382 discussions

git:master: msg_translator.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: eeeb3693f93bae48f300ca916668510cf329bd69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eeeb369… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 20:38:22 2014 -0400 msg_translator.c: logging: convert LOG to LM_* --- msg_translator.c | 214 +++++++++++++++++++++--------------------------------- 1 files changed, 83 insertions(+), 131 deletions(-) … [View More]

1 0

git:master: flags.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 2990e54f50e071101ced7b63c81f89045053f42f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2990e54… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 20:20:49 2014 -0400 flags.c: logging: convert LOG to LM_* --- flags.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/flags.c b/flags.c index … [View More]4d1f881..883e312 100644 --- a/flags.c +++ b/flags.c @@ -70,13 +70,11 @@ int isflagset( struct sip_msg* msg, flag_t flag ) { int flag_in_range( flag_t flag ) { if (flag > MAX_FLAG ) { - LOG(L_ERR, "ERROR: message flag %d too high; MAX=%d\n", - flag, MAX_FLAG ); + LM_ERR("message flag %d too high; MAX=%d\n", flag, MAX_FLAG ); return 0; } if ((int)flag<0) { - LOG(L_ERR, "ERROR: message flag (%d) must be in range %d..%d\n", - flag, 0, MAX_FLAG ); + LM_ERR("message flag (%d) must be in range 0..%d\n", flag, MAX_FLAG ); return 0; } return 1; @@ -152,8 +150,7 @@ int check_flag(int n) if (!flag_in_range(n)) return -1; if (registered_flags[n]){ - LOG(L_WARN, "WARNING: check_flag: flag %d is already used by " - " a named flag\n", n); + LM_WARN("flag %d is already used by a named flag\n", n); } return 0; } @@ -219,20 +216,18 @@ int register_flag(char* name, int pos) /* check if the name already exists */ e=flag_search(&name2flags[h], name, len); if (e){ - LOG(L_ERR, "ERROR: register_flag: flag %.*s already registered\n", - len, name); + LM_ERR("flag %.*s already registered\n", len, name); return -2; } /* check if there is already another flag registered at pos */ if (pos!=-1){ if ((pos<0) || (pos>MAX_FLAG)){ - LOG(L_ERR, "ERROR: register_flag: invalid flag %.*s " - "position(%d)\n", len, name, pos); + LM_ERR("invalid flag %.*s position(%d)\n", len, name, pos); return -4; } if (registered_flags[pos]!=0){ - LOG(L_WARN, "WARNING: register_flag: %.*s: flag %d already in " - "use under another name\n", len, name, pos); + LM_WARN("%.*s: flag %d already in use under another name\n", + len, name, pos); /* continue */ } }else{ @@ -246,8 +241,7 @@ int register_flag(char* name, int pos) } } if (pos==-1){ - LOG(L_ERR, "ERROR: register_flag: could not register %.*s" - " - too many flags\n", len, name); + LM_ERR("could not register %.*s - too many flags\n", len, name); return -5; } } @@ -255,7 +249,7 @@ int register_flag(char* name, int pos) e=pkg_malloc(sizeof(struct flag_entry)); if (e==0){ - LOG(L_ERR, "ERROR: register_flag: memory allocation failure\n"); + LM_ERR("memory allocation failure\n"); return -3; } e->name.s=name; @@ -279,8 +273,7 @@ static int fixup_t_flag(void** param, int param_no) DBG("DEBUG: fixing flag: %s\n", (char *) (*param)); if (param_no!=1) { - LOG(L_ERR, "ERROR: TM module: only parameter #1 for flags can be" - " fixed\n"); + LM_ERR("TM module: only parameter #1 for flags can be fixed\n"); return E_BUG; }; @@ -305,7 +298,7 @@ static int fixup_t_flag(void** param, int param_no) while ( *c && *c>='0' && *c<='9' ) { *code = *code*10+ *c-'0'; if (*code > (sizeof( flag_t ) * CHAR_BIT - 1 )) { - LOG(L_ERR, "ERROR: TM module: too big flag number: %s; MAX=%d\n", + LM_ERR("TM module: too big flag number: %s; MAX=%d\n", (char *) (*param), sizeof( flag_t ) * CHAR_BIT - 1 ); goto error; } @@ -315,12 +308,12 @@ static int fixup_t_flag(void** param, int param_no) while ( *c && (*c==' ' || *c=='\t')) c++; /* terminating whitespaces */ if ( *code == 0 ) { - LOG(L_ERR, "ERROR: TM module: bad flag number: %s\n", (char *) (*param)); + LM_ERR("TM module: bad flag number: %s\n", (char *) (*param)); goto error; } if (*code < FL_MAX && token==0) { - LOG(L_ERR, "ERROR: TM module: too high flag number: %s (%d)\n; lower number" + LM_ERR("TM module: too high flag number: %s (%d)\n; lower number" " bellow %d reserved\n", (char *) (*param), *code, FL_MAX ); goto error; } [View Less]

1 0

git:master: dst_blacklist.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 08d458183d8c6c5dea8cae3f4256676988b8473d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08d4581… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 20:16:23 2014 -0400 dst_blacklist.c: logging: convert LOG to LM_* --- dst_blacklist.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dst_blacklist.c b/dst_blacklist.c … [View More]

1 0

git:master: dns_cache.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: e3d78d57cdba73c9374e996813d78d4485c940c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3d78d5… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 20:14:38 2014 -0400 dns_cache.c: logging: convert LOG to LM_* --- dns_cache.c | 139 +++++++++++++++++++++++++--------------------------------- 1 files changed, 60 insertions(+), 79 deletions(-) Diff: … [View More]

1 0

rtpengine alt stream question
by Alex Balashov 03 Oct '14

03 Oct '14

Hello, (Sorry for re-posting this here from sr-users; in retrospect, it seemed more appropriate to do so.) I recently encountered SDP attributes that look like this: Media Attribute (a): alt:1 3 : njfxofkg bavpjfxg 192.168.2.59 41978 Media Attribute (a): alt:2 2 : fpukfyaj dqmiarjx 192.168.111.1 41978 Media Attribute (a): alt:3 1 : euvrwenk jctmhavh 192.168.238.1 41978 I was not familiar with these. However, RFC 4796 says: alt: the media stream is taken from the … [View More]

2 2

git:master: error.c: logging: convert LOG to LM_*
by Ovidiu Sas 03 Oct '14

03 Oct '14

Module: sip-router Branch: master Commit: 4c2e5693fe00f0326a33954553751d59b42166d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c2e569… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:53:34 2014 -0400 error.c: logging: convert LOG to LM_* --- error.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/error.c b/error.c index e203f18..e54c3d1 100644 --- a/… [View More]

1 0

git:master: data_lump_rpl.c: logging: convert LOG to LM_*
by Ovidiu Sas 03 Oct '14

03 Oct '14

Module: sip-router Branch: master Commit: 1e3aab0b17f1a5d2eec6a6c84a01361dd4c7fdf8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e3aab0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:50:53 2014 -0400 data_lump_rpl.c: logging: convert LOG to LM_* --- data_lump_rpl.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data_lump_rpl.c b/data_lump_rpl.c … [View More]

1 0

git:master: data_lump.c: logging: convert LOG to LM_*
by Ovidiu Sas 03 Oct '14

03 Oct '14

Module: sip-router Branch: master Commit: 7fb04ae669a969edec08e228800ff0ebbda8372b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fb04ae… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:49:29 2014 -0400 data_lump.c: logging: convert LOG to LM_* --- data_lump.c | 63 ++++++++++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 33 deletions(-) diff -… [View More]-git a/data_lump.c b/data_lump.c index 995b1d8..5faee6f 100644 --- a/data_lump.c +++ b/data_lump.c @@ -68,7 +68,7 @@ struct lump* append_new_lump(struct lump** list, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ - LOG(L_ERR, "ERROR: append_new_lump: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } @@ -94,7 +94,7 @@ struct lump* add_new_lump(struct lump** list, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ - LOG(L_ERR, "ERROR: add_new_lump: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } @@ -119,7 +119,7 @@ struct lump* insert_new_lump(struct lump** list, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ - LOG(L_ERR, "ERROR: insert_new_lump: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -144,7 +144,7 @@ struct lump* insert_new_lump_after( struct lump* after, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR, "ERROR: insert_new_lump_after: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -169,7 +169,7 @@ struct lump* insert_new_lump_before( struct lump* before, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR,"ERROR: insert_new_lump_before: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -194,7 +194,7 @@ struct lump* insert_subst_lump_after( struct lump* after, enum lump_subst subst, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR, "ERROR: insert_new_lump_after: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -220,7 +220,7 @@ struct lump* insert_subst_lump_before( struct lump* before, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR,"ERROR: insert_new_lump_before: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -245,7 +245,7 @@ struct lump* insert_cond_lump_after( struct lump* after, enum lump_conditions c, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR, "ERROR: insert_new_lump_after: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -271,7 +271,7 @@ struct lump* insert_cond_lump_before( struct lump* before, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR,"ERROR: insert_new_lump_before: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -299,23 +299,22 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ /* extra checks */ if (offset>msg->len){ - LOG(L_CRIT, "BUG: del_lump: offset exceeds message size (%d > %d)" - " aborting...\n", offset, msg->len); + LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + offset, msg->len); abort(); } if (offset+len>msg->len){ - LOG(L_CRIT, " BUG: del_lump: offset + len exceeds message" - " size (%d + %d > %d)\n", offset, len, msg->len); + LM_CRIT("offset + len exceeds message size (%d + %d > %d)\n", + offset, len, msg->len); abort(); } if (len==0){ - LOG(L_WARN, "WARNING: del_lump: called with 0 len (offset =%d)\n", - offset); + LM_WARN("0 len (offset=%d)\n", offset); } tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ - LOG(L_ERR, "ERROR: del_lump: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -356,21 +355,21 @@ struct lump* anchor_lump(struct sip_msg* msg, int offset, int len, enum _hdr_typ /* extra checks */ if (offset>msg->len){ - LOG(L_CRIT, "BUG: anchor_lump: offset exceeds message size (%d > %d)" - " aborting...\n", offset, msg->len); + LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + offset, msg->len); abort(); } if (len){ - LOG(L_WARN, "WARNING: anchor_lump: called with len !=0 (%d)\n", len); + LM_WARN("len !=0 (%d)\n", len); if (offset+len>msg->len) - LOG(L_WARN, "WARNING: anchor_lump: offset + len exceeds message" - " size (%d + %d > %d)\n", offset, len, msg->len); + LM_WARN("offset + len exceeds message size (%d + %d > %d)\n", + offset, len, msg->len); } tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR, "ERROR: anchor_lump: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -416,15 +415,15 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty /* extra checks */ if (offset>msg->len){ - LOG(L_CRIT, "BUG: anchor_lump2: offset exceeds message size (%d > %d)" - " aborting...\n", offset, msg->len); + LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + offset, msg->len); abort(); } if (len){ - LOG(L_WARN, "WARNING: anchor_lump2: called with len !=0 (%d)\n", len); + LM_WARN("len !=0 (%d)\n", len); if (offset+len>msg->len) - LOG(L_WARN, "WARNING: anchor_lump2: offset + len exceeds message" - " size (%d + %d > %d)\n", offset, len, msg->len); + LM_WARN("offset + len exceeds message size (%d + %d > %d)\n", + offset, len, msg->len); } prev=0; @@ -448,7 +447,7 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ ser_error=E_OUT_OF_MEM; - LOG(L_ERR, "ERROR: anchor_lump2: out of memory\n"); + LM_ERR("out of memory\n"); return 0; } memset(tmp,0,sizeof(struct lump)); @@ -472,8 +471,7 @@ void free_lump(struct lump* lmp) if (lmp && (lmp->op==LUMP_ADD)){ if (lmp->u.value){ if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ - LOG(L_CRIT, "BUG: free_lump: called on a not free-able lump:" - "%p flags=%x\n", lmp, lmp->flags); + LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); }else{ pkg_free(lmp->u.value); @@ -574,8 +572,7 @@ static struct lump *dup_lump_list_r( struct lump *l, LD_AFTER, &deep_error); break; default: - LOG(L_CRIT, "BUG: dup_limp_list_r: unknown dir: " - "%d\n", dir ); + LM_CRIT("unknown dir: %d\n", dir ); deep_error=1; } if (deep_error) goto deeperror; @@ -584,7 +581,7 @@ static struct lump *dup_lump_list_r( struct lump *l, return new_lump; deeperror: - LOG(L_ERR, "ERROR: dup_lump_list_r: out of mem\n"); + LM_ERR("out of mem\n"); free_shallow_lump(new_lump); *error=1; return 0; [View Less]

1 0

git:master: daemonize.c: logging: convert LOG to LM_*
by Ovidiu Sas 03 Oct '14

03 Oct '14

Module: sip-router Branch: master Commit: b908f660e11d67b1d6a5e39b1add6e8fba591981 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b908f66… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:41:36 2014 -0400 daemonize.c: logging: convert LOG to LM_* --- daemonize.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/daemonize.c b/daemonize.c index 23c1473..ef8a46c … [View More]

1 0

git:master: main.c: logging: convert LOG to LM_*
by Ovidiu Sas 03 Oct '14

03 Oct '14

Module: sip-router Branch: master Commit: a2a91d7d6e4ae84a93f802545e5db8a902616df1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2a91d7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:39:30 2014 -0400 main.c: logging: convert LOG to LM_* --- main.c | 116 ++++++++++++++++++++++++++++++---------------------------------- 1 files changed, 54 insertions(+), 62 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a2a…

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014