stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

patch: remove usage of strerror(), use %m instead

Browse source
This commit is contained in:
Alfred E. Heggestad 2012-08-09 15:30:41 +00:00
parent dcc6d8f074
commit c7629d930b
35 changed files with 121 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/bfcp/sock.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mem.h>
@ -162,7 +161,7 @@ static void tcp_close_handler(int err, void *arg)
{
struct bfcp_conn *conn = arg;
(void)re_printf("BFCP connection closed: %s\n", strerror(err));
(void)re_printf("BFCP connection closed: %m\n", err);
mem_deref(conn);
}

2
src/dns/client.c
View file

@ -403,7 +403,7 @@ static void tcp_close_handler(int err, void *arg)
{
struct tcpconn *tc = arg;
DEBUG_NOTICE("connection (%J) closed: %s\n", &tc->srv, strerror(err));
DEBUG_NOTICE("connection (%J) closed: %m\n", &tc->srv, err);
tcpconn_close(tc, err);
}

4
src/dns/ns.c
View file

@ -4,7 +4,6 @@
* Copyright (C) 2010 Creytiv.com
*/
#include <stdio.h>
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mbuf.h>
@ -68,8 +67,7 @@ static int parse_resolv_conf(char *domain, size_t dsize,
&srv)) {
err = sa_set(&srvv[i], &srv, DNS_PORT);
if (err) {
DEBUG_WARNING("sa_set: %r (%s)\n",
&srv, strerror(err));
DEBUG_WARNING("sa_set: %r (%m)\n", &srv, err);
}
++i;
}

5
src/dns/win32/srv.c
View file

@ -77,9 +77,8 @@ int get_windns(char *domain, size_t dsize, struct sa *srvv, uint32_t *n)
err = sa_set_str(&srvv[i], pIPAddr->IpAddress.String,
DNS_PORT);
if (err) {
DEBUG_WARNING("sa_set_str: %s (%s)\n",
pIPAddr->IpAddress.String,
strerror(err));
DEBUG_WARNING("sa_set_str: %s (%m)\n",
pIPAddr->IpAddress.String, err);
}
DEBUG_INFO("dns ip %u: %j\n", i, &srvv[i]);
++i;

4
src/fmt/print.c
View file

