sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

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

03 Oct '14

Module: sip-router Branch: master Commit: 0b6225253049c0a8af2630bd40f0b908634765cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b62252… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:24:17 2014 -0400 sip_msg_clone.c: logging: convert LOG to LM_* --- sip_msg_clone.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 40a5e90..8b3f13a 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -335,7 +335,7 @@ static inline int clone_authorized_hooks(struct sip_msg* new, while(ptr) { if (ptr == hook1) { if (!new->authorization || !new->authorization->parsed) { - LOG(L_CRIT, "BUG: Error in message cloner (authorization)\n"); + LM_CRIT("Error in message cloner (authorization)\n"); return -1; } ((struct auth_body*)new->authorization->parsed)->authorized = @@ -345,7 +345,7 @@ static inline int clone_authorized_hooks(struct sip_msg* new, if (ptr == hook2) { if (!new->proxy_auth || !new->proxy_auth->parsed) { - LOG(L_CRIT, "BUG: Error in message cloner (proxy_auth)\n"); + LM_CRIT("Error in message cloner (proxy_auth)\n"); return -1; } ((struct auth_body*)new->proxy_auth->parsed)->authorized = @@ -504,7 +504,7 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, p=(char *)shm_malloc(len); if (!p) { - LOG(L_ERR , "ERROR: sip_msg_cloner: cannot allocate memory\n" ); + LM_ERR("cannot allocate memory\n" ); return 0; } if (sip_msg_len) @@ -987,7 +987,7 @@ int msg_lump_cloner(struct sip_msg *pkg_msg, p=(char *)shm_malloc(len); if (!p) { - LOG(L_ERR, "ERROR: msg_lump_cloner: cannot allocate memory\n" ); + LM_ERR("cannot allocate memory\n" ); return -1; }

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: b661d51d28471237747bc4dca30b35e4b176d412 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b661d51… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:22:31 2014 -0400 lock_ops.c: logging: convert LOG to LM_* --- lock_ops.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lock_ops.c b/lock_ops.c index 1f0cbe3..3392c58 100644 --- a/lock_ops.c +++ b/lock_ops.c @@ -55,9 +55,8 @@ int init_lock_ops(void) os_ver=get_sys_version(0, 0, 0); if (os_ver < 0x020546 ){ /* if ver < 2.5.70 */ - LOG(L_CRIT, "ERROR: init_lock_ops: old kernel:" - " compiled with FUTEX support which is not present in the" - " running kernel (try 2.6+)\n"); + LM_CRIT("old kernel: compiled with FUTEX support which is not" + " present in the running kernel (try 2.6+)\n"); return -1; } #endif

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: 5f1205c8c98ea508d60830de48a2b43eb14f28e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f1205c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:20:41 2014 -0400 lock_ops.h: logging: convert LOG to LM_* --- lock_ops.h | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/lock_ops.h b/lock_ops.h index f83ea77..097d5bb 100644 --- a/lock_ops.h +++ b/lock_ops.h @@ -225,8 +225,7 @@ tryagain: DBG("lock_get: signal received while waiting for on a mutex\n"); goto tryagain; }else{ - LOG(L_CRIT, "ERROR: lock_get sysv: %s (%d)\n", strerror(errno), - errno); + LM_CRIT("sysv: %s (%d)\n", strerror(errno), errno); return -1; } } @@ -246,8 +245,7 @@ tryagain: DBG("lock_get: signal received while waiting for on a mutex\n"); goto tryagain; }else{ - LOG(L_CRIT, "ERROR: lock_get sysv: %s (%d)\n", strerror(errno), - errno); + LM_CRIT("sysv: %s (%d)\n", strerror(errno), errno); } } } @@ -266,8 +264,7 @@ tryagain: DBG("lock_release: signal received while releasing a mutex\n"); goto tryagain; }else{ - LOG(L_CRIT, "ERROR: lock_release sysv: %s (%d)\n", - strerror(errno), errno); + LM_CRIT("sysv: %s (%d)\n", strerror(errno), errno); } } } @@ -336,16 +333,14 @@ inline static gen_lock_set_t* lock_set_init(gen_lock_set_t* s) if (uid && uid!=euid) seteuid(euid); /* restore euid */ if (s->semid==-1){ - LOG(L_CRIT, "ERROR: lock_set_init (SYSV): semget (..., %d, 0700)" - " failed: %s\n", + LM_CRIT("(SYSV): semget (..., %d, 0700) failed: %s\n", s->size, strerror(errno)); return 0; } su.val=1; for (r=0; r<s->size; r++){ if (semctl(s->semid, r, SETVAL, su)==-1){ - LOG(L_CRIT, "ERROR: lock_set_init (SYSV): semctl failed on sem %d" - ": %s\n", r, strerror(errno)); + LM_CRIT("(SYSV): semctl failed on sem %d: %s\n", r, strerror(errno)); semctl(s->semid, 0, IPC_RMID, (union semun)(int)0); return 0; } @@ -375,8 +370,7 @@ tryagain: DBG("lock_get: signal received while waiting for on a mutex\n"); goto tryagain; }else{ - LOG(L_CRIT, "ERROR: lock_get sysv: %s (%d)\n", strerror(errno), - errno); + LM_CRIT("sysv: %s (%d)\n", strerror(errno), errno); return -1; } } @@ -396,8 +390,7 @@ tryagain: DBG("lock_set_get: signal received while waiting on a mutex\n"); goto tryagain; }else{ - LOG(L_CRIT, "ERROR: lock_set_get sysv: %s (%d)\n", - strerror(errno), errno); + LM_CRIT("sysv: %s (%d)\n", strerror(errno), errno); } } } @@ -415,8 +408,7 @@ tryagain: DBG("lock_set_release: signal received while releasing mutex\n"); goto tryagain; }else{ - LOG(L_CRIT, "ERROR: lock_set_release sysv: %s (%d)\n", - strerror(errno), errno); + LM_CRIT("sysv: %s (%d)\n", strerror(errno), errno); } } }

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: 36d0ecf473c83ebb12ee4a0d2d8f4dcc83f93d2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36d0ecf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:15:35 2014 -0400 ip_addr.c: logging: convert LOG to LM_* --- ip_addr.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ip_addr.c b/ip_addr.c index b11ab27..458eaa0 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -59,13 +59,13 @@ struct net* mk_new_net(struct ip_addr* ip, struct ip_addr* mask) warning=0; if ((ip->af != mask->af) || (ip->len != mask->len)){ - LOG(L_CRIT, "ERROR: mk_net: trying to use a different mask family" + LM_CRIT("trying to use a different mask family" " (eg. ipv4/ipv6mask or ipv6/ipv4mask)\n"); goto error; } n=(struct net*)pkg_malloc(sizeof(struct net)); if (n==0){ - LOG(L_CRIT, "ERROR: mk_net: memory allocation failure\n"); + LM_CRIT("memory allocation failure\n"); goto error; } n->ip=*ip; @@ -75,7 +75,7 @@ struct net* mk_new_net(struct ip_addr* ip, struct ip_addr* mask) if (n->ip.u.addr32[r]!=ip->u.addr32[r]) warning=1; }; if (warning){ - LOG(L_WARN, "WARNING: mk_net: invalid network address/netmask " + LM_WARN("invalid network address/netmask " "combination fixed...\n"); print_ip("original network address:", ip, "/"); print_ip("", mask, "\n"); @@ -95,7 +95,7 @@ struct net* mk_new_net_bitlen(struct ip_addr* ip, unsigned int bitlen) int r; if (bitlen>ip->len*8){ - LOG(L_CRIT, "ERROR: mk_net_bitlen: bad bitlen number %d\n", bitlen); + LM_CRIT("bad bitlen number %d\n", bitlen); goto error; } memset(&mask,0, sizeof(mask)); @@ -292,7 +292,7 @@ void stdout_print_ip(struct ip_addr* ip) void print_net(struct net* net) { if (net==0){ - LOG(L_WARN, "ERROR: print net: null pointer\n"); + LM_WARN("null pointer\n"); return; } print_ip("", &net->ip, "/"); print_ip("", &net->mask, ""); @@ -305,7 +305,7 @@ void print_net(struct net* net) int is_mcast(struct ip_addr* ip) { if (!ip){ - LOG(L_ERR, "ERROR: is_mcast: Invalid parameter value\n"); + LM_ERR("Invalid parameter value\n"); return -1; } @@ -314,7 +314,7 @@ int is_mcast(struct ip_addr* ip) } else if (ip->af==AF_INET6){ return IN6_IS_ADDR_MULTICAST((struct in6_addr*)ip->u.addr32); } else { - LOG(L_ERR, "ERROR: is_mcast: Unsupported protocol family\n"); + LM_ERR("Unsupported protocol family\n"); return -1; } }

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: 44f49c060217322e4469582073e728097313a851 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44f49c0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:13:26 2014 -0400 ip_addr.h: logging: convert LOG to LM_* --- ip_addr.h | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ip_addr.h b/ip_addr.h index 3cdecc6..2a08349 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -351,8 +351,7 @@ static inline void sockaddr2ip_addr(struct ip_addr* ip, struct sockaddr* sa) memcpy(ip->u.addr, &((struct sockaddr_in6*)sa)->sin6_addr, 16); break; default: - LOG(L_CRIT, "sockaddr2ip_addr: BUG: unknown address family %d\n", - sa->sa_family); + LM_CRIT("unknown address family %d\n", sa->sa_family); } } @@ -378,8 +377,7 @@ static inline int su_cmp(const union sockaddr_union* s1, return (s1->sin6.sin6_port==s2->sin6.sin6_port)&& (memcmp(&s1->sin6.sin6_addr, &s2->sin6.sin6_addr, 16)==0); default: - LOG(L_CRIT,"su_cmp: BUG: unknown address family %d\n", - s1->s.sa_family); + LM_CRIT("unknown address family %d\n", s1->s.sa_family); return 0; } } @@ -395,8 +393,7 @@ static inline unsigned short su_getport(const union sockaddr_union* su) case AF_INET6: return ntohs(su->sin6.sin6_port); default: - LOG(L_CRIT,"su_get_port: BUG: unknown address family %d\n", - su->s.sa_family); + LM_CRIT("unknown address family %d\n", su->s.sa_family); return 0; } } @@ -414,8 +411,7 @@ static inline void su_setport(union sockaddr_union* su, unsigned short port) su->sin6.sin6_port=htons(port); break; default: - LOG(L_CRIT,"su_set_port: BUG: unknown address family %d\n", - su->s.sa_family); + LM_CRIT("unknown address family %d\n", su->s.sa_family); } } @@ -436,8 +432,7 @@ static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) memcpy(ip->u.addr, &su->sin6.sin6_addr, 16); break; default: - LOG(L_CRIT,"su2ip_addr: BUG: unknown address family %d\n", - su->s.sa_family); + LM_CRIT("unknown address family %d\n", su->s.sa_family); } } @@ -470,7 +465,7 @@ static inline int init_su( union sockaddr_union* su, su->sin.sin_port=htons(port); break; default: - LOG(L_CRIT, "init_ss: BUG: unknown address family %d\n", ip->af); + LM_CRIT("unknown address family %d\n", ip->af); return -1; } return 0; @@ -505,8 +500,7 @@ static inline int hostent2su( union sockaddr_union* su, su->sin.sin_port=htons(port); break; default: - LOG(L_CRIT, "hostent2su: BUG: unknown address family %d\n", - he->h_addrtype); + LM_CRIT("unknown address family %d\n", he->h_addrtype); return -1; } return 0; @@ -665,8 +659,7 @@ static inline int ip_addr2sbuf(struct ip_addr* ip, char* buff, int len) return ip4tosbuf(ip->u.addr, buff, len); break; default: - LOG(L_CRIT, "BUG: ip_addr2sbuf: unknown address family %d\n", - ip->af); + LM_CRIT("unknown address family %d\n", ip->af); return 0; } return 0;

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: c68b4078e6b81ebec77071434f3dabc396ad5a07 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c68b407… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 17:08:23 2014 -0400 forward.c: logging: convert LOG to LM_* --- forward.c | 87 ++++++++++++++++++++++++------------------------------------ 1 files changed, 35 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c68…

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: e23c76c97a3483f56ad3aff0f8ffd9ba513fc84e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e23c76c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 16:53:49 2014 -0400 forward.h: logging: convert LOG to LM_* --- forward.h | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/forward.h b/forward.h index 2c5d942..2babd74 100644 --- a/forward.h +++ b/forward.h @@ -171,7 +171,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) else if (likely(dst->id)) con = tcpconn_get(dst->id, 0, 0, 0, 0); else { - LM_CRIT("BUG: msg_send called with null_id & to\n"); + LM_CRIT("null_id & to\n"); goto error; } @@ -198,14 +198,14 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) new_dst=*dst; new_dst.send_sock=get_send_socket(0, &dst->to, dst->proto); if (unlikely(new_dst.send_sock==0)){ - LOG(L_ERR, "msg_send: ERROR: no sending socket found\n"); + LM_ERR("no sending socket found\n"); goto error; } dst=&new_dst; } if (unlikely(udp_send(dst, outb.s, outb.len)==-1)){ STATS_TX_DROPS; - LOG(L_ERR, "msg_send: ERROR: udp_send failed\n"); + LM_ERR("udp_send failed\n"); goto error; } } @@ -213,8 +213,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) else if (dst->proto==PROTO_TCP){ if (unlikely(tcp_disable)){ STATS_TX_DROPS; - LOG(L_WARN, "msg_send: WARNING: attempt to send on tcp and tcp" - " support is disabled\n"); + LM_WARN("attempt to send on tcp and tcp support is disabled\n"); goto error; }else{ if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) && @@ -225,7 +224,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) } if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){ STATS_TX_DROPS; - LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n"); + LM_ERR("tcp_send failed\n"); goto error; } } @@ -234,8 +233,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) else if (dst->proto==PROTO_TLS){ if (unlikely(tls_disable)){ STATS_TX_DROPS; - LOG(L_WARN, "msg_send: WARNING: attempt to send on tls and tls" - " support is disabled\n"); + LM_WARN("attempt to send on tls and tls support is disabled\n"); goto error; }else{ if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) && @@ -246,7 +244,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) } if (unlikely(tcp_send(dst, from, outb.s, outb.len)<0)){ STATS_TX_DROPS; - LOG(L_ERR, "msg_send: ERROR: tcp_send failed\n"); + LM_ERR("tcp_send failed\n"); goto error; } } @@ -257,29 +255,28 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) else if (dst->proto==PROTO_SCTP){ if (unlikely(sctp_disable)){ STATS_TX_DROPS; - LOG(L_WARN, "msg_send: WARNING: attempt to send on sctp and sctp" - " support is disabled\n"); + LM_WARN("attempt to send on sctp and sctp support is disabled\n"); goto error; }else{ if (unlikely(dst->send_sock==0)){ new_dst=*dst; new_dst.send_sock=get_send_socket(0, &dst->to, dst->proto); if (unlikely(new_dst.send_sock==0)){ - LOG(L_ERR, "msg_send: ERROR: no sending SCTP socket found\n"); + LM_ERR("no sending SCTP socket found\n"); goto error; } dst=&new_dst; } if (unlikely(sctp_core_msg_send(dst, outb.s, outb.len)<0)){ STATS_TX_DROPS; - LOG(L_ERR, "msg_send: ERROR: sctp_msg_send failed\n"); + LM_ERR("sctp_msg_send failed\n"); goto error; } } } #endif /* USE_SCTP */ else{ - LOG(L_CRIT, "BUG: msg_send: unknown proto %d\n", dst->proto); + LM_CRIT("unknown proto %d\n", dst->proto); goto error; } ret = 0;

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: eadbcc1899c7e128142a33b28710b6c4c47bffdd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eadbcc1… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 16:48:57 2014 -0400 modparam.c: logging: convert LOG to LM_* --- modparam.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modparam.c b/modparam.c index 59dbd9f..17d0642 100644 --- a/modparam.c +++ b/modparam.c @@ -64,18 +64,18 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) str s; if (!regex) { - LOG(L_ERR, "set_mod_param_regex(): Invalid mod parameter value\n"); + LM_ERR("Invalid mod parameter value\n"); return -5; } if (!name) { - LOG(L_ERR, "set_mod_param_regex(): Invalid name parameter value\n"); + LM_ERR("Invalid name parameter value\n"); return -6; } len = strlen(regex); reg = pkg_malloc(len + 2 + 1); if (reg == 0) { - LOG(L_ERR, "set_mod_param_regex(): No memory left\n"); + LM_ERR("No memory left\n"); return -1; } reg[0] = '^'; @@ -84,7 +84,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) reg[len + 2] = '\0'; if (regcomp(&preg, reg, REG_EXTENDED | REG_NOSUB | REG_ICASE)) { - LOG(L_ERR, "set_mod_param_regex(): Error while compiling regular expression\n"); + LM_ERR("Error while compiling regular expression\n"); pkg_free(reg); return -2; } @@ -123,7 +123,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) case PARAM_STRING: *((char**)ptr) = pkg_malloc(strlen((char*)val2)+1); if (!*((char**)ptr)) { - LOG(L_ERR, "set_mod_param_regex(): No memory left\n"); + LM_ERR("No memory left\n"); regfree(&preg); pkg_free(reg); return -1; @@ -134,7 +134,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) case PARAM_STR: ((str*)ptr)->s = pkg_malloc(((str*)val2)->len+1); if (!((str*)ptr)->s) { - LOG(L_ERR, "set_mod_param_regex(): No memory left\n"); + LM_ERR("No memory left\n"); regfree(&preg); pkg_free(reg); return -1; @@ -151,9 +151,8 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) } } else { - LOG(L_ERR, "set_mod_param_regex: parameter <%s>" - " of type <%d> not found in" - " module <%s>\n", name, type, t->exports.name); + LM_ERR("parameter <%s> of type <%d> not found in module <%s>\n", + name, type, t->exports.name); regfree(&preg); pkg_free(reg); return -3; @@ -164,7 +163,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) regfree(&preg); pkg_free(reg); if (!mod_found) { - LOG(L_ERR, "set_mod_param_regex: No module matching <%s> found\n", regex); + LM_ERR("No module matching <%s> found\n", regex); return -4; } return 0;

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: 2ee98a71e4e4478983b3b576b432f63c7003d514 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ee98a7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 16:45:07 2014 -0400 tcp_conn.h: logging: convert LOG to LM_* --- tcp_conn.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index 896678f..7c9eecb 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -328,8 +328,7 @@ static inline unsigned tcp_addr_hash( struct ip_addr* ip, (l_ip->u.addr32[0]^l_ip->u.addr32[1]^l_ip->u.addr32[2]^ l_ip->u.addr32[3]^l_port); else{ - LOG(L_CRIT, "tcp_addr_hash: BUG: bad len %d for an ip address\n", - ip->len); + LM_CRIT("bad len %d for an ip address\n", ip->len); return 0; } /* make sure the first bits are influenced by all 32

1 0

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

03 Oct '14

Module: sip-router Branch: master Commit: fca9a2e3978e552a32136299e974b22c163e4a6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fca9a2e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 16:43:44 2014 -0400 script_cb.c: logging: convert LOG to LM_* --- script_cb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script_cb.c b/script_cb.c index 5a5f848..bf2af24 100644 --- a/script_cb.c +++ b/script_cb.c @@ -68,7 +68,7 @@ static inline int add_callback( struct script_cb **list, new_cb=pkg_malloc(sizeof(struct script_cb)); if (new_cb==0) { - LOG(L_CRIT, "add_script_callback: out of memory\n"); + LM_CRIT("out of memory\n"); return -1; } new_cb->cbf = f; @@ -121,7 +121,7 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) return 0; add_error: - LOG(L_ERR,"register_script_cb: failed to add callback\n"); + LM_ERR("failed to add callback\n"); return -1; }

1 0

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