sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

git:master: flags.c: logging: convert LOG to LM_*

by Ovidiu Sas

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 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; }

9 years, 7 months

git:master: dst_blacklist.c: logging: convert LOG to LM_*

by Ovidiu Sas

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 index 2171884..a69d215 100644 --- a/dst_blacklist.c +++ b/dst_blacklist.c @@ -222,7 +222,7 @@ static int init_blacklist_hooks() goto error; return 0; error: - LOG(L_ERR, "blacklist_hooks: failure initializing internal lists\n"); + LM_ERR("failure initializing internal lists\n"); destroy_blacklist_hooks(); return -1; } @@ -240,7 +240,7 @@ int register_blacklist_hook(struct blacklist_hook *h, int type) int new_max_hooks; if (dst_blacklist_init==0) { - LOG(L_ERR, "register_blacklist_hook: blacklist is turned off, " + LM_ERR("blacklist is turned off, " "the hook cannot be registered\n"); goto error; } @@ -500,7 +500,7 @@ int init_dst_blacklist() if (blst_timer_interval){ timer_init(blst_timer_h, blst_timer, 0 ,0); /* slow timer */ if (timer_add(blst_timer_h, S_TO_TICKS(blst_timer_interval))<0){ - LOG(L_CRIT, "BUG: init_dst_blacklist: failed to add the timer\n"); + LM_CRIT("failed to add the timer\n"); timer_free(blst_timer_h); blst_timer_h=0; goto error; @@ -1173,8 +1173,7 @@ void dst_blst_add(rpc_t* rpc, void* ctx) int use_dst_blacklist_fixup(void *handle, str *gname, str *name, void **val) { if ((int)(long)(*val) && !dst_blacklist_init) { - LOG(L_ERR, "ERROR: use_dst_blacklist_fixup(): " - "dst blacklist is turned off by dst_blacklist_init=0, " + LM_ERR("dst blacklist is turned off by dst_blacklist_init=0, " "it cannot be enabled runtime.\n"); return -1; }

9 years, 7 months

git:master: dns_cache.c: logging: convert LOG to LM_*

by Ovidiu Sas

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: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e3d…

9 years, 7 months

rtpengine alt stream question

by Alex Balashov

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 alternative source. A typical use case for this is an event where the ambient sound is separated from the main sound. The alternative audio stream could be, for example, the sound of a jungle. Another example is the video of a conference room, while the main stream carries the video of the speaker. This is similar to the 'live' role in H.239. RFC 6064 http://tools.ietf.org/html/rfc6064#section-4.4 speaks to this a little as well. This does not really make any clearer to me what these mean in this scenario, and unfortunately I cannot find out from the user. My question is: I assume that rtpengine (both Kamailio and daemon-side) does not support this, correct? Are there any plans to in the future? Can anyone with more experience with video, perhaps, give some insight into the meaning and application of this attribute? Thanks! -- Alex -- Alex Balashov - Principal Evariste Systems LLC Tel: +1-678-954-0670 Web: http://www.evaristesys.com/, http://www.alexbalashov.com/ Please be kind to the English language: http://www.entrepreneur.com/article/232906

9 years, 7 months

git:master: error.c: logging: convert LOG to LM_*

by Ovidiu Sas

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/error.c +++ b/error.c @@ -216,7 +216,7 @@ void get_reply_status( str *status, struct sip_msg *reply, int code ) status->s=0; if (reply==0) { - LOG(L_CRIT, "BUG: get_reply_status called with 0 msg\n"); + LM_CRIT("0 msg\n"); return; } @@ -229,7 +229,7 @@ void get_reply_status( str *status, struct sip_msg *reply, int code ) status->len=phrase.len+3/*code*/+1/*space*/; status->s=pkg_malloc(status->len+1/*ZT */); if (!status->s) { - LOG(L_ERR, "ERROR: get_reply_status: no mem\n"); + LM_ERR("no mem\n"); return; } status->s[3]=' ';

9 years, 7 months

git:master: data_lump_rpl.c: logging: convert LOG to LM_*

by Ovidiu Sas

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 index d47c9f4..c5231e5 100644 --- a/data_lump_rpl.c +++ b/data_lump_rpl.c @@ -60,11 +60,11 @@ struct lump_rpl** add_lump_rpl2(struct sip_msg *msg, char *s, /* some checking */ if ( (flags&(LUMP_RPL_HDR|LUMP_RPL_BODY))==(LUMP_RPL_HDR|LUMP_RPL_BODY) || (flags&(LUMP_RPL_HDR|LUMP_RPL_BODY))==0 || (flags&LUMP_RPL_SHMEM) ) { - LOG(L_ERR,"ERROR:add_lump_rpl: bad flags combination (%d)!\n",flags); + LM_ERR("bad flags combination (%d)!\n",flags); goto error; } if (len<=0 || s==0) { - LOG(L_ERR,"ERROR:add_lump_rpl: I won't add an empty lump!\n"); + LM_ERR("I won't add an empty lump!\n"); goto error; } @@ -72,7 +72,7 @@ struct lump_rpl** add_lump_rpl2(struct sip_msg *msg, char *s, lump = (struct lump_rpl*) pkg_malloc ( sizeof(struct lump_rpl) + ((flags&LUMP_RPL_NODUP)?0:len) ); if (!lump) { - LOG(L_ERR,"ERROR:add_lump_rpl : no free pkg memory !\n"); + LM_ERR("no free pkg memory !\n"); goto error; } @@ -96,8 +96,7 @@ struct lump_rpl** add_lump_rpl2(struct sip_msg *msg, char *s, else for(foo=msg->reply_lump; ;foo=foo->next) { if (foo->flags&LUMP_RPL_BODY) { - LOG(L_ERR,"ERROR:add_lump_rpl: LUMP_RPL_BODY " - "already added!\n"); + LM_ERR("LUMP_RPL_BODY already added!\n"); pkg_free(lump); goto error; }

9 years, 7 months

git:master: data_lump.c: logging: convert LOG to LM_*

by Ovidiu Sas

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 --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;

9 years, 7 months

git:master: daemonize.c: logging: convert LOG to LM_*

by Ovidiu Sas

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 100644 --- a/daemonize.c +++ b/daemonize.c @@ -635,8 +635,7 @@ int set_rt_prio(int prio, int policy) sched_policy=SCHED_FIFO; break; default: - LM_WARN("WARNING: invalid scheduling policy,using" - " SCHED_OTHER\n"); + LM_WARN("invalid scheduling policy,using SCHED_OTHER\n"); sched_policy=SCHED_OTHER; } memset(&sch_p, 0, sizeof(sch_p));

9 years, 7 months

git:master: main.c: logging: convert LOG to LM_*

by Ovidiu Sas

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…

9 years, 7 months

git:master: route_struct.c: logging: convert LOG to LM_*

by Ovidiu Sas

Module: sip-router Branch: master Commit: 3a7f6bb32cdd82d11e38cd9dd8d1658666adf7cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a7f6bb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:26:34 2014 -0400 route_struct.c: logging: convert LOG to LM_* --- route_struct.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/route_struct.c b/route_struct.c index 39c0629..11c11fa 100644 --- a/route_struct.c +++ b/route_struct.c @@ -94,7 +94,7 @@ struct expr* mk_exp(int op, struct expr* left, struct expr* right) e->r.expr=right; return e; error: - LOG(L_CRIT, "ERROR: mk_exp: memory allocation failure\n"); + LM_CRIT("memory allocation failure\n"); return 0; } @@ -116,7 +116,7 @@ struct expr* mk_exp_rve(int op, void* left, void* right) } return e; error: - LOG(L_CRIT, "ERROR: mk_exp_rve: memory allocation failure\n"); + LM_CRIT("memory allocation failure\n"); return 0; } @@ -134,7 +134,7 @@ struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, e->r.param=rparam; return e; error: - LOG(L_CRIT, "ERROR: mk_elem: memory allocation failure\n"); + LM_CRIT("memory allocation failure\n"); return 0; } @@ -171,7 +171,7 @@ struct action* mk_action(enum action_type type, int count, ...) return a; error: - LOG(L_CRIT, "ERROR: mk_action: memory allocation failure\n"); + LM_CRIT("memory allocation failure\n"); return 0; } @@ -192,7 +192,7 @@ struct action* append_action(struct action* a, struct action* b) void print_expr(struct expr* exp) { if (exp==0){ - LOG(L_CRIT, "ERROR: print_expr: null expression!\n"); + LM_CRIT("null expression!\n"); return; } if (exp->type==ELEM_T){

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014