sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

git:master: socket_info.h: logging: convert LOG to LM_*

by Ovidiu Sas

Module: sip-router Branch: master Commit: 5e8e40a4737ac305b5df065583e6f94b0359bdb3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e8e40a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 15:16:27 2014 -0400 socket_info.h: logging: convert LOG to LM_* --- socket_info.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/socket_info.h b/socket_info.h index 5961dd9..7ac4260 100644 --- a/socket_info.h +++ b/socket_info.h @@ -116,7 +116,7 @@ char* get_valid_proto_name(unsigned short proto); static inline int next_proto(unsigned short proto) { if (proto>PROTO_LAST) - LOG(L_ERR, "ERROR: next_proto: unknown proto %d\n", proto); + LM_ERR("unknown proto %d\n", proto); else return nxt_proto[proto]; return 0;

9 years, 7 months

git:master: tcp_ev.h: logging: convert LOG to LM_*

by Ovidiu Sas

Module: sip-router Branch: master Commit: 9ffdc951d391fb511da0932c14c00465b1cabd0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ffdc95… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 15:15:19 2014 -0400 tcp_ev.h: logging: convert LOG to LM_* --- tcp_ev.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tcp_ev.h b/tcp_ev.h index 34e401f..a25d59f 100644 --- a/tcp_ev.h +++ b/tcp_ev.h @@ -50,27 +50,27 @@ * @param proto - protocol used */ #define TCP_EV_CONNECT_RST(err, lip, lport, dst, proto) \ - LOG(L_ERR, "connect %s failed (RST) %s\n", \ + LM_ERR("connect %s failed (RST) %s\n", \ su2a(dst, sizeof(*(dst))), (err)?strerror(err):"") /** a connect failed because the remote host/network is unreachable. */ #define TCP_EV_CONNECT_UNREACHABLE(err, lip, lport, dst, proto) \ - LOG(L_ERR, "connect %s failed (unreachable) %s\n", \ + LM_ERR("connect %s failed (unreachable) %s\n", \ su2a(dst, sizeof(*(dst))), (err)?strerror(err):"") /** a connect attempt did timeout. */ #define TCP_EV_CONNECT_TIMEOUT(err, lip, lport, dst, proto) \ - LOG(L_ERR, "connect %s failed (timeout) %s\n", \ + LM_ERR("connect %s failed (timeout) %s\n", \ su2a(dst, sizeof(*(dst))), (err)?strerror(err):"") /** a connect attempt failed because the local ports are exhausted. */ #define TCP_EV_CONNECT_NO_MORE_PORTS(err, lip, lport, dst, proto) \ - LOG(L_ERR, "connect %s failed (no more ports) %s\n", \ + LM_ERR("connect %s failed (no more ports) %s\n", \ su2a(dst, sizeof(*(dst))), (err)?strerror(err):"") /** a connect attempt failed for some unknown reason. */ #define TCP_EV_CONNECT_ERR(err, lip, lport, dst, proto) \ - LOG(L_ERR, "connect %s failed %s\n", \ + LM_ERR("connect %s failed %s\n", \ su2a(dst, sizeof(*(dst))), (err)?strerror(err):"")

9 years, 7 months

git:master: lock_alloc.h: logging: convert LOG to LM_*

by Ovidiu Sas

Module: sip-router Branch: master Commit: 4c7fb7768edb9542217695dc3be47c7457e78c3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c7fb77… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 15:14:03 2014 -0400 lock_alloc.h: logging: convert LOG to LM_* --- lock_alloc.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lock_alloc.h b/lock_alloc.h index 12be25c..84e9dac 100644 --- a/lock_alloc.h +++ b/lock_alloc.h @@ -71,7 +71,7 @@ inline static gen_lock_set_t* lock_set_alloc(int n) gen_lock_set_t* ls; ls=(gen_lock_set_t*)shm_malloc(sizeof(gen_lock_set_t)+n*sizeof(gen_lock_t)); if (ls==0){ - LOG(L_CRIT, "ERROR: lock_set_alloc (FL): could not allocate lock_set\n"); + LM_CRIT("could not allocate lock_set\n"); }else{ ls->locks=(gen_lock_t*)((char*)ls+sizeof(gen_lock_set_t)); ls->size=n;

9 years, 7 months

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

by Ovidiu Sas

Module: sip-router Branch: master Commit: a7652a586b7dc03369b0824b08ac721c02b83dc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7652a5… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 15:12:27 2014 -0400 pass_fd.c: logging: convert LOG to LM_* --- pass_fd.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pass_fd.c b/pass_fd.c index 05bbd2d..461bd7f 100644 --- a/pass_fd.c +++ b/pass_fd.c @@ -99,7 +99,7 @@ again: if (errno==EINTR) goto again; /* signal, try again */ /* on EAGAIN just return (let the caller know) */ if ((errno==EAGAIN)||(errno==EWOULDBLOCK)) return n; - LOG(L_CRIT, "ERROR: recv_all: 1st recv on %d failed: %s\n", + LM_CRIT("1st recv on %d failed: %s\n", socket, strerror(errno)); return n; } @@ -124,13 +124,13 @@ poll_retry: n=poll(&pfd, 1, -1); if (n<0){ if (errno==EINTR) goto poll_retry; - LOG(L_CRIT, "ERROR: recv_all: poll on %d failed: %s\n", - socket, strerror(errno)); + LM_CRIT("poll on %d failed: %s\n", + socket, strerror(errno)); return n; } else continue; /* try recv again */ } #endif /* NO_MSG_WAITALL */ - LOG(L_CRIT, "ERROR: recv_all: 2nd recv on %d failed: %s\n", + LM_CRIT("2nd recv on %d failed: %s\n", socket, strerror(errno)); return n; } @@ -153,7 +153,7 @@ again: /* error */ if (errno==EINTR) goto again; /* signal, try again */ if ((errno!=EAGAIN) &&(errno!=EWOULDBLOCK)) - LOG(L_CRIT, "ERROR: send_all: send on %d failed: %s\n", + LM_CRIT("send on %d failed: %s\n", socket, strerror(errno)); } return n; @@ -205,8 +205,8 @@ again: if (ret<0){ if (errno==EINTR) goto again; if ((errno!=EAGAIN) && (errno!=EWOULDBLOCK)) - LOG(L_CRIT, "ERROR: send_fd: sendmsg failed sending %d on %d:" - " %s (%d)\n", fd, unix_socket, strerror(errno), errno); + LM_CRIT("sendmsg failed sending %d on %d: %s (%d)\n", + fd, unix_socket, strerror(errno), errno); } return ret; @@ -278,24 +278,24 @@ poll_again: ret=poll(&pfd, 1, -1); if (ret>=0) goto again; else if (errno==EINTR) goto poll_again; - LOG(L_CRIT, "ERROR: receive_fd: poll on %d failed: %s\n", - unix_socket, strerror(errno)); + LM_CRIT("poll on %d failed: %s\n", + unix_socket, strerror(errno)); } #endif /* NO_MSG_WAITALL */ goto error; } - LOG(L_CRIT, "ERROR: receive_fd: recvmsg on %d failed: %s\n", + LM_CRIT("recvmsg on %d failed: %s\n", unix_socket, strerror(errno)); goto error; } if (ret==0){ /* EOF */ - LOG(L_CRIT, "ERROR: receive_fd: EOF on %d\n", unix_socket); + LM_CRIT("EOF on %d\n", unix_socket); goto error; } if (ret<data_len){ - LOG(L_WARN, "WARNING: receive_fd: too few bytes read (%d from %d)" - "trying to fix...\n", ret, data_len); + LM_WARN("too few bytes read (%d from %d) trying to fix...\n", + ret, data_len); /* blocking recv_all */ n=recv_all(unix_socket, (char*)data+ret, data_len-ret, MSG_WAITALL); if (n>=0) ret+=n; @@ -309,21 +309,20 @@ poll_again: cmsg=CMSG_FIRSTHDR(&msg); if ((cmsg!=0) && (cmsg->cmsg_len==CMSG_LEN(sizeof(new_fd)))){ if (cmsg->cmsg_type!= SCM_RIGHTS){ - LOG(L_ERR, "ERROR: receive_fd: msg control type != SCM_RIGHTS\n"); + LM_ERR("msg control type != SCM_RIGHTS\n"); ret=-1; goto error; } if (cmsg->cmsg_level!= SOL_SOCKET){ - LOG(L_ERR, "ERROR: receive_fd: msg level != SOL_SOCKET\n"); + LM_ERR("msg level != SOL_SOCKET\n"); ret=-1; goto error; } pi=(int*) CMSG_DATA(cmsg); *fd=*pi; }else{ - /* - LOG(L_ERR, "ERROR: receive_fd: no descriptor passed, cmsg=%p," - "len=%d\n", cmsg, (unsigned)cmsg->cmsg_len); */ + /*LM_ERR("no descriptor passed, cmsg=%p, len=%d\n", + cmsg, (unsigned)cmsg->cmsg_len); */ *fd=-1; /* it's not really an error */ } @@ -331,8 +330,8 @@ poll_again: if (msg.msg_accrightslen==sizeof(int)){ *fd=new_fd; }else{ - /*LOG(L_ERR, "ERROR: receive_fd: no descriptor passed," - " accrightslen=%d\n", msg.msg_accrightslen); */ + /*LM_ERR("no descriptor passed, accrightslen=%d\n", + msg.msg_accrightslen); */ *fd=-1; } #endif

9 years, 7 months

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

by Ovidiu Sas

Module: sip-router Branch: master Commit: 4b3179f1bdd162c9220d1405efd400831c71548b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b3179f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 15:00:38 2014 -0400 str.c: logging: convert LOG to LM_* --- str.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/str.c b/str.c index 913dc7b..a7fcf93 100644 --- a/str.c +++ b/str.c @@ -33,7 +33,7 @@ int str_append(str *orig, str *suffix, str *dest) dest->s = pkg_malloc(sizeof(char)*dest->len); if(dest->s==NULL) { - LOG(L_ERR, "memory allocation failure\n"); + LM_ERR("memory allocation failure\n"); return -1; } if(orig->len>0)

9 years, 7 months

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

by Ovidiu Sas

Module: sip-router Branch: master Commit: 17ae94369cff94b323c915d9d0b6a42b44c3dea7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17ae943… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 14:59:28 2014 -0400 dprint.c: logging: convert LOG to LM_* --- dprint.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dprint.c b/dprint.c index 4906001..caf39c3 100644 --- a/dprint.c +++ b/dprint.c @@ -98,8 +98,7 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val) int i; if ((i = str2facility((char *)*val)) == -1) { - LOG(L_ERR, "log_facility_fixup: invalid log facility: %s\n", - (char *)*val); + LM_ERR("invalid log facility: %s\n", (char *)*val); return -1; } *val = (void *)(long)i;

