X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fliboping.c;h=6aee297f7b944060aab4f7a24f44f4fdda8e7d57;hb=fc98f4512f4f9a7cba3d4999a7f6d3da6aa5286a;hp=2e7f2889ac13077ed4666211a352b15253eff155;hpb=8d1c1159dc6f2a923f5c7f133c0fd07339456b90;p=liboping.git diff --git a/src/liboping.c b/src/liboping.c index 2e7f288..6aee297 100644 --- a/src/liboping.c +++ b/src/liboping.c @@ -117,7 +117,7 @@ struct pinghost double latency; uint32_t dropped; int recv_ttl; - unsigned recv_tos; + uint8_t recv_tos; char *data; void *context; @@ -130,7 +130,7 @@ struct pingobj double timeout; int ttl; int addrfamily; - unsigned tos; + uint8_t tos; char *data; struct sockaddr *srcaddr; @@ -353,8 +353,8 @@ static pinghost_t *ping_receive_ipv4 (pingobj_t *obj, char *buffer, } if (ptr != NULL){ - ptr->recv_ttl = ip_hdr->ip_ttl; - ptr->recv_tos = ip_hdr->ip_tos; + ptr->recv_ttl = (int) ip_hdr->ip_ttl; + ptr->recv_tos = (uint8_t) ip_hdr->ip_tos; } return (ptr); } @@ -453,7 +453,7 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, struct timeval diff; pinghost_t *host = NULL; int recv_ttl; - unsigned recv_tos; + uint8_t recv_tos; /* * Set up the receive buffer.. @@ -499,7 +499,7 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, /* Iterate over all auxiliary data in msghdr */ recv_ttl = -1; - recv_tos = 0xffff; + recv_tos = 0xff; for (cmsg = CMSG_FIRSTHDR (&msghdr); /* {{{ */ cmsg != NULL; cmsg = CMSG_NXTHDR (&msghdr, cmsg)) @@ -513,7 +513,7 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph, { memcpy (&recv_tos, CMSG_DATA (cmsg), sizeof (recv_tos)); - dprintf ("TOSv4 = %u;\n", recv_tos); + dprintf ("TOSv4 = %#04"PRIx8";\n", recv_tos); } else if (cmsg->cmsg_type == IP_TTL) { @@ -532,11 +532,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 = %u;\n", recv_tos); + dprintf ("TOSv6 = %#04"PRIx8";\n", recv_tos); } else if (cmsg->cmsg_type == IPV6_HOPLIMIT) { @@ -952,22 +952,43 @@ static int ping_set_ttl (pinghost_t *ph, int ttl) /* * 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, unsigned tos) +static int ping_set_tos (pingobj_t *obj, pinghost_t *ph, uint8_t tos) { - int ret = -2; + int ret = EINVAL; + char errbuf[PING_ERRMSG_LEN]; if (ph->addrfamily == AF_INET) { - dprintf ("Setting TP_TOS to %i\n", ttl); + dprintf ("Setting TP_TOS to %#04"PRIx8"\n", tos); ret = setsockopt (ph->fd, IPPROTO_IP, IP_TOS, &tos, sizeof (tos)); + if (ret != 0) + { + ret = errno; + ping_set_error (obj, "ping_set_tos", + sstrerror (ret, errbuf, sizeof (errbuf))); + dprintf ("Setting TP_TOS failed: %s\n", errbuf); + } } else if (ph->addrfamily == AF_INET6) { - dprintf ("Setting IPV6_TCLASS to %i\n", ttl); + /* IPV6_TCLASS requires an "int". */ + int tmp = (int) tos; + + dprintf ("Setting IPV6_TCLASS to %#04"PRIx8" (%i)\n", tos, 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_tos", + sstrerror (ret, errbuf, sizeof (errbuf))); + dprintf ("Setting IPV6_TCLASS failed: %s\n", errbuf); + } } return (ret); @@ -1072,13 +1093,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; + obj->tos = 0; return (obj); } @@ -1124,13 +1145,16 @@ int ping_setopt (pingobj_t *obj, int option, void *value) switch (option) { - case PING_OPT_TOS:{ - obj->tos=*(unsigned *)value; + 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); + ping_set_tos (obj, ph, obj->tos); break; } + case PING_OPT_TIMEOUT: obj->timeout = *((double *) value); if (obj->timeout < 0.0) @@ -1486,23 +1510,41 @@ int ping_host_add (pingobj_t *obj, const char *host) if (ph->addrfamily == AF_INET) { - int opt = 1; + 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(IPPROTO_IPV6) && defined(IPV6_RECVHOPLIMIT) +#if defined(IPV6_RECVHOPLIMIT) || defined(IPV6_RECVTCLASS) else if (ph->addrfamily == AF_INET6) { - int opt = 1; + 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 +#endif /* IPV6_RECVHOPLIMIT || IPV6_RECVTCLASS */ break; - } + } /* for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) */ freeaddrinfo (ai_list); @@ -1534,7 +1576,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_tos (obj, ph, obj->tos); return (0); } /* int ping_host_add */ @@ -1714,7 +1756,7 @@ int ping_iterator_get_info (pingobj_iter_t *iter, int info, ret = 0; break; - case PING_INFO_TOS: + case PING_INFO_RECV_TOS: ret = ENOMEM; if (*buffer_len>sizeof(unsigned)) *buffer_len=sizeof(unsigned); if (!*buffer_len) *buffer_len=1;