From e92e7cb65e67db4e0f2f74bbb924062abc8188a2 Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Fri, 22 Nov 2013 11:52:11 +1030 Subject: [PATCH] Improve sendto(2) error log messages --- mdp_client.c | 2 +- overlay_interface.c | 6 +++++- overlay_mdp.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mdp_client.c b/mdp_client.c index 02930bef..b8ef160e 100644 --- a/mdp_client.c +++ b/mdp_client.c @@ -137,7 +137,7 @@ int overlay_mdp_send(int mdp_sockfd, overlay_mdp_frame *mdp, int flags, int time mdp->packetTypeAndFlags=MDP_ERROR; mdp->error.error=1; snprintf(mdp->error.message,128,"Error sending frame to MDP server."); - return WHY_perror("sendto(f)"); + return WHYF_perror("sendto(fd=%d,len=%zu,addr=%s)", mdp_sockfd, (size_t)len, alloca_sockaddr(&addr, addrlen)); } else { if (!(flags&MDP_AWAITREPLY)) { return 0; diff --git a/overlay_interface.c b/overlay_interface.c index 172f4621..55b547de 100644 --- a/overlay_interface.c +++ b/overlay_interface.c @@ -982,7 +982,11 @@ int overlay_broadcast_ensemble(struct network_destination *destination, struct o (struct sockaddr *)&destination->address, sizeof(destination->address)); ob_free(buffer); if (sent!= len){ - WHY_perror("sendto(c)"); + WHYF_perror("sendto(fd=%d,len=%zu,addr=%s)", + interface->alarm.poll.fd, + (size_t)len, + alloca_sockaddr((struct sockaddr *)&destination->address, sizeof destination->address) + ); // close the interface if we had any error while sending broadcast packets, // unicast packets should not bring the interface down if (destination == interface->destination) diff --git a/overlay_mdp.c b/overlay_mdp.c index ba13500c..03c0a794 100644 --- a/overlay_mdp.c +++ b/overlay_mdp.c @@ -163,7 +163,7 @@ int overlay_mdp_reply(int sock,struct sockaddr_un *recvaddr, socklen_t recvaddrl int r=sendto(sock,(char *)mdpreply,replylen,0, (struct sockaddr *)recvaddr,recvaddrlen); if (r