summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1fa5bd2)
Also make sure that obj->errmsg is set on all error paths and evaluate
errno as soon as possible so that calls to close() and such don't reset it.
+/* ping_open_socket opens, initializes and returns a new raw socket to use for
+ * ICMPv4 or ICMPv6 packets. addrfam must be either AF_INET or AF_INET6. On
+ * error, -1 is returned and obj->errmsg is set appropriately. */
static int ping_open_socket(pingobj_t *obj, int addrfam)
{
int fd;
static int ping_open_socket(pingobj_t *obj, int addrfam)
{
int fd;
}
else /* this should not happen */
{
}
else /* this should not happen */
{
+ ping_set_error (obj, "ping_open_socket", "Unknown address family");
dprintf ("Unknown address family: %i\n", addrfam);
dprintf ("Unknown address family: %i\n", addrfam);
+ ping_set_errno (obj, errno);
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("socket: %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("socket: %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
- ping_set_errno (obj, errno);
return -1;
}
else if (fd >= FD_SETSIZE)
{
return -1;
}
else if (fd >= FD_SETSIZE)
{
+ ping_set_errno (obj, EMFILE);
dprintf ("socket(2) returned file descriptor %d, which is above the file "
"descriptor limit for select(2) (FD_SETSIZE = %d)\n",
fd, FD_SETSIZE);
close (fd);
dprintf ("socket(2) returned file descriptor %d, which is above the file "
"descriptor limit for select(2) (FD_SETSIZE = %d)\n",
fd, FD_SETSIZE);
close (fd);
- ping_set_errno (obj, EMFILE);
if (bind (fd, obj->srcaddr, obj->srcaddrlen) == -1)
{
if (bind (fd, obj->srcaddr, obj->srcaddrlen) == -1)
{
+ ping_set_errno (obj, errno);
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("bind: %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("bind: %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
- ping_set_errno (obj, errno);
if (setsockopt (fd, SOL_SOCKET, SO_BINDTODEVICE,
obj->device, strlen (obj->device) + 1) != 0)
{
if (setsockopt (fd, SOL_SOCKET, SO_BINDTODEVICE,
obj->device, strlen (obj->device) + 1) != 0)
{
+ ping_set_errno (obj, errno);
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("setsockopt (SO_BINDTODEVICE): %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("setsockopt (SO_BINDTODEVICE): %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
- ping_set_errno (obj, errno);
&opt, sizeof (opt));
if (status != 0)
{
&opt, sizeof (opt));
if (status != 0)
{
+ ping_set_errno (obj, errno);
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("setsockopt (SO_TIMESTAMP): %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
#if WITH_DEBUG
char errbuf[PING_ERRMSG_LEN];
dprintf ("setsockopt (SO_TIMESTAMP): %s\n",
sstrerror (errno, errbuf, sizeof (errbuf)));
#endif
- ping_set_errno (obj, errno);