X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fliboping.c;h=6e8d7557cee95b8ed69c63deaa249d9d9c8ccf5a;hb=fa2472c13520e232e3e9621dce062cdc71549b76;hp=d5e1ffc255e8a53440a524ca65264bb00e922ff8;hpb=08991474f5e5c8208287f13351b7c25ff73acfb3;p=liboping.git

diff --git a/src/liboping.c b/src/liboping.c
index d5e1ffc..6e8d755 100644
--- a/src/liboping.c
+++ b/src/liboping.c
@@ -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 = %#04"PRIx8";\n", recv_tos);
+				dprintf ("TOSv4 = 0x%02"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 = %#04"PRIx8";\n", recv_tos);
+				dprintf ("TOSv6 = 0x%02"PRIx8";\n", recv_tos);
 			} else
 			if (cmsg->cmsg_type == IPV6_HOPLIMIT)
 			{
@@ -956,21 +956,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_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);
@@ -1133,7 +1151,7 @@ int ping_setopt (pingobj_t *obj, int option, void *value)
 
 			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;
 		}
 
@@ -1558,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 */