@ -159,7 +159,7 @@ static size_t local_ftoa(char *buf, double n, size_t dp)
int re_vhprintf(const char *fmt, va_list ap, re_vprintf_h *vph, void *arg)
{
uint8_t base, *bptr;
char pch, ch, num[NUM_SIZE], addr[64];
char pch, ch, num[NUM_SIZE], addr[64], msg[256];
enum length_modifier lenmod = LENMOD_NONE;
struct re_printf pf;
bool fm = false, plr = false;
@ -313,7 +313,7 @@ int re_vhprintf(const char *fmt, va_list ap, re_vprintf_h *vph, void *arg)
break;
case 'm':
str = str_error(va_arg(ap, int), addr, sizeof(addr));
str = str_error(va_arg(ap, int), msg, sizeof(msg));
err |= write_padded(str, str_len(str), pad,
' ', plr, NULL, vph, arg);
break;

2
src/ice/candpair.c
View file

@ -386,7 +386,7 @@ int icem_candpair_debug(struct re_printf *pf, const struct candpair *cp)
err |= re_hprintf(pf, " ERTT = %.2fms", cp->ertt / 1000.0);
if (cp->err)
err |= re_hprintf(pf, " (%s)", strerror(cp->err));
err |= re_hprintf(pf, " (%m)", cp->err);
if (cp->scode)
err |= re_hprintf(pf, " [%u]", cp->scode);

10
src/ice/connchk.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mem.h>
@ -127,8 +126,7 @@ static void handle_success(struct icem *icem, struct candpair *cp,
err = icem_lcand_add(icem, cp->lcand,
CAND_TYPE_PRFLX, addr);
if (err) {
DEBUG_WARNING("failed to add PRFLX: %s\n",
strerror(err));
DEBUG_WARNING("failed to add PRFLX: %m\n", err);
}
}
@ -158,10 +156,10 @@ static void stunc_resp_handler(int err, uint16_t scode, const char *reason,
(void)reason;
#if ICE_TRACE
icecomp_printf(cp->comp, "Rx %H <--- %H '%u %s' (%s)\n",
icecomp_printf(cp->comp, "Rx %H <--- %H '%u %s' (%m)\n",
icem_cand_print, cp->lcand,
icem_cand_print, cp->rcand,
scode, reason, err ? strerror(err) : "");
scode, reason, err);
#endif
if (err) {
@ -267,7 +265,7 @@ int icem_conncheck_send(struct candpair *cp, bool use_cand, bool trigged)
err = turnc_add_chan(cp->comp->turnc, &cp->rcand->addr,
NULL, NULL);
if (err) {
DEBUG_WARNING("add channel: %s\n", strerror(err));
DEBUG_WARNING("add channel: %m\n", err);
break;
}
presz = 4;

9
src/ice/gather.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mem.h>
@ -64,8 +63,8 @@ static void stun_resp_handler(int err, uint16_t scode, const char *reason,
--icem->nstun;
if (err || scode > 0) {
DEBUG_WARNING("{%s.%u} STUN Request failed: %s\n",
icem->name, comp->id, strerror(err));
DEBUG_WARNING("{%s.%u} STUN Request failed: %m\n",
icem->name, comp->id, err);
goto out;
}
@ -129,8 +128,8 @@ static void turnc_handler(int err, uint16_t scode, const char *reason,
}
if (err) {
DEBUG_WARNING("{%s.%u} TURN Client error: %s\n",
icem->name, comp->id, strerror(err));
DEBUG_WARNING("{%s.%u} TURN Client error: %m\n",
icem->name, comp->id, err);
goto out;
}

7
src/ice/stunsrv.c
View file

@ -76,8 +76,8 @@ static void triggered_check(struct icem *icem, struct cand *lcand,
err = icem_candpair_alloc(&cp, icem, lcand, rcand);
if (err) {
DEBUG_WARNING("failed to allocate candpair:"
" lcand=%p rcand=%p (%s)\n",
lcand, rcand, strerror(err));
" lcand=%p rcand=%p (%m)\n",
lcand, rcand, err);
return;
}
@ -159,8 +159,7 @@ static void handle_stun(struct ice *ice, struct icem *icem,
err = icem_rcand_add_prflx(&rcand, icem, comp->id, prio, src);
if (err) {
DEBUG_WARNING("icem_rcand_add_prflx: %s\n",
strerror(err));
DEBUG_WARNING("icem_rcand_add_prflx: %m\n", err);
return;
}
}

9
src/lock/lock.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#define __USE_UNIX98 1
#include <pthread.h>
#include <re_types.h>
@ -33,7 +32,7 @@ static void lock_destructor(void *data)
int err = pthread_mutex_destroy(&l->m);
if (err) {
DEBUG_WARNING("pthread_mutex_destroy: %s\n", strerror(err));
DEBUG_WARNING("pthread_mutex_destroy: %m\n", err);
}
}
@ -83,7 +82,7 @@ void lock_read_get(struct lock *l)
{
const int err = pthread_mutex_lock(&l->m);
if (err) {
DEBUG_WARNING("lock_read_get: %s\n", strerror(err));
DEBUG_WARNING("lock_read_get: %m\n", err);
}
}
@ -97,7 +96,7 @@ void lock_write_get(struct lock *l)
{
const int err = pthread_mutex_lock(&l->m);
if (err) {
DEBUG_WARNING("lock_write_get: %s\n", strerror(err));
DEBUG_WARNING("lock_write_get: %m\n", err);
}
}
@ -137,6 +136,6 @@ void lock_rel(struct lock *l)
{
const int err = pthread_mutex_unlock(&l->m);
if (err) {
DEBUG_WARNING("lock_rel: %s\n", strerror(err));
DEBUG_WARNING("lock_rel: %m\n", err);
}
}

9
src/lock/rwlock.c
View file

@ -5,7 +5,6 @@
*/
#define _GNU_SOURCE 1
#include <pthread.h>
#include <string.h>
#include <re_types.h>
#include <re_mem.h>
#include <re_lock.h>
@ -27,7 +26,7 @@ static void lock_destructor(void *data)
int err = pthread_rwlock_destroy(&l->lock);
if (err) {
DEBUG_WARNING("pthread_rwlock_destroy: %s\n", strerror(err));
DEBUG_WARNING("pthread_rwlock_destroy: %m\n", err);
}
}
@ -66,7 +65,7 @@ void lock_read_get(struct lock *l)
err = pthread_rwlock_rdlock(&l->lock);
if (err) {
DEBUG_WARNING("lock_read_get: %s\n", strerror(err));
DEBUG_WARNING("lock_read_get: %m\n", err);
}
}
@ -80,7 +79,7 @@ void lock_write_get(struct lock *l)
err = pthread_rwlock_wrlock(&l->lock);
if (err) {
DEBUG_WARNING("lock_write_get: %s\n", strerror(err));
DEBUG_WARNING("lock_write_get: %m\n", err);
}
}
@ -110,6 +109,6 @@ void lock_rel(struct lock *l)
err = pthread_rwlock_unlock(&l->lock);
if (err) {
DEBUG_WARNING("lock_rel: %s\n", strerror(err));
DEBUG_WARNING("lock_rel: %m\n", err);
}
}

3
src/main/epoll.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <unistd.h>
#include <sys/epoll.h>
#include <re_types.h>
@ -46,7 +45,7 @@ bool epoll_check(void)
epfd = epoll_create(64);
if (-1 == epfd) {
DEBUG_NOTICE("epoll_create: %s\n", strerror(errno));
DEBUG_NOTICE("epoll_create: %m\n", errno);
return false;
}

24
src/main/main.c
View file

