X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fliboping.c;h=b0a9e5bc8da5491d546a78631fd8ba6c5a1fcaee;hb=5676536daa32f42418fc4b39caf2a28afb72e5ce;hp=bea0be840d06efd0dddf67c842ada89ffc8b4b50;hpb=e8a8aadbf4909da53cec9b16cd0b097e85bc448d;p=liboping.git diff --git a/src/liboping.c b/src/liboping.c index bea0be8..b0a9e5b 100644 --- a/src/liboping.c +++ b/src/liboping.c @@ -1,20 +1,20 @@ /** * Object oriented C module to send ICMP and ICMPv6 `echo's. - * Copyright (C) 2006-2009 Florian octo Forster + * Copyright (C) 2006-2010 Florian octo Forster * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; only version 2 of the License is - * applicable. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #if HAVE_CONFIG_H @@ -25,7 +25,6 @@ # include # include # include -# include # include # include # include @@ -33,6 +32,10 @@ # error "You don't have the standard C99 header files installed" #endif /* STDC_HEADERS */ +#ifdef HAVE_STDINT_H +# include +#endif + #if HAVE_UNISTD_H # include #endif @@ -61,6 +64,7 @@ #if HAVE_SYS_SOCKET_H # include #endif + #if HAVE_NETDB_H # include #endif @@ -112,6 +116,8 @@ struct pinghost struct timeval *timer; double latency; uint32_t dropped; + int recv_ttl; + uint8_t recv_tos; char *data; void *context; @@ -124,11 +130,14 @@ struct pingobj double timeout; int ttl; int addrfamily; + uint8_t tos; char *data; struct sockaddr *srcaddr; socklen_t srcaddrlen; + char *device; + char errmsg[PING_ERRMSG_LEN]; pinghost_t *head; @@ -140,7 +149,7 @@ struct pingobj /* Even though Posix requires "strerror_r" to return an "int", * some systems (e.g. the GNU libc) return a "char *" _and_ * ignore the second argument ... -tokkee */ -char *sstrerror (int errnum, char *buf, size_t buflen) +static char *sstrerror (int errnum, char *buf, size_t buflen) { buf[0] = 0; @@ -254,7 +263,8 @@ static uint16_t ping_icmp4_checksum (char *buf, size_t len) return (ret); } -static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffer_len) +static pinghost_t *ping_receive_ipv4 (pingobj_t *obj, char *buffer, + size_t buffer_len) { struct ip *ip_hdr; struct icmp *icmp_hdr; @@ -301,7 +311,8 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe if (recv_checksum != calc_checksum) { - dprintf ("Checksum missmatch: Got 0x%04x, calculated 0x%04x\n", + dprintf ("Checksum missmatch: Got 0x%04"PRIx16", " + "calculated 0x%04"PRIx16"\n", recv_checksum, calc_checksum); return (NULL); } @@ -309,7 +320,9 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe ident = ntohs (icmp_hdr->icmp_id); seq = ntohs (icmp_hdr->icmp_seq); - for (ptr = ph; ptr != NULL; ptr = ptr->next) + /* We have to iterate over all hosts, since ICMPv4 packets may + * be received on any raw v4 socket. */ + for (ptr = obj->head; ptr != NULL; ptr = ptr->next) { dprintf ("hostname = %s, ident = 0x%04x, seq = %i\n", ptr->hostname, ptr->ident, ((ptr->sequence - 1) & 0xFFFF)); @@ -326,7 +339,8 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe if (((ptr->sequence - 1) & 0xFFFF) != seq) continue; - dprintf ("Match found: hostname = %s, ident = 0x%04x, seq = %i\n", + dprintf ("Match found: hostname = %s, ident = 0x%04"PRIx16", " + "seq = %"PRIu16"\n", ptr->hostname, ident, seq); break; @@ -334,10 +348,14 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe if (ptr == NULL) { - dprintf ("No match found for ident = 0x%04x, seq = %i\n", + dprintf ("No match found for ident = 0x%04"PRIx16", seq = %"PRIu16"\n", ident, seq); } + if (ptr != NULL){ + ptr->recv_ttl = (int) ip_hdr->ip_ttl; + ptr->recv_tos = (uint8_t) ip_hdr->ip_tos; + } return (ptr); } @@ -357,7 +375,8 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe # endif #endif -static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffer_len) +static pinghost_t *ping_receive_ipv6 (pingobj_t *obj, char *buffer, + size_t buffer_len) { struct icmp6_hdr *icmp_hdr; @@ -388,7 +407,9 @@ static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffe ident = ntohs (icmp_hdr->icmp6_id); seq = ntohs (icmp_hdr->icmp6_seq); - for (ptr = ph; ptr != NULL; ptr = ptr->next) + /* We have to iterate over all hosts, since ICMPv6 packets may + * be received on any raw v6 socket. */ + for (ptr = obj->head; ptr != NULL; ptr = ptr->next) { dprintf ("hostname = %s, ident = 0x%04x, seq = %i\n", ptr->hostname, ptr->ident, ((ptr->sequence - 1) & 0xFFFF)); @@ -405,7 +426,8 @@ static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffe if (((ptr->sequence - 1) & 0xFFFF) != seq) continue; - dprintf ("Match found: hostname = %s, ident = 0x%04x, seq = %i\n", + dprintf ("Match found: hostname = %s, ident = 0x%04"PRIx16", " + "seq = %"PRIu16"\n", ptr->hostname, ident, seq); break; @@ -413,30 +435,58 @@ static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffe if (ptr == NULL) { - dprintf ("No match found for ident = 0x%04x, seq = %i\n", + dprintf ("No match found for ident = 0x%04"PRIx16", " + "seq = %"PRIu16"\n", ident, seq); } return (ptr); } -static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now) +static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, + struct timeval *now) { - char buffer[4096]; - ssize_t buffer_len; + /* Note: 'ph' is not necessarily the host object for which we receive a + * reply. The right object will be returned by ping_receive_ipv*(). For + * now, we can only rely on ph->fd and ph->addrfamily. */ struct timeval diff; - pinghost_t *host = NULL; + int recv_ttl; + uint8_t recv_tos; + + /* + * Set up the receive buffer.. + */ + struct msghdr msghdr; + struct cmsghdr *cmsg; + char payload_buffer[4096]; + ssize_t payload_buffer_len; + char control_buffer[4096]; + struct iovec payload_iovec; + + memset (&payload_iovec, 0, sizeof (payload_iovec)); + payload_iovec.iov_base = payload_buffer; + payload_iovec.iov_len = sizeof (payload_buffer); + + memset (&msghdr, 0, sizeof (msghdr)); + /* unspecified source address */ + msghdr.msg_name = NULL; + msghdr.msg_namelen = 0; + /* output buffer vector, see readv(2) */ + msghdr.msg_iov = &payload_iovec; + msghdr.msg_iovlen = 1; + /* output buffer for control messages */ + msghdr.msg_control = control_buffer; + msghdr.msg_controllen = sizeof (control_buffer); + /* flags; this is an output only field.. */ + msghdr.msg_flags = 0; +#ifdef MSG_XPG4_2 + msghdr.msg_flags |= MSG_XPG4_2; +#endif - struct sockaddr_storage sa; - socklen_t sa_len; - - sa_len = sizeof (sa); - - buffer_len = recvfrom (fd, buffer, sizeof (buffer), 0, - (struct sockaddr *) &sa, &sa_len); - if (buffer_len < 0) + payload_buffer_len = recvmsg (ph->fd, &msghdr, /* flags = */ 0); + if (payload_buffer_len < 0) { #if WITH_DEBUG char errbuf[PING_ERRMSG_LEN]; @@ -445,19 +495,87 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now) #endif return (-1); } + dprintf ("Read %zi bytes from fd = %i\n", payload_buffer_len, ph->fd); + + /* Iterate over all auxiliary data in msghdr */ + recv_ttl = -1; + recv_tos = 0xff; + for (cmsg = CMSG_FIRSTHDR (&msghdr); /* {{{ */ + cmsg != NULL; + cmsg = CMSG_NXTHDR (&msghdr, cmsg)) + { + if (ph->addrfamily == AF_INET) /* {{{ */ + { + if (cmsg->cmsg_level != IPPROTO_IP) + continue; - dprintf ("Read %zi bytes from fd = %i\n", buffer_len, fd); + if (cmsg->cmsg_type == IP_TOS) + { + memcpy (&recv_tos, CMSG_DATA (cmsg), + sizeof (recv_tos)); + dprintf ("TOSv4 = %#04"PRIx8";\n", recv_tos); + } else + if (cmsg->cmsg_type == IP_TTL) + { + memcpy (&recv_ttl, CMSG_DATA (cmsg), + sizeof (recv_ttl)); + dprintf ("TTLv4 = %i;\n", recv_ttl); + } + else + { + dprintf ("Not handling option %i.\n", + cmsg->cmsg_type); + } + } /* }}} */ + else if (ph->addrfamily == AF_INET6) /* {{{ */ + { + if (cmsg->cmsg_level != IPPROTO_IPV6) + continue; - if (sa.ss_family == AF_INET) + if (cmsg->cmsg_type == IPV6_RECVTCLASS) + { + memcpy (&recv_tos, CMSG_DATA (cmsg), + sizeof (recv_tos)); + dprintf ("TOSv6 = %#04"PRIx8";\n", recv_tos); + } else + if (cmsg->cmsg_type == IPV6_HOPLIMIT) + { + memcpy (&recv_ttl, CMSG_DATA (cmsg), + sizeof (recv_ttl)); + dprintf ("TTLv6 = %i;\n", recv_ttl); + } + else + { + dprintf ("Not handling option %i.\n", + cmsg->cmsg_type); + } + } /* }}} */ + else + { + dprintf ("Don't know how to handle " + "unknown protocol %i.\n", + cmsg->cmsg_level); + } + } /* }}} for (cmsg) */ + + if (ph->addrfamily == AF_INET) { - if ((host = ping_receive_ipv4 (ph, buffer, buffer_len)) == NULL) + host = ping_receive_ipv4 (obj, payload_buffer, payload_buffer_len); + if (host == NULL) return (-1); } - else if (sa.ss_family == AF_INET6) + else if (ph->addrfamily == AF_INET6) { - if ((host = ping_receive_ipv6 (ph, buffer, buffer_len)) == NULL) + host = ping_receive_ipv6 (obj, payload_buffer, payload_buffer_len); + if (host == NULL) return (-1); } + else + { + dprintf ("ping_receive_one: Unknown address family %i.\n", + ph->addrfamily); + return (-1); + } dprintf ("rcvd: %12i.%06i\n", (int) now->tv_sec, @@ -476,6 +594,11 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now) (int) diff.tv_sec, (int) diff.tv_usec); + if (recv_ttl >= 0) + host->recv_ttl = recv_ttl; + if (recv_tos != 0xffff) + host->recv_tos = recv_tos; + host->latency = ((double) diff.tv_usec) / 1000.0; host->latency += ((double) diff.tv_sec) * 1000.0; @@ -486,9 +609,10 @@ static int ping_receive_one (int fd, pinghost_t *ph, struct timeval *now) static int ping_receive_all (pingobj_t *obj) { - fd_set readfds; - int num_readfds; - int max_readfds; + fd_set read_fds; + fd_set err_fds; + int num_fds; + int max_fd; pinghost_t *ph; pinghost_t *ptr; @@ -504,7 +628,10 @@ static int ping_receive_all (pingobj_t *obj) ret = 0; for (ptr = ph; ptr != NULL; ptr = ptr->next) - ptr->latency = -1.0; + { + ptr->latency = -1.0; + ptr->recv_ttl = -1; + } if (gettimeofday (&nowtime, NULL) == -1) { @@ -524,23 +651,25 @@ static int ping_receive_all (pingobj_t *obj) while (1) { - FD_ZERO (&readfds); - num_readfds = 0; - max_readfds = -1; + FD_ZERO (&read_fds); + FD_ZERO (&err_fds); + num_fds = 0; + max_fd = -1; for (ptr = ph; ptr != NULL; ptr = ptr->next) { if (!timerisset (ptr->timer)) continue; - FD_SET (ptr->fd, &readfds); - num_readfds++; + FD_SET (ptr->fd, &read_fds); + FD_SET (ptr->fd, &err_fds); + num_fds++; - if (max_readfds < ptr->fd) - max_readfds = ptr->fd; + if (max_fd < ptr->fd) + max_fd = ptr->fd; } - if (num_readfds == 0) + if (num_fds == 0) break; if (gettimeofday (&nowtime, NULL) == -1) @@ -552,11 +681,11 @@ static int ping_receive_all (pingobj_t *obj) if (ping_timeval_sub (&endtime, &nowtime, &timeout) == -1) break; - dprintf ("Waiting on %i sockets for %i.%06i seconds\n", num_readfds, + dprintf ("Waiting on %i sockets for %i.%06i seconds\n", num_fds, (int) timeout.tv_sec, (int) timeout.tv_usec); - status = select (max_readfds + 1, &readfds, NULL, NULL, &timeout); + status = select (max_fd + 1, &read_fds, NULL, &err_fds, &timeout); if (gettimeofday (&nowtime, NULL) == -1) { @@ -589,9 +718,18 @@ static int ping_receive_all (pingobj_t *obj) for (ptr = ph; ptr != NULL; ptr = ptr->next) { - if (FD_ISSET (ptr->fd, &readfds)) - if (ping_receive_one (ptr->fd, ph, &nowtime) == 0) + if (FD_ISSET (ptr->fd, &read_fds)) + { + if (ping_receive_one (obj, ptr, &nowtime) == 0) ret++; + } + else if (FD_ISSET (ptr->fd, &err_fds)) + { + /* clear the timer in this case so that we + * don't run into an endless loop. */ + /* TODO: Set an error flag in this case. */ + timerclear (ptr->timer); + } } } /* while (1) */ @@ -798,11 +936,41 @@ static int ping_set_ttl (pinghost_t *ph, int ttl) if (ph->addrfamily == AF_INET) { - ret = setsockopt (ph->fd, IPPROTO_IP, IP_TTL, &ttl, sizeof (ttl)); + dprintf ("Setting TTLv4 to %i\n", ttl); + ret = setsockopt (ph->fd, IPPROTO_IP, IP_TTL, + &ttl, sizeof (ttl)); } else if (ph->addrfamily == AF_INET6) { - ret = setsockopt (ph->fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof (ttl)); + dprintf ("Setting TTLv6 to %i\n", ttl); + ret = setsockopt (ph->fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, + &ttl, sizeof (ttl)); + } + + return (ret); +} + +/* + * Set the TOS of a socket protocol independently. + * + * Using SOL_SOCKET / SO_PRIORITY might be a protocol independent way to + * set this. See socket(7) for details. + */ +static int ping_set_tos (pinghost_t *ph, uint8_t tos) +{ + int ret = -2; + + if (ph->addrfamily == AF_INET) + { + dprintf ("Setting TP_TOS to %i\n", ttl); + ret = setsockopt (ph->fd, IPPROTO_IP, IP_TOS, + &tos, sizeof (tos)); + } + else if (ph->addrfamily == AF_INET6) + { + dprintf ("Setting IPV6_TCLASS to %i\n", ttl); + ret = setsockopt (ph->fd, IPPROTO_IPV6, IPV6_TCLASS, + &tos, sizeof (tos)); } return (ret); @@ -896,6 +1064,8 @@ static void ping_free (pinghost_t *ph) */ const char *ping_get_error (pingobj_t *obj) { + if (obj == NULL) + return (NULL); return (obj->errmsg); } @@ -905,12 +1075,13 @@ pingobj_t *ping_construct (void) if ((obj = (pingobj_t *) malloc (sizeof (pingobj_t))) == NULL) return (NULL); - memset (obj, '\0', sizeof (pingobj_t)); + memset (obj, 0, sizeof (pingobj_t)); obj->timeout = PING_DEF_TIMEOUT; obj->ttl = PING_DEF_TTL; obj->addrfamily = PING_DEF_AF; obj->data = strdup (PING_DEF_DATA); + obj->tos = 0; return (obj); } @@ -920,6 +1091,9 @@ void ping_destroy (pingobj_t *obj) pinghost_t *current; pinghost_t *next; + if (obj == NULL) + return; + current = obj->head; next = NULL; @@ -936,6 +1110,9 @@ void ping_destroy (pingobj_t *obj) if (obj->srcaddr != NULL) free (obj->srcaddr); + if (obj->device != NULL) + free (obj->device); + free (obj); return; @@ -945,8 +1122,21 @@ int ping_setopt (pingobj_t *obj, int option, void *value) { int ret = 0; + if ((obj == NULL) || (value == NULL)) + return (-1); + switch (option) { + case PING_OPT_TOS: + { + pinghost_t *ph; + + obj->tos = *((uint8_t *) value); + for (ph = obj->head; ph != NULL; ph = ph->next) + ping_set_tos (ph, obj->tos); + break; + } + case PING_OPT_TIMEOUT: obj->timeout = *((double *) value); if (obj->timeout < 0.0) @@ -963,6 +1153,13 @@ int ping_setopt (pingobj_t *obj, int option, void *value) obj->ttl = PING_DEF_TTL; ret = -1; } + else + { + pinghost_t *ph; + + for (ph = obj->head; ph != NULL; ph = ph->next) + ping_set_ttl (ph, obj->ttl); + } break; case PING_OPT_AF: @@ -1051,6 +1248,28 @@ int ping_setopt (pingobj_t *obj, int option, void *value) } /* case PING_OPT_SOURCE */ break; + case PING_OPT_DEVICE: + { +#ifdef SO_BINDTODEVICE + char *device = strdup ((char *) value); + + if (device == NULL) + { + ping_set_errno (obj, errno); + ret = -1; + break; + } + + if (obj->device != NULL) + free (obj->device); + obj->device = device; +#else /* ! SO_BINDTODEVICE */ + ping_set_errno (obj, ENOTSUP); + ret = -1; +#endif /* ! SO_BINDTODEVICE */ + } /* case PING_OPT_DEVICE */ + break; + default: ret = -2; } /* switch (option) */ @@ -1063,6 +1282,9 @@ int ping_send (pingobj_t *obj) { int ret; + if (obj == NULL) + return (-1); + if (ping_send_all (obj) < 0) return (-1); @@ -1093,6 +1315,9 @@ int ping_host_add (pingobj_t *obj, const char *host) struct addrinfo *ai_list, *ai_ptr; int ai_return; + if ((obj == NULL) || (host == NULL)) + return (-1); + dprintf ("host = %s\n", host); if (ping_host_search (obj->head, host) != NULL) @@ -1218,6 +1443,25 @@ int ping_host_add (pingobj_t *obj, const char *host) } } +#ifdef SO_BINDTODEVICE + if (obj->device != NULL) + { + if (setsockopt (ph->fd, SOL_SOCKET, SO_BINDTODEVICE, + obj->device, strlen (obj->device) + 1) != 0) + { +#if WITH_DEBUG + char errbuf[PING_ERRMSG_LEN]; + dprintf ("setsockopt: %s\n", + sstrerror (errno, errbuf, sizeof (errbuf))); +#endif + ping_set_errno (obj, errno); + close (ph->fd); + ph->fd = -1; + continue; + } + } +#endif /* SO_BINDTODEVICE */ + assert (sizeof (struct sockaddr_storage) >= ai_ptr->ai_addrlen); memset (ph->addr, '\0', sizeof (struct sockaddr_storage)); memcpy (ph->addr, ai_ptr->ai_addr, ai_ptr->ai_addrlen); @@ -1246,8 +1490,43 @@ int ping_host_add (pingobj_t *obj, const char *host) } #endif /* AI_CANONNAME */ + if (ph->addrfamily == AF_INET) + { + int opt; + + /* Enable receiving the TOS field */ + opt = 1; + setsockopt (ph->fd, IPPROTO_IP, IP_RECVTOS, + &opt, sizeof (opt)); + + /* Enable receiving the TTL field */ + opt = 1; + setsockopt (ph->fd, IPPROTO_IP, IP_RECVTTL, + &opt, sizeof (opt)); + } +#if defined(IPV6_RECVHOPLIMIT) || defined(IPV6_RECVTCLASS) + else if (ph->addrfamily == AF_INET6) + { + int opt; + +# if defined(IPV6_RECVHOPLIMIT) + /* For details see RFC 3542, section 6.3. */ + opt = 1; + setsockopt (ph->fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, + &opt, sizeof (opt)); +# endif /* IPV6_RECVHOPLIMIT */ + +# if defined(IPV6_RECVTCLASS) + /* For details see RFC 3542, section 6.5. */ + opt = 1; + setsockopt (ph->fd, IPPROTO_IPV6, IPV6_RECVTCLASS, + &opt, sizeof (opt)); +# endif /* IPV6_RECVTCLASS */ + } +#endif /* IPV6_RECVHOPLIMIT || IPV6_RECVTCLASS */ + break; - } + } /* for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) */ freeaddrinfo (ai_list); @@ -1279,14 +1558,18 @@ int ping_host_add (pingobj_t *obj, const char *host) } ping_set_ttl (ph, obj->ttl); + ping_set_tos (ph, obj->tos); return (0); -} +} /* int ping_host_add */ int ping_host_remove (pingobj_t *obj, const char *host) { pinghost_t *pre, *cur; + if ((obj == NULL) || (host == NULL)) + return (-1); + pre = NULL; cur = obj->head; @@ -1317,11 +1600,15 @@ int ping_host_remove (pingobj_t *obj, const char *host) pingobj_iter_t *ping_iterator_get (pingobj_t *obj) { + if (obj == NULL) + return (NULL); return ((pingobj_iter_t *) obj->head); } pingobj_iter_t *ping_iterator_next (pingobj_iter_t *iter) { + if (iter == NULL) + return (NULL); return ((pingobj_iter_t *) iter->next); } @@ -1332,6 +1619,12 @@ int ping_iterator_get_info (pingobj_iter_t *iter, int info, size_t orig_buffer_len = *buffer_len; + if ((iter == NULL) || (buffer_len == NULL)) + return (-1); + + if ((buffer == NULL) && (*buffer_len != 0 )) + return (-1); + switch (info) { case PING_INFO_USERNAME: @@ -1435,6 +1728,25 @@ int ping_iterator_get_info (pingobj_iter_t *iter, int info, strncpy ((char *) buffer, iter->data, orig_buffer_len); ret = 0; break; + + case PING_INFO_RECV_TTL: + ret = ENOMEM; + *buffer_len = sizeof (int); + if (orig_buffer_len < sizeof (int)) + break; + *((int *) buffer) = iter->recv_ttl; + ret = 0; + break; + + case PING_INFO_TOS: + ret = ENOMEM; + if (*buffer_len>sizeof(unsigned)) *buffer_len=sizeof(unsigned); + if (!*buffer_len) *buffer_len=1; + if (orig_buffer_len < *buffer_len) + break; + memcpy(buffer,&iter->recv_tos,*buffer_len); + ret = 0; + break; } return (ret); @@ -1442,10 +1754,14 @@ int ping_iterator_get_info (pingobj_iter_t *iter, int info, void *ping_iterator_get_context (pingobj_iter_t *iter) { + if (iter == NULL) + return (NULL); return (iter->context); } void ping_iterator_set_context (pingobj_iter_t *iter, void *context) { + if (iter == NULL) + return; iter->context = context; }