X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fliboping.c;h=76a7d53456c1fd31be8fef44b87695e6f74bfb70;hb=441f2f6f137275321d6bb3d8bfb35f414c580ab6;hp=96a54cc663254ef66ef2c6344137d9f1b5326023;hpb=1d9f32f5329dc10fbd04f467381c600181547c9e;p=liboping.git diff --git a/src/liboping.c b/src/liboping.c index 96a54cc..76a7d53 100644 --- a/src/liboping.c +++ b/src/liboping.c @@ -1,6 +1,6 @@ /** * Object oriented C module to send ICMP and ICMPv6 `echo's. - * Copyright (C) 2006-2010 Florian octo Forster + * Copyright (C) 2006-2011 Florian octo Forster * * 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 @@ -117,7 +117,7 @@ struct pinghost double latency; uint32_t dropped; int recv_ttl; - uint8_t recv_tos; + uint8_t recv_qos; char *data; void *context; @@ -130,7 +130,7 @@ struct pingobj double timeout; int ttl; int addrfamily; - uint8_t tos; + uint8_t qos; char *data; struct sockaddr *srcaddr; @@ -354,7 +354,7 @@ static pinghost_t *ping_receive_ipv4 (pingobj_t *obj, char *buffer, if (ptr != NULL){ ptr->recv_ttl = (int) ip_hdr->ip_ttl; - ptr->recv_tos = (uint8_t) ip_hdr->ip_tos; + ptr->recv_qos = (uint8_t) ip_hdr->ip_tos; } return (ptr); } @@ -450,10 +450,10 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, * 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; + struct timeval diff, pkt_now = *now; pinghost_t *host = NULL; int recv_ttl; - uint8_t recv_tos; + uint8_t recv_qos; /* * Set up the receive buffer.. @@ -499,21 +499,28 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, /* Iterate over all auxiliary data in msghdr */ recv_ttl = -1; - recv_tos = 0xff; + recv_qos = 0; for (cmsg = CMSG_FIRSTHDR (&msghdr); /* {{{ */ cmsg != NULL; cmsg = CMSG_NXTHDR (&msghdr, cmsg)) { - if (ph->addrfamily == AF_INET) /* {{{ */ + if (cmsg->cmsg_level == SOL_SOCKET) + { +#ifdef SO_TIMESTAMP + if (cmsg->cmsg_type == SO_TIMESTAMP) + memcpy (&pkt_now, CMSG_DATA (cmsg), sizeof (pkt_now)); +#endif /* SO_TIMESTAMP */ + } + else if (ph->addrfamily == AF_INET) /* {{{ */ { if (cmsg->cmsg_level != IPPROTO_IP) continue; if (cmsg->cmsg_type == IP_TOS) { - memcpy (&recv_tos, CMSG_DATA (cmsg), - sizeof (recv_tos)); - dprintf ("TOSv4 = %#04"PRIx8";\n", recv_tos); + memcpy (&recv_qos, CMSG_DATA (cmsg), + sizeof (recv_qos)); + dprintf ("TOSv4 = 0x%02"PRIx8";\n", recv_qos); } else if (cmsg->cmsg_type == IP_TTL) { @@ -532,11 +539,11 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, if (cmsg->cmsg_level != IPPROTO_IPV6) continue; - if (cmsg->cmsg_type == IPV6_RECVTCLASS) + if (cmsg->cmsg_type == IPV6_TCLASS) { - memcpy (&recv_tos, CMSG_DATA (cmsg), - sizeof (recv_tos)); - dprintf ("TOSv6 = %#04"PRIx8";\n", recv_tos); + memcpy (&recv_qos, CMSG_DATA (cmsg), + sizeof (recv_qos)); + dprintf ("TOSv6 = 0x%02"PRIx8";\n", recv_qos); } else if (cmsg->cmsg_type == IPV6_HOPLIMIT) { @@ -578,13 +585,13 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, } dprintf ("rcvd: %12i.%06i\n", - (int) now->tv_sec, - (int) now->tv_usec); + (int) pkt_now.tv_sec, + (int) pkt_now.tv_usec); dprintf ("sent: %12i.%06i\n", (int) host->timer->tv_sec, (int) host->timer->tv_usec); - if (ping_timeval_sub (now, host->timer, &diff) < 0) + if (ping_timeval_sub (&pkt_now, host->timer, &diff) < 0) { timerclear (host->timer); return (-1); @@ -596,8 +603,7 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, if (recv_ttl >= 0) host->recv_ttl = recv_ttl; - if (recv_tos != 0xffff) - host->recv_tos = recv_tos; + host->recv_qos = recv_qos; host->latency = ((double) diff.tv_usec) / 1000.0; host->latency += ((double) diff.tv_sec) * 1000.0; @@ -956,21 +962,39 @@ static int ping_set_ttl (pinghost_t *ph, int ttl) * 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) +static int ping_set_qos (pingobj_t *obj, pinghost_t *ph, uint8_t qos) { - int ret = -2; + int ret = EINVAL; + char errbuf[PING_ERRMSG_LEN]; if (ph->addrfamily == AF_INET) { - dprintf ("Setting TP_TOS to %#04"PRIx8"\n", tos); + dprintf ("Setting TP_TOS to %#04"PRIx8"\n", qos); ret = setsockopt (ph->fd, IPPROTO_IP, IP_TOS, - &tos, sizeof (tos)); + &qos, sizeof (qos)); + if (ret != 0) + { + ret = errno; + ping_set_error (obj, "ping_set_qos", + sstrerror (ret, errbuf, sizeof (errbuf))); + dprintf ("Setting TP_TOS failed: %s\n", errbuf); + } } else if (ph->addrfamily == AF_INET6) { - dprintf ("Setting IPV6_TCLASS to %#04"PRIx8"\n", tos); + /* IPV6_TCLASS requires an "int". */ + int tmp = (int) qos; + + dprintf ("Setting IPV6_TCLASS to %#04"PRIx8" (%i)\n", qos, tmp); ret = setsockopt (ph->fd, IPPROTO_IPV6, IPV6_TCLASS, - &tos, sizeof (tos)); + &tmp, sizeof (tmp)); + if (ret != 0) + { + ret = errno; + ping_set_error (obj, "ping_set_qos", + sstrerror (ret, errbuf, sizeof (errbuf))); + dprintf ("Setting IPV6_TCLASS failed: %s\n", errbuf); + } } return (ret); @@ -1081,7 +1105,7 @@ pingobj_t *ping_construct (void) obj->ttl = PING_DEF_TTL; obj->addrfamily = PING_DEF_AF; obj->data = strdup (PING_DEF_DATA); - obj->tos = 0; + obj->qos = 0; return (obj); } @@ -1127,13 +1151,13 @@ int ping_setopt (pingobj_t *obj, int option, void *value) switch (option) { - case PING_OPT_TOS: + case PING_OPT_QOS: { pinghost_t *ph; - obj->tos = *((uint8_t *) value); + obj->qos = *((uint8_t *) value); for (ph = obj->head; ph != NULL; ph = ph->next) - ping_set_tos (ph, obj->tos); + ping_set_qos (obj, ph, obj->qos); break; } @@ -1405,7 +1429,7 @@ int ping_host_add (pingobj_t *obj, const char *host) snprintf (errmsg, PING_ERRMSG_LEN, "Unknown `ai_family': %i", ai_ptr->ai_family); errmsg[PING_ERRMSG_LEN - 1] = '\0'; - dprintf (errmsg); + dprintf ("%s", errmsg); ping_set_error (obj, "getaddrinfo", errmsg); continue; } @@ -1451,7 +1475,7 @@ int ping_host_add (pingobj_t *obj, const char *host) { #if WITH_DEBUG char errbuf[PING_ERRMSG_LEN]; - dprintf ("setsockopt: %s\n", + dprintf ("setsockopt (SO_BINDTODEVICE): %s\n", sstrerror (errno, errbuf, sizeof (errbuf))); #endif ping_set_errno (obj, errno); @@ -1461,7 +1485,29 @@ int ping_host_add (pingobj_t *obj, const char *host) } } #endif /* SO_BINDTODEVICE */ +#ifdef SO_TIMESTAMP + if (1) /* {{{ */ + { + int status; + int opt = 1; + status = setsockopt (ph->fd, + SOL_SOCKET, SO_TIMESTAMP, + &opt, sizeof (opt)); + if (status != 0) + { +#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); + close (ph->fd); + ph->fd = -1; + continue; + } + } /* }}} if (1) */ +#endif /* SO_TIMESTAMP */ 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); @@ -1494,10 +1540,12 @@ int ping_host_add (pingobj_t *obj, const char *host) { int opt; +#ifdef IP_RECVTOS /* Enable receiving the TOS field */ opt = 1; setsockopt (ph->fd, IPPROTO_IP, IP_RECVTOS, &opt, sizeof (opt)); +#endif /* IP_RECVTOS */ /* Enable receiving the TTL field */ opt = 1; @@ -1558,7 +1606,7 @@ int ping_host_add (pingobj_t *obj, const char *host) } ping_set_ttl (ph, obj->ttl); - ping_set_tos (ph, obj->tos); + ping_set_qos (obj, ph, obj->qos); return (0); } /* int ping_host_add */ @@ -1738,13 +1786,13 @@ int ping_iterator_get_info (pingobj_iter_t *iter, int info, ret = 0; break; - case PING_INFO_RECV_TOS: + case PING_INFO_RECV_QOS: 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); + memcpy(buffer,&iter->recv_qos,*buffer_len); ret = 0; break; }