@ -180,7 +180,7 @@ static inline void re_lock(struct re *re)
err = pthread_mutex_lock(&re->mutex);
if (err) {
DEBUG_WARNING("re_lock: %s\n", strerror(err));
DEBUG_WARNING("re_lock: %m\n", err);
}
}
@ -191,7 +191,7 @@ static inline void re_unlock(struct re *re)
err = pthread_mutex_unlock(&re->mutex);
if (err) {
DEBUG_WARNING("re_unlock: %s\n", strerror(err));
DEBUG_WARNING("re_unlock: %m\n", err);
}
}
@ -295,23 +295,23 @@ static int set_epoll_fds(struct re *re, int fd, int flags)
err = errno;
DEBUG_WARNING("epoll_ctl:"
" EPOLL_CTL_MOD:"
" fd=%d (%s)\n",
fd, strerror(err));
" fd=%d (%m)\n",
fd, err);
}
}
else {
err = errno;
DEBUG_WARNING("epoll_ctl: EPOLL_CTL_ADD:"
" fd=%d (%s)\n",
fd, strerror(err));
" fd=%d (%m)\n",
fd, err);
}
}
}
else {
if (-1 == epoll_ctl(re->epfd, EPOLL_CTL_DEL, fd, &event)) {
err = errno;
DEBUG_INFO("epoll_ctl: EPOLL_CTL_DEL: fd=%d (%s)\n",
fd, strerror(err));
DEBUG_INFO("epoll_ctl: EPOLL_CTL_DEL: fd=%d (%m)\n",
fd, err);
}
}
@ -390,8 +390,8 @@ static int poll_init(struct re *re)
if (re->epfd <= 0
&& -1 == (re->epfd = epoll_create(re->maxfds))) {
DEBUG_WARNING("epoll_create: %s (maxfds=%d)\n",
strerror(errno), re->maxfds);
DEBUG_WARNING("epoll_create: %m (maxfds=%d)\n",
errno, re->maxfds);
return errno;
}
DEBUG_INFO("init: epoll_create() epfd=%d\n", re->epfd);
@ -523,8 +523,8 @@ int fd_listen(int fd, int flags, fd_h *fh, void *arg)
if (err) {
if (flags && fh) {
fd_close(fd);
DEBUG_WARNING("fd_listen: fd=%d flags=0x%02x (%s)\n",
fd, flags, strerror(err));
DEBUG_WARNING("fd_listen: fd=%d flags=0x%02x (%m)\n",
fd, flags, err);
}
}

2
src/mbuf/mbuf.c
View file

@ -148,7 +148,7 @@ void mbuf_trim(struct mbuf *mb)
/* We shrink - this cannot fail */
err = mbuf_resize(mb, mb->end);
if (err) {
DEBUG_WARNING("trim: resize failed (%s)\n", strerror(err));
DEBUG_WARNING("trim: resize failed (%m)\n", err);
}
}

2
src/mod/mod.c
View file

@ -55,7 +55,7 @@ static void mod_destructor(void *data)
int err;
if (me && me->close && (err = me->close())) {
DEBUG_NOTICE("close: error (%s)\n", strerror(err));
DEBUG_NOTICE("close: error (%m)\n", err);
}
list_unlink(&m->le);

11
src/natbd/filtering.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mem.h>
@ -82,8 +81,8 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
/* Test I completed */
if (err || scode) {
DEBUG_WARNING("Test I: stun_response_handler: %s\n",
strerror(err));
DEBUG_WARNING("Test I: stun_response_handler: %m\n",
err);
nf->fh(err, NAT_TYPE_UNKNOWN, nf->arg);
return;
}
@ -107,8 +106,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
STUN_ATTR_SOFTWARE, stun_software,
STUN_ATTR_CHANGE_REQ, &change_req);
if (err) {
DEBUG_WARNING("stunc_request_send: (%s)\n",
strerror(err));
DEBUG_WARNING("stunc_request_send: (%m)\n", err);
nf->fh(err, NAT_TYPE_UNKNOWN, nf->arg);
}
break;
@ -146,8 +144,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
STUN_ATTR_SOFTWARE, stun_software,
STUN_ATTR_CHANGE_REQ, &change_req);
if (err) {
DEBUG_WARNING("stunc_request_send: (%s)\n",
strerror(err));
DEBUG_WARNING("stunc_request_send: (%m)\n", err);
nf->fh(err, NAT_TYPE_UNKNOWN, nf->arg);
}
break;

4
src/natbd/genalg.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_mbuf.h>
#include <re_fmt.h>
@ -149,8 +148,7 @@ int nat_genalg_start(struct nat_genalg *ng)
stun_response_handler, ng, 1,
STUN_ATTR_SOFTWARE, stun_software);
if (err) {
DEBUG_WARNING("start: stunc_request_send(): (%s)\n",
strerror(err));
DEBUG_WARNING("start: stunc_request_send(): (%m)\n", err);
}
return err;