9 years, 7 months

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

by Ovidiu Sas

Module: sip-router Branch: master Commit: e0b5e4559638e6935e92ecc2ff1a88f084983522 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0b5e45… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 14:58:05 2014 -0400 crc.c: logging: convert LOG to LM_* --- crc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/crc.c b/crc.c index fb48534..7d63cad 100644 --- a/crc.c +++ b/crc.c @@ -243,7 +243,7 @@ void crcitt_string_array( char *dst, str src[], int size ) ccitt = ~ccitt; if (int2reverse_hex( &dst, &str_len, ccitt )==-1) { /* bug ... printed ccitt value longer than CRC32_LEN */ - LOG(L_CRIT, "ERROR: crcitt_string_array: string conversion incomplete\n"); + LM_CRIT("string conversion incomplete\n"); } /* padding */ while( str_len ) {

9 years, 7 months

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

by Ovidiu Sas

Module: sip-router Branch: master Commit: 94b74cf8bf80c1fc17eebef8b5b0767a05234de0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94b74cf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 14:55:49 2014 -0400 id.c: logging: convert LOG to LM_* --- id.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/id.c b/id.c index 4bc49ca..7b9dbbb 100644 --- a/id.c +++ b/id.c @@ -100,17 +100,17 @@ int get_from_uid(str* uid, struct sip_msg* msg) } else { /* Get From URI username */ if (parse_from_header(msg) < 0) { - LOG(L_ERR, "get_from_uid: Error while parsing From header\n"); + LM_ERR("unable to parse From header\n"); return -1; } from = get_from(msg); if (parse_uri(from->uri.s, from->uri.len, &puri) == -1) { - LOG(L_ERR, "get_from_uid: Error while parsing From URI\n"); + LM_ERR("unable to parsie From URI\n"); return -1; } if (puri.user.len > MAX_URI_SIZE) { - LOG(L_ERR, "get_from_uid: Username too long\n"); + LM_ERR("username too long\n"); return -1; } memcpy(buf, puri.user.s, puri.user.len);

9 years, 7 months

git:master: name_alias.h: logging: convert LOG to LM_*

by Ovidiu Sas

Module: sip-router Branch: master Commit: 51e77d3ef5527bd2907f37dddfea384def9c329f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51e77d3… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 14:51:32 2014 -0400 name_alias.h: logging: convert LOG to LM_* --- name_alias.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/name_alias.h b/name_alias.h index 42c9272..3493024 100644 --- a/name_alias.h +++ b/name_alias.h @@ -107,7 +107,7 @@ static inline int add_alias(char* name, int len, unsigned short port, aliases=a; return 1; error: - LOG(L_ERR, "ERROR: add_alias: memory allocation error\n"); + LM_ERR("memory allocation error\n"); if (a) pkg_free(a); return -1; }

9 years, 7 months

git:master: char_msg_val.h: concatenate ERR log

by Ovidiu Sas

Module: sip-router Branch: master Commit: 6d239c28060e8be0cab99637f8f7240069530990 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d239c2… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 14:49:35 2014 -0400 char_msg_val.h: concatenate ERR log --- char_msg_val.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/char_msg_val.h b/char_msg_val.h index c265bd1..9565617 100644 --- a/char_msg_val.h +++ b/char_msg_val.h @@ -57,8 +57,7 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv ) str src[8]; if (unlikely(!check_transaction_quadruple(msg))) { - LM_ERR("can't calculate char_value due " - "to a parsing error\n"); + LM_ERR("can't calculate char_value due to a parsing error\n"); memset( cv, '0', MD5_LEN ); return 0; }

9 years, 7 months

← Newer
1
...
32
33
34
35
36
37
38
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