![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/liboping.c b/src/liboping.c
index 139fa97ca72f37be4d3eb65622a960b99e27e2f2..a272e2cb92f7051ad964be0f20f67874fefc2b21 100644 (file)
--- a/src/liboping.c
+++ b/src/liboping.c
double latency;
uint32_t dropped;
int recv_ttl;
- uint8_t recv_tos;
+ uint8_t recv_qos;
char *data;
void *context;
double timeout;
int ttl;
int addrfamily;
- uint8_t tos;
+ uint8_t qos;
char *data;
struct sockaddr *srcaddr;
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);
}
struct timeval diff;
pinghost_t *host = NULL;
int recv_ttl;
- uint8_t recv_tos;
+ uint8_t recv_qos;
/*
* Set up the receive buffer..
/* Iterate over all auxiliary data in msghdr */
recv_ttl = -1;
- recv_tos = 0xff;
+ recv_qos = 0xff;
for (cmsg = CMSG_FIRSTHDR (&msghdr); /* {{{ */
cmsg != NULL;
cmsg = CMSG_NXTHDR (&msghdr, cmsg))
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)
{
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)
{
if (recv_ttl >= 0)
host->recv_ttl = recv_ttl;
- if (recv_tos != 0xffff)
- host->recv_tos = recv_tos;
+ if (recv_qos != 0xffff)
+ host->recv_qos = recv_qos;
host->latency = ((double) diff.tv_usec) / 1000.0;
host->latency += ((double) diff.tv_sec) * 1000.0;
/*
* 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)
+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 %i\n", ttl);
+ 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 %i\n", ttl);
+ /* 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);
obj->ttl = PING_DEF_TTL;
obj->addrfamily = PING_DEF_AF;
obj->data = strdup (PING_DEF_DATA);
- obj->tos = 0;
+ obj->qos = 0;
return (obj);
}
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;
}
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);
}
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 */
ret = 0;
break;
- case PING_INFO_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;
}