10
src/natbd/hairpinning.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mbuf.h>
@ -174,7 +173,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
/* Send hairpinning test message */
err = hairpin_send(nh, &attr->v.sa);
if (err) {
DEBUG_WARNING("hairpin_send: (%s)\n", strerror(err));
DEBUG_WARNING("hairpin_send: (%m)\n", err);
}
if (err)
@ -202,7 +201,7 @@ static void tcp_conn_handler(const struct sa *peer, void *arg)
err = tcp_accept(&nh->tc2, nh->ts, NULL, tcp_recv_handler2,
tcp_close_handler2, nh);
if (err) {
DEBUG_WARNING("TCP conn: tcp_accept: %s\n", strerror(err));
DEBUG_WARNING("TCP conn: tcp_accept: %m\n", err);
}
}
@ -218,8 +217,7 @@ static void tcp_estab_handler(void *arg)
err = mapped_send(nh);
if (err) {
DEBUG_WARNING("TCP established: mapped_send (%s)\n",
strerror(err));
DEBUG_WARNING("TCP established: mapped_send (%m)\n", err);
nh->hph(err, false, nh->arg);
}
}
@ -232,7 +230,7 @@ static void tcp_recv_handler(struct mbuf *mb, void *arg)
err = stun_recv(nh->stun, mb);
if (err && ENOENT != err) {
DEBUG_WARNING("stun recv: %s\n", strerror(err));
DEBUG_WARNING("stun recv: %m\n", err);
}
}

8
src/natbd/lifetime.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mem.h>
@ -67,8 +66,7 @@ static void msg_recv(struct stun *stun, const struct sa *src,
err = stun_recv(stun, mb);
if (err && ENOENT != err) {
DEBUG_WARNING("msg_recv: stunc_recv(): (%s)\n",
strerror(err));
DEBUG_WARNING("msg_recv: stunc_recv(): (%m)\n", err);
}
}
@ -93,7 +91,7 @@ static void stun_response_handler_x(int err, uint16_t scode,
(void)reason;
if (err) {
DEBUG_WARNING("stun_response_handler X: %s\n", strerror(err));
DEBUG_WARNING("stun_response_handler X: %m\n", err);
goto out;
}
@ -211,7 +209,7 @@ static void timeout(void *arg)
return;
out:
DEBUG_WARNING("timeout: (%s)\n", strerror(err));
DEBUG_WARNING("timeout: (%m)\n", err);
nl->lh(err, &nl->interval, nl->arg);

19
src/natbd/mapping.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_mbuf.h>
#include <re_fmt.h>
@ -70,7 +69,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
struct stun_attr *map, *other;
if (err) {
DEBUG_WARNING("stun_response_handler: (%s)\n", strerror(err));
DEBUG_WARNING("stun_response_handler: (%m)\n", err);
nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg);
return;
}
@ -118,8 +117,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
err = mapping_send(nm);
if (err) {
DEBUG_WARNING("stunc_request_send: (%s)\n",
strerror(err));
DEBUG_WARNING("stunc_request_send: (%m)\n", err);
nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg);
}
break;
@ -138,8 +136,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason,
sa_set_port(&nm->srv, sa_port(&other->v.other_addr));
err = mapping_send(nm);
if (err) {
DEBUG_WARNING("stunc_request_send: (%s)\n",
strerror(err));
DEBUG_WARNING("stunc_request_send: (%m)\n", err);
nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg);
}
break;
@ -193,8 +190,7 @@ static void udp_recv_handler(const struct sa *src, struct mbuf *mb,
err = stun_recv(nm->stun, mb);
if (err && ENOENT != err) {
DEBUG_WARNING("udp_recv_handler: stunc_recv(): (%s)\n",
strerror(err));
DEBUG_WARNING("udp_recv_handler: stunc_recv(): (%m)\n", err);
}
}
@ -225,8 +221,7 @@ static void tcp_estab_handler(void *arg)
STUN_ATTR_SOFTWARE, stun_software);
if (err) {
DEBUG_WARNING("TCP established: mapping_send (%s)\n",
strerror(err));
DEBUG_WARNING("TCP established: mapping_send (%m)\n", err);
nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg);
}
}
@ -239,7 +234,7 @@ static void tcp_recv_handler(struct mbuf *mb, void *arg)
err = stun_recv(nm->stun, mb);
if (err && ENOENT != err) {
DEBUG_WARNING("stunc recv: %s\n", strerror(err));
DEBUG_WARNING("stunc recv: %m\n", err);
}
}
@ -248,7 +243,7 @@ static void tcp_close_handler(int err, void *arg)
{
struct nat_mapping *nm = arg;
DEBUG_NOTICE("TCP Connection Closed (%s)\n", strerror(err));
DEBUG_NOTICE("TCP Connection Closed (%m)\n", err);
if (err) {
nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg);

3
src/net/ifaddrs.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <unistd.h>
#include <sys/socket.h>
#define __USE_MISC 1 /**< Use MISC code */
@ -38,7 +37,7 @@ int net_getifaddrs(net_ifaddr_h *ifh, void *arg)
return EINVAL;
if (0 != getifaddrs(&ifa)) {
DEBUG_WARNING("getifaddrs: %s\n", strerror(errno));
DEBUG_WARNING("getifaddrs: %m\n", errno);
return errno;
}

10
src/net/linux/rt.c
View file

@ -57,7 +57,7 @@ static int read_sock(int fd, uint8_t *buf, size_t size, int seq, int pid)
do {
/* Receive response from the kernel */
if ((n = recv(fd, buf, size - len, 0)) < 0) {
DEBUG_WARNING("SOCK READ: %s\n", strerror(errno));
DEBUG_WARNING("SOCK READ: %m\n", errno);
return -1;
}
nlhdr = (struct nlmsghdr *)(void *)buf;
@ -196,7 +196,7 @@ int net_rt_list(net_rt_h *rth, void *arg)
/* Create Socket */
if ((sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE)) < 0) {
DEBUG_WARNING("list: socket(): (%s)\n", strerror(errno));
DEBUG_WARNING("list: socket(): (%m)\n", errno);
return errno;
}
@ -216,16 +216,14 @@ int net_rt_list(net_rt_h *rth, void *arg)
/* Send the request */
if (send(sock, nlmsg, nlmsg->nlmsg_len, 0) < 0) {
err = errno;
DEBUG_WARNING("list: write to socket failed (%s)\n",
strerror(err));
DEBUG_WARNING("list: write to socket failed (%m)\n", err);
goto out;
}
/* Read the response */
if ((len = read_sock(sock, u.buf, sizeof(u.buf), seq, getpid())) < 0) {
err = errno;
DEBUG_WARNING("list: read from socket failed (%s)\n",
strerror(err));
DEBUG_WARNING("list: read from socket failed (%m)\n", err);
goto out;
}

9
src/net/posix/pif.c
View file

@ -107,8 +107,7 @@ int net_if_list(net_ifaddr_h *ifh, void *arg)
if (0 > (sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP))) {
err = errno;
DEBUG_WARNING("interface list: socket(): (%s)\n",
strerror(err));
DEBUG_WARNING("interface list: socket(): (%m)\n", err);
goto out;
}
@ -117,8 +116,7 @@ int net_if_list(net_ifaddr_h *ifh, void *arg)
if (0 != ioctl(sockfd, SIOCGIFCONF, &ifc)) {
err = errno;
DEBUG_WARNING("interface list: ioctl SIOCFIFCONF: %s\n",
strerror(err));
DEBUG_WARNING("interface list: ioctl SIOCFIFCONF: %m\n", err);
goto out;
}
@ -152,8 +150,7 @@ int net_if_list(net_ifaddr_h *ifh, void *arg)
err = sa_set_sa(&sa, &ifrr.ifr_ifru.ifru_addr);
if (err) {
DEBUG_WARNING("if_list: sa_set_sa %s\n",
strerror(err));
DEBUG_WARNING("if_list: sa_set_sa %m\n", err);
break;
}

4
src/net/sock.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mbuf.h>
@ -27,8 +26,7 @@ static int wsa_init(void)
err = WSAStartup(wVersionRequested, &wsaData);
if (err != 0) {
DEBUG_WARNING("Could not load winsock (%s)\n",
strerror(err));
DEBUG_WARNING("Could not load winsock (%m)\n", err);
return err;
}

16
src/net/sockopt.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@ -44,8 +43,8 @@ int net_sockopt_blocking_set(int fd, bool blocking)
if (0 != ioctlsocket(fd, FIONBIO, &noblock)) {
err = WSAGetLastError();
DEBUG_WARNING("nonblock set: fd=%d err=%d (%s)\n",
fd, err, strerror(err));
DEBUG_WARNING("nonblock set: fd=%d err=%d (%m)\n",
fd, err, err);
}
return err;
#else
@ -55,8 +54,7 @@ int net_sockopt_blocking_set(int fd, bool blocking)
flags = fcntl(fd, F_GETFL);
if (-1 == flags) {
err = errno;
DEBUG_WARNING("sockopt set: fnctl F_GETFL: (%s)\n",
strerror(err));
DEBUG_WARNING("sockopt set: fnctl F_GETFL: (%m)\n", err);
goto out;
}
@ -67,8 +65,8 @@ int net_sockopt_blocking_set(int fd, bool blocking)
if (-1 == fcntl(fd, F_SETFL, flags)) {
err = errno;
DEBUG_WARNING("sockopt set: fcntl F_SETFL non-block (%s)\n",
strerror(err));
DEBUG_WARNING("sockopt set: fcntl F_SETFL non-block (%m)\n",
err);
}
out:
@ -92,7 +90,7 @@ int net_sockopt_reuse_set(int fd, bool reuse)
#ifdef SO_REUSEADDR
if (-1 == setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
BUF_CAST &r, sizeof(r))) {
DEBUG_WARNING("SO_REUSEADDR: %s\n", strerror(errno));
DEBUG_WARNING("SO_REUSEADDR: %m\n", errno);
return errno;
}
#endif
@ -100,7 +98,7 @@ int net_sockopt_reuse_set(int fd, bool reuse)
#ifdef SO_REUSEPORT
if (-1 == setsockopt(fd, SOL_SOCKET, SO_REUSEPORT,
BUF_CAST &r, sizeof(r))) {
DEBUG_WARNING("SO_REUSEPORT: %s\n", strerror(errno));
DEBUG_WARNING("SO_REUSEPORT: %m\n", errno);
return errno;
}
#endif

2
src/rtp/sess.c
View file

@ -495,7 +495,7 @@ static void timeout(void *arg)
err = send_rtcp_report(sess);
if (err) {
DEBUG_WARNING("Send RTCP report failed: %s\n", strerror(err));
DEBUG_WARNING("Send RTCP report failed: %m\n", err);
}
schedule(sess);

4
src/sdp/msg.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_fmt.h>
#include <re_mem.h>
@ -299,8 +298,7 @@ int sdp_decode(struct sdp_session *sess, struct mbuf *mb, bool offer)
#if 0
if (err)
re_printf("*** %c='%r': %s\n", type, &val,
strerror(err));
re_printf("** %c='%r': %m\n", type, &val, err);
#endif
type = 0;

3
src/sip/transp.c
View file

@ -305,8 +305,7 @@ static void udp_recv_handler(const struct sa *src, struct mbuf *mb, void *arg)
err = sip_msg_decode(&msg, mb);
if (err) {
(void)re_fprintf(stderr, "sip: msg decode err: %s\n",
strerror(err));
(void)re_fprintf(stderr, "sip: msg decode err: %m\n", err);
return;
}

11
src/sipevent/listen.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_mem.h>
#include <re_mbuf.h>
@ -136,6 +135,7 @@ static void notify_handler(struct sipevent_sock *sock,
const struct sip_hdr *hdr;
struct sipsub *sub;
uint32_t nrefs;
char m[256];
int err;
hdr = sip_msg_hdr(msg, SIP_HDR_EVENT);
@ -165,7 +165,8 @@ static void notify_handler(struct sipevent_sock *sock,
err = sub->forkh(&fsub, sub, msg, sub->arg);
if (err) {
(void)sip_reply(sip, msg, 500, strerror(err));
(void)sip_reply(sip, msg, 500,
str_error(err, m, sizeof(m)));
return;
}
@ -174,7 +175,8 @@ static void notify_handler(struct sipevent_sock *sock,
else {
err = sip_dialog_create(sub->dlg, msg);
if (err) {
(void)sip_reply(sip, msg, 500, strerror(err));
(void)sip_reply(sip, msg, 500,
str_error(err, m, sizeof(m)));
return;
}
}
@ -192,7 +194,8 @@ static void notify_handler(struct sipevent_sock *sock,
err = pl_strdup(&sub->id, &event.id);
if (err) {
(void)sip_treply(NULL, sip, msg, 500, strerror(err));
(void)sip_treply(NULL, sip, msg, 500,
str_error(err, m, sizeof(m)));
return;
}
}

4
src/sipsess/listen.c
View file

@ -3,7 +3,6 @@
*
* Copyright (C) 2010 Creytiv.com
*/
#include <string.h>
#include <re_types.h>
#include <re_mem.h>
#include <re_mbuf.h>
@ -187,6 +186,7 @@ static void reinvite_handler(struct sipsess_sock *sock,
struct sip *sip = sock->sip;
struct sipsess *sess;
struct mbuf *desc;
char m[256];
int err;
sess = sipsess_find(sock, msg);
@ -216,7 +216,7 @@ static void reinvite_handler(struct sipsess_sock *sock,
err = sess->offerh(&desc, msg, sess->arg);
if (err) {
(void)sip_reply(sip, msg, 488, strerror(err));
(void)sip_reply(sip, msg, 488, str_error(err, m, sizeof(m)));
return;
}

11
src/stun/dnsdisc.c
View file

@ -47,7 +47,7 @@ static void resolved(const struct stun_dns *dns, int err)
stun_dns_h *dnsh = dns->dnsh;
void *dnsh_arg = dns->arg;
DEBUG_INFO("resolved: %J (%s)\n", &dns->srv, strerror(err));
DEBUG_INFO("resolved: %J (%m)\n", &dns->srv, err);
dnsh(err, &dns->srv, dnsh_arg);
}
@ -190,7 +190,7 @@ static void srv_handler(int err, const struct dnshdr *hdr, struct list *ansl,
err = a_or_aaaa_query(dns, rr->rdata.srv.target);
if (err) {
DEBUG_WARNING("SRV: A lookup failed (%s)\n", strerror(err));
DEBUG_WARNING("SRV: A lookup failed (%m)\n", err);
goto out;
}
@ -263,8 +263,8 @@ int stun_server_discover(struct stun_dns **dnsp, struct dnsc *dnsc,
err = a_or_aaaa_query(dns, domain);
if (err) {
DEBUG_WARNING("%s: A/AAAA lookup failed (%s)\n",
domain, strerror(err));
DEBUG_WARNING("%s: A/AAAA lookup failed (%m)\n",
domain, err);
goto out;
}
}
@ -278,8 +278,7 @@ int stun_server_discover(struct stun_dns **dnsp, struct dnsc *dnsc,
err = dnsc_query(&dns->dq, dnsc, q, DNS_TYPE_SRV, DNS_CLASS_IN,
true, srv_handler, dns);
if (err) {
DEBUG_WARNING("%s: SRV lookup failed (%s)\n", q,
strerror(err));
DEBUG_WARNING("%s: SRV lookup failed (%m)\n", q, err);
goto out;
}
}

5
src/tcp/symbian/tcp.cpp
View file

@ -5,7 +5,6 @@
*/
#include <es_sock.h>
#include <in_sock.h>
#include <string.h>
extern "C" {
#include <re_types.h>
@ -617,7 +616,7 @@ void tcp_conn::recv()
void tcp_conn::conn_close(int err)
{
DEBUG_INFO("tcp conn close (%s)\n", strerror(err));
DEBUG_INFO("tcp conn close (%m)\n", err);
/* Stop receiving */
if (ctc->receiving) {
@ -822,7 +821,7 @@ int tcp_conn_alloc(struct tcp_conn **tcp, const struct sa *peer,
out:
if (err) {
DEBUG_WARNING("conn_alloc: %J (%s)\n", peer, strerror(err));
DEBUG_WARNING("conn_alloc: %J (%m)\n", peer, err);
mem_deref(tc);
}
return err;

53
src/tcp/tcp.c
View file

@ -287,8 +287,7 @@ static void tcp_recv_handler(int flags, void *arg)
/* check for any errors */
if (-1 == getsockopt(tc->fdc, SOL_SOCKET, SO_ERROR,
BUF_CAST &err, &err_len)) {
DEBUG_WARNING("recv handler: getsockopt: (%s)\n",
strerror(errno));
DEBUG_WARNING("recv handler: getsockopt: (%m)\n", errno);
return;
}
@ -298,8 +297,7 @@ static void tcp_recv_handler(int flags, void *arg)
}
#if 0
if (EINPROGRESS != err && EALREADY != err) {
DEBUG_WARNING("recv handler: Socket error (%s)\n",
strerror(err));
DEBUG_WARNING("recv handler: Socket error (%m)\n", err);
return;
}
#endif
@ -346,8 +344,7 @@ static void tcp_recv_handler(int flags, void *arg)
err = fd_listen(tc->fdc, FD_READ, tcp_recv_handler, tc);
if (err) {
DEBUG_WARNING("recv handler: fd_listen(): %s\n",
strerror(err));
DEBUG_WARNING("recv handler: fd_listen(): %m\n", err);
conn_close(tc, err);
return;
}
@ -383,7 +380,7 @@ static void tcp_recv_handler(int flags, void *arg)
return;
}
else if (n < 0) {
DEBUG_WARNING("recv handler: recv(): %s\n", strerror(errno));
DEBUG_WARNING("recv handler: recv(): %m\n", errno);
goto out;
}
@ -476,7 +473,7 @@ static void tcp_sockopt_set(int fd)
err = setsockopt(fd, SOL_SOCKET, SO_LINGER, BUF_CAST &dl, sizeof(dl));
if (err) {
DEBUG_WARNING("sockopt: SO_LINGER (%s)\n", strerror(err));
DEBUG_WARNING("sockopt: SO_LINGER (%m)\n", err);
}
#else
(void)fd;
@ -537,8 +534,7 @@ static void tcp_conn_handler(int flags, void *arg)
err = net_sockopt_blocking_set(ts->fdc, false);
if (err) {
DEBUG_WARNING("conn handler: nonblock set: %s\n",
strerror(err));
DEBUG_WARNING("conn handler: nonblock set: %m\n", err);
(void)close(ts->fdc);
ts->fdc = -1;
return;
@ -622,8 +618,7 @@ int tcp_sock_alloc(struct tcp_sock **tsp, const struct sa *local,
err = net_sockopt_blocking_set(fd, false);
if (err) {
DEBUG_WARNING("listen: nonblock set: %s\n",
strerror(err));
DEBUG_WARNING("listen: nonblock set: %m\n", err);
(void)close(fd);
continue;
}
@ -701,8 +696,8 @@ int tcp_sock_bind(struct tcp_sock *ts, const struct sa *local)
if (bind(ts->fd, r->ai_addr, SIZ_CAST r->ai_addrlen) < 0) {
err = errno;
DEBUG_WARNING("sock_bind: bind: %s (af=%d, %J)\n",
strerror(err), r->ai_family, local);
DEBUG_WARNING("sock_bind: bind: %m (af=%d, %J)\n",
err, r->ai_family, local);
continue;
}
@ -739,7 +734,7 @@ int tcp_sock_listen(struct tcp_sock *ts, int backlog)
if (listen(ts->fd, backlog) < 0) {
err = errno;
DEBUG_WARNING("sock_listen: listen(): %s\n", strerror(err));
DEBUG_WARNING("sock_listen: listen(): %m\n", err);
return err;
}
@ -779,7 +774,7 @@ int tcp_accept(struct tcp_conn **tcp, struct tcp_sock *ts, tcp_estab_h *eh,
err = fd_listen(tc->fdc, FD_READ | FD_WRITE | FD_EXCEPT,
tcp_recv_handler, tc);
if (err) {
DEBUG_WARNING("accept: fd_listen(): %s\n", strerror(err));
DEBUG_WARNING("accept: fd_listen(): %m\n", err);
}
if (err)
@ -868,8 +863,7 @@ int tcp_conn_alloc(struct tcp_conn **tcp,
err = net_sockopt_blocking_set(tc->fdc, false);
if (err) {
DEBUG_WARNING("connect: nonblock set: %s\n",
strerror(err));
DEBUG_WARNING("connect: nonblock set: %m\n", err);
(void)close(tc->fdc);
tc->fdc = -1;
continue;
@ -945,8 +939,8 @@ int tcp_conn_bind(struct tcp_conn *tc, const struct sa *local)
}
err = errno;
DEBUG_WARNING("conn_bind: bind(): %J: %s\n",
local, strerror(err));
DEBUG_WARNING("conn_bind: bind(): %J: %m\n",
local, err);
continue;
}
@ -959,8 +953,7 @@ int tcp_conn_bind(struct tcp_conn *tc, const struct sa *local)
freeaddrinfo(res);
if (err) {
DEBUG_WARNING("conn_bind failed: %J (%s)\n", local,
strerror(err));
DEBUG_WARNING("conn_bind failed: %J (%m)\n", local, err);
}
return err;
@ -1039,8 +1032,8 @@ int tcp_conn_connect(struct tcp_conn *tc, const struct sa *peer)
if (EINPROGRESS != errno && EALREADY != errno) {
tc->fdc = -1;
err = errno;
DEBUG_INFO("connect: connect() %J: %s\n",
peer, strerror(err));
DEBUG_INFO("connect: connect() %J: %m\n",
peer, err);
}
}
}
@ -1101,8 +1094,7 @@ static int tcp_send_internal(struct tcp_conn *tc, struct mbuf *mb,
#endif
err = errno;
DEBUG_WARNING("send: write(): %s (fdc=%d)\n", strerror(err),
tc->fdc);
DEBUG_WARNING("send: write(): %m (fdc=%d)\n", err, tc->fdc);
#ifdef WIN32
DEBUG_WARNING("WIN32 error: %d\n", WSAGetLastError());
@ -1222,8 +1214,7 @@ int tcp_sock_local_get(const struct tcp_sock *ts, struct sa *local)
sa_init(local, AF_UNSPEC);
if (getsockname(ts->fd, &local->u.sa, &local->len) < 0) {
DEBUG_WARNING("local get: getsockname(): %s\n",
strerror(errno));
DEBUG_WARNING("local get: getsockname(): %m\n", errno);
return errno;
}
@ -1247,8 +1238,7 @@ int tcp_conn_local_get(const struct tcp_conn *tc, struct sa *local)
sa_init(local, AF_UNSPEC);
if (getsockname(tc->fdc, &local->u.sa, &local->len) < 0) {
DEBUG_WARNING("conn local get: getsockname(): %s\n",
strerror(errno));
DEBUG_WARNING("conn local get: getsockname(): %m\n", errno);
return errno;
}
@ -1272,8 +1262,7 @@ int tcp_conn_peer_get(const struct tcp_conn *tc, struct sa *peer)
sa_init(peer, AF_UNSPEC);
if (getpeername(tc->fdc, &peer->u.sa, &peer->len) < 0) {
DEBUG_WARNING("conn peer get: getpeername(): %s\n",
strerror(errno));
DEBUG_WARNING("conn peer get: getpeername(): %m\n", errno);
return errno;
}

3
src/tmr/tmr.c
View file

@ -136,8 +136,7 @@ uint64_t tmr_jiffies(void)
struct timeval now;
if (0 != gettimeofday(&now, NULL)) {
DEBUG_WARNING("jiffies: gettimeofday() failed (%s)\n",
strerror(errno));
DEBUG_WARNING("jiffies: gettimeofday() failed (%m)\n", errno);
return 0;
}

8
src/udp/udp.c
View file

@ -328,16 +328,14 @@ int udp_listen(struct udp_sock **usp, const struct sa *local,
err = net_sockopt_blocking_set(fd, false);
if (err) {
DEBUG_WARNING("udp listen: nonblock set: %s\n",
strerror(err));
DEBUG_WARNING("udp listen: nonblock set: %m\n", err);
(void)close(fd);
continue;
}
if (bind(fd, r->ai_addr, SIZ_CAST r->ai_addrlen) < 0) {
err = errno;
DEBUG_INFO("listen: bind(): %s (%J)\n",
strerror(err), local);
DEBUG_INFO("listen: bind(): %m (%J)\n", err, local);
(void)close(fd);
continue;
}
@ -450,7 +448,7 @@ static int udp_send_internal(struct udp_sock *us, const struct sa *dst,
/* Connected socket? */
if (us->conn) {
if (0 != connect(fd, &dst->u.sa, dst->len)) {
DEBUG_WARNING("send: connect: %s\n", strerror(errno));
DEBUG_WARNING("send: connect: %m\n", errno);
us->conn = false;
}