From af867b18aaebbe7d499302a6e9cc538c5c323626 Mon Sep 17 00:00:00 2001
From: Stefanos Harhalakis <v13@v13.gr>
Date: Mon, 18 Mar 2013 12:48:22 -0700
Subject: Fix gcc warnings.

This is just to make -Werror succeed as the samples are not that
important.
---
 libnet/sample/bgp4_hdr.c          |  4 ++--
 libnet/sample/bgp4_notification.c |  4 ++--
 libnet/sample/bgp4_open.c         |  4 ++--
 libnet/sample/bgp4_update.c       | 12 ++++++------
 libnet/sample/cdp.c               |  2 +-
 libnet/sample/dhcp_discover.c     |  3 ++-
 libnet/sample/dns.c               |  2 +-
 libnet/sample/dot1x.c             |  2 +-
 libnet/sample/fddi_tcp1.c         |  2 +-
 libnet/sample/fddi_tcp2.c         |  2 +-
 libnet/sample/gre.c               | 10 +++++-----
 libnet/sample/hsrp.c              |  6 +++---
 libnet/sample/icmp6_echoreq.c     |  2 +-
 libnet/sample/icmp_echo_cq.c      |  2 +-
 libnet/sample/ip_link.c           |  8 ++++----
 libnet/sample/ip_raw.c            |  4 ++--
 libnet/sample/mpls.c              |  4 ++--
 libnet/sample/ping_of_death.c     |  3 ++-
 libnet/sample/rpc_tcp.c           |  2 +-
 libnet/sample/rpc_udp.c           |  2 +-
 libnet/sample/sebek.c             | 14 +++++++-------
 libnet/sample/tring_tcp1.c        |  2 +-
 libnet/sample/tring_tcp2.c        |  2 +-
 libnet/sample/udp1.c              |  3 ++-
 libnet/sample/udp2.c              |  8 +++++---
 25 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/libnet/sample/bgp4_hdr.c b/libnet/sample/bgp4_hdr.c
index 3cb61e9..fe49a98 100644
--- a/libnet/sample/bgp4_hdr.c
+++ b/libnet/sample/bgp4_hdr.c
@@ -116,8 +116,8 @@ main(int argc, char *argv[])
 		break;
 
 	    case 'p':
-		payload = optarg;
-		payload_s = strlen(optarg);
+		payload = (u_char *)optarg;
+		payload_s = strlen((char *)optarg);
 		break;
 
             default:
diff --git a/libnet/sample/bgp4_notification.c b/libnet/sample/bgp4_notification.c
index 8746027..d577679 100644
--- a/libnet/sample/bgp4_notification.c
+++ b/libnet/sample/bgp4_notification.c
@@ -123,8 +123,8 @@ main(int argc, char *argv[])
 		break;
 
 	    case 'p':
-		payload = optarg;
-		payload_s = strlen(optarg);
+		payload = (u_char *)optarg;
+		payload_s = strlen((char *)optarg);
 		break;
 
             default:
diff --git a/libnet/sample/bgp4_open.c b/libnet/sample/bgp4_open.c
index 8fd9b0b..74d4b79 100644
--- a/libnet/sample/bgp4_open.c
+++ b/libnet/sample/bgp4_open.c
@@ -124,7 +124,7 @@ main(int argc, char *argv[])
 		break;
 
 	    case 'p':
-		payload = optarg;
+		payload = (u_char *)optarg;
 		break;
 
 	    case 'S':
@@ -156,7 +156,7 @@ main(int argc, char *argv[])
 
     if (payload && !payload_s)
     {
-	payload_s = strlen(payload);
+	payload_s = strlen((char *)payload);
     }
 
     length = LIBNET_BGP4_OPEN_H + payload_s;
diff --git a/libnet/sample/bgp4_update.c b/libnet/sample/bgp4_update.c
index 3fabf36..1fd4a71 100644
--- a/libnet/sample/bgp4_update.c
+++ b/libnet/sample/bgp4_update.c
@@ -95,7 +95,7 @@
                                                                                \
     if (ptr && !size)                                                          \
     {                                                                          \
-	size = strlen(ptr);                                                    \
+	size = strlen((char *)ptr);                                            \
     }                                                                          
 
 
@@ -169,12 +169,12 @@ main(int argc, char *argv[])
                 break;
 
 	    case 'p':
-		payload = optarg;
-		payload_s = strlen(payload);
+		payload = (u_char *)optarg;
+		payload_s = strlen((char *)payload);
 		break;
 
 	    case 'w':
-		withdraw_rt = optarg;
+		withdraw_rt = (u_char *)optarg;
 		break;
 
 	    case 'W':
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
 		break;
 
 	    case 'a':
-		attr = optarg;
+		attr = (u_char *)optarg;
 		break;
 
 	    case 'A':
@@ -190,7 +190,7 @@ main(int argc, char *argv[])
 		break;
 
 	    case 'i':
-		info = optarg;
+		info = (u_char *)optarg;
 		break;
 
 	    case 'I':
diff --git a/libnet/sample/cdp.c b/libnet/sample/cdp.c
index 32ed77d..0869524 100644
--- a/libnet/sample/cdp.c
+++ b/libnet/sample/cdp.c
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
     index += 5;
 
     /* this TLV is handled by the libnet builder */
-    value = argv[2];
+    value = (u_char *)argv[2];
     len = strlen(argv[2]);
 
     /* build CDP header */
diff --git a/libnet/sample/dhcp_discover.c b/libnet/sample/dhcp_discover.c
index 054443a..db255b9 100644
--- a/libnet/sample/dhcp_discover.c
+++ b/libnet/sample/dhcp_discover.c
@@ -232,7 +232,8 @@ main(int argc, char *argv[])
         fprintf(stderr, "Packets sent:  %lld\n"
                     "Packet errors: %lld\n"
                     "Bytes written: %lld\n",
-                    ls.packets_sent, ls.packet_errors, ls.bytes_written);
+                    (long long)ls.packets_sent, (long long)ls.packet_errors,
+		    (long long)ls.bytes_written);
         libnet_destroy(l);
         
         free(options);
diff --git a/libnet/sample/dns.c b/libnet/sample/dns.c
index d4a9727..6ec4e16 100644
--- a/libnet/sample/dns.c
+++ b/libnet/sample/dns.c
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
 	0,             /* num_anws_rr */
 	0,             /* num_auth_rr */
 	0,             /* num_addi_rr */
-	payload,
+	(uint8_t *)payload,
 	payload_s,
 	l,
 	0
diff --git a/libnet/sample/dot1x.c b/libnet/sample/dot1x.c
index 92e8edd..2d0e65c 100644
--- a/libnet/sample/dot1x.c
+++ b/libnet/sample/dot1x.c
@@ -68,7 +68,7 @@ main(int argc, char *argv[])
             0,
             LIBNET_802_1X_PACKET,
             sizeof(payload),
-            payload,
+            (uint8_t *)payload,
             sizeof(payload),
             l,
             0);
diff --git a/libnet/sample/fddi_tcp1.c b/libnet/sample/fddi_tcp1.c
index c58b788..0cd862b 100644
--- a/libnet/sample/fddi_tcp1.c
+++ b/libnet/sample/fddi_tcp1.c
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
         0,                                          /* checksum */
         0,                                          /* urgent pointer */
         LIBNET_TCP_H + payload_s,                   /* TCP packet size */
-        payload,                                    /* payload */
+        (uint8_t *)payload,                         /* payload */
         payload_s,                                  /* payload size */
         l,                                          /* libnet handle */
         0);                                         /* libnet id */
diff --git a/libnet/sample/fddi_tcp2.c b/libnet/sample/fddi_tcp2.c
index 42b62f7..5ccf9fc 100644
--- a/libnet/sample/fddi_tcp2.c
+++ b/libnet/sample/fddi_tcp2.c
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
         0,                                          /* checksum */
         0,                                          /* urgent pointer */
         LIBNET_TCP_H + payload_s,                   /* TCP packet size */
-        payload,                                    /* payload */
+        (uint8_t *)payload,                         /* payload */
         payload_s,                                  /* payload size */
         l,                                          /* libnet handle */
         0);                                         /* libnet id */
diff --git a/libnet/sample/gre.c b/libnet/sample/gre.c
index dd6befa..f13de56 100644
--- a/libnet/sample/gre.c
+++ b/libnet/sample/gre.c
@@ -177,7 +177,7 @@ main(int argc, char *argv[])
 		gre_flags|=GRE_CSUM;
                 break;
 	    case 'r':
-		routing = optarg;
+		routing = (u_char *)optarg;
 		gre_flags|=GRE_ROUTING;
                 break;
 	    case 'k':
@@ -316,11 +316,11 @@ main(int argc, char *argv[])
 	    fprintf(stderr, "Can't build GRE last SRE header: %s\n", libnet_geterror(l));
 	    goto bad;
 	}
-	size += LIBNET_GRE_SRE_H + strlen(routing);
+	size += LIBNET_GRE_SRE_H + strlen((char *)routing);
 	t = libnet_build_gre_sre(
 	    GRE_IP,                                 /* address family */
 	    0,                                      /* offset */
-	    strlen(routing),                        /* routing length */
+	    strlen((char *)routing),                /* routing length */
 	    routing,                                /* routing info */
 	    NULL,                                   /* payload */
 	    0,                                      /* payload size */
@@ -379,8 +379,8 @@ main(int argc, char *argv[])
     } 
 
     t = libnet_autobuild_ethernet(
-            "11:11:11:11:11:11",                                    /* ethernet destination */
-            ETHERTYPE_IP,                          /* protocol type */
+            (uint8_t *)"11:11:11:11:11:11",         /* ethernet destination */
+            ETHERTYPE_IP,                           /* protocol type */
             l);                                     /* libnet handle */
     if (t == -1)
     {
diff --git a/libnet/sample/hsrp.c b/libnet/sample/hsrp.c
index 44dae24..3dc0fa2 100644
--- a/libnet/sample/hsrp.c
+++ b/libnet/sample/hsrp.c
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
     }
 
     memset(authdata, 0, 8);
-    strncpy(authdata, "cisco", 5);
+    strncpy((char *)authdata, "cisco", 5);
 
 
     ptag = libnet_build_hsrp(
@@ -151,9 +151,9 @@ main(int argc, char *argv[])
     }
 
     
-    eth_dst = libnet_hex_aton(eth_dst, &c);
+    eth_dst = (char *)libnet_hex_aton(eth_dst, &c);
     ptag = libnet_autobuild_ethernet(
-	eth_dst,                                /* ethernet destination */
+	(uint8_t *)eth_dst,                     /* ethernet destination */
 	ETHERTYPE_IP,                           /* protocol type */
 	l);                                     /* libnet handle */
 
diff --git a/libnet/sample/icmp6_echoreq.c b/libnet/sample/icmp6_echoreq.c
index 3ef1b91..020a621 100644
--- a/libnet/sample/icmp6_echoreq.c
+++ b/libnet/sample/icmp6_echoreq.c
@@ -126,7 +126,7 @@ main(int argc, char **argv)
 			char payload[56];
 			int i;
 			for (i=0; i<56; i++) payload[i]='A'+((char)(i%26));
-			t = libnet_build_icmpv4_echo(ICMP6_ECHO,0,0,1,0,payload,sizeof(payload),l,t);
+			t = libnet_build_icmpv4_echo(ICMP6_ECHO,0,0,1,0,(uint8_t *)payload,sizeof(payload),l,t);
 
             if (build_ip)
             {
diff --git a/libnet/sample/icmp_echo_cq.c b/libnet/sample/icmp_echo_cq.c
index c5b2401..7947c48 100644
--- a/libnet/sample/icmp_echo_cq.c
+++ b/libnet/sample/icmp_echo_cq.c
@@ -143,7 +143,7 @@ main(int argc, char **argv)
             0,                                    /* checksum */
             src_ip,                               /* source IP */
             dst_ip,                               /* destination IP */
-            payload,                              /* payload */
+            (uint8_t *)payload,                   /* payload */
             payload_s,                            /* payload size */
             l,                                    /* libnet handle */
             0);
diff --git a/libnet/sample/ip_link.c b/libnet/sample/ip_link.c
index b23d322..4317f84 100644
--- a/libnet/sample/ip_link.c
+++ b/libnet/sample/ip_link.c
@@ -88,8 +88,8 @@ main(int argc, char *argv[])
 		break;
 
 	    case 'p':
-		strncpy(payload, optarg, sizeof(payload)-1);
-		payload_s = strlen(payload);
+		strncpy((char *)payload, optarg, sizeof(payload)-1);
+		payload_s = strlen((char *)payload);
 		break;
 
 	    case 'h':
@@ -154,8 +154,8 @@ main(int argc, char *argv[])
     }
 
     eth_ptag = libnet_build_ethernet(
-        hwdst,                                      /* ethernet destination */
-        hwsrc,                                      /* ethernet source */
+        (uint8_t *)hwdst,                           /* ethernet destination */
+        (uint8_t *)hwsrc,                           /* ethernet source */
         ETHERTYPE_IP,                               /* protocol type */
         NULL,                                       /* payload */
         0,                                          /* payload size */
diff --git a/libnet/sample/ip_raw.c b/libnet/sample/ip_raw.c
index 5bb0592..9e69238 100644
--- a/libnet/sample/ip_raw.c
+++ b/libnet/sample/ip_raw.c
@@ -81,8 +81,8 @@ main(int argc, char *argv[])
 		break;
 
 	    case 'p':
-		strncpy(payload, optarg, sizeof(payload)-1);
-		payload_s = strlen(payload);
+		strncpy((char *)payload, optarg, sizeof(payload)-1);
+		payload_s = strlen((char *)payload);
 		break;
 
 	    case 'h':
diff --git a/libnet/sample/mpls.c b/libnet/sample/mpls.c
index 35ad385..7e29bc8 100644
--- a/libnet/sample/mpls.c
+++ b/libnet/sample/mpls.c
@@ -107,8 +107,8 @@ main(int argc, char *argv[])
                 }
                 break;
             case 'p':
-                payload = optarg;
-                payload_s = strlen(payload);
+                payload = (u_char *)optarg;
+                payload_s = strlen((char *)payload);
                 break;
             default:
                 exit(EXIT_FAILURE);
diff --git a/libnet/sample/ping_of_death.c b/libnet/sample/ping_of_death.c
index b71cb05..2ec80c6 100644
--- a/libnet/sample/ping_of_death.c
+++ b/libnet/sample/ping_of_death.c
@@ -158,7 +158,8 @@ main(int argc, char **argv)
     fprintf(stderr, "Packets sent:  %lld\n"
                     "Packet errors: %lld\n"
                     "Bytes written: %lld\n",
-                    ls.packets_sent, ls.packet_errors, ls.bytes_written);
+                    (long long)ls.packets_sent, (long long)ls.packet_errors,
+		    (long long)ls.bytes_written);
     libnet_destroy(l);
     free(data);
     return (EXIT_SUCCESS);
diff --git a/libnet/sample/rpc_tcp.c b/libnet/sample/rpc_tcp.c
index aa2278e..fe1f990 100644
--- a/libnet/sample/rpc_tcp.c
+++ b/libnet/sample/rpc_tcp.c
@@ -131,7 +131,7 @@ main(int argc, char **argv)
         0,
         0,
         NULL,
-        payload,
+        (uint8_t *)payload,
         payload_s,
         l,
         0);
diff --git a/libnet/sample/rpc_udp.c b/libnet/sample/rpc_udp.c
index cccb614..dded76b 100644
--- a/libnet/sample/rpc_udp.c
+++ b/libnet/sample/rpc_udp.c
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
         0,
         0,
         NULL,
-        payload,
+        (uint8_t *)payload,
         payload_s,
         l,
         0);
diff --git a/libnet/sample/sebek.c b/libnet/sample/sebek.c
index e2493fa..a307d37 100644
--- a/libnet/sample/sebek.c
+++ b/libnet/sample/sebek.c
@@ -135,8 +135,8 @@ main(int argc, char *argv[])
 
 	    case 'p':
 		payload_flag = 1;
-		payload = optarg; 
-		payload_s = strlen(payload);
+		payload = (u_char *)optarg; 
+		payload_s = strlen((char *)payload);
 		break;
 
 	    case 'h':
@@ -187,7 +187,7 @@ main(int argc, char *argv[])
 
     if (!payload)
     {
-	payload = cmd;
+	payload = (uint8_t *)cmd;
 	payload_s = length;
     }
 
@@ -202,9 +202,9 @@ main(int argc, char *argv[])
 	pid,
 	uid,
 	fd,
-	cmd,
+	(uint8_t *)cmd,
 	/* LIBNET_ETH_H + LIBNET_IPV4_H + LIBNET_UDP_H + LIBNET_SEBEK_H +*/ length,
-	payload,
+	(uint8_t *)payload,
 	payload_s,
 	l,
 	0
@@ -254,9 +254,9 @@ main(int argc, char *argv[])
     }
 
     
-    eth_dst = libnet_hex_aton(eth_dst, &c);
+    eth_dst = (char *)libnet_hex_aton((char *)eth_dst, &c);
     ptag = libnet_autobuild_ethernet(
-	eth_dst,                                /* ethernet destination */
+	(uint8_t *)eth_dst,                     /* ethernet destination */
 	ETHERTYPE_IP,                           /* protocol type */
 	l);                                     /* libnet handle */
 
diff --git a/libnet/sample/tring_tcp1.c b/libnet/sample/tring_tcp1.c
index 44126ba..dab4c81 100644
--- a/libnet/sample/tring_tcp1.c
+++ b/libnet/sample/tring_tcp1.c
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
         0,                                          /* checksum */
         0,                                          /* urgent pointer */
         LIBNET_TCP_H + payload_s,                   /* TCP packet size */
-        payload,                                    /* payload */
+        (uint8_t *)payload,                         /* payload */
         payload_s,                                  /* payload size */
         l,                                          /* libnet handle */
         0);                                         /* libnet id */
diff --git a/libnet/sample/tring_tcp2.c b/libnet/sample/tring_tcp2.c
index d60936e..fcdff5b 100644
--- a/libnet/sample/tring_tcp2.c
+++ b/libnet/sample/tring_tcp2.c
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
         0,                                          /* checksum */
         0,                                          /* urgent pointer */
         LIBNET_TCP_H + payload_s,                   /* TCP packet size */
-        payload,                                    /* payload */
+        (uint8_t *)payload,                         /* payload */
         payload_s,                                  /* payload size */
         l,                                          /* libnet handle */
         0);                                         /* libnet id */
diff --git a/libnet/sample/udp1.c b/libnet/sample/udp1.c
index dad4824..ec169c2 100644
--- a/libnet/sample/udp1.c
+++ b/libnet/sample/udp1.c
@@ -198,7 +198,8 @@ main(int argc, char *argv[])
     fprintf(stderr, "Packets sent:  %lld\n"
                     "Packet errors: %lld\n"
                     "Bytes written: %lld\n",
-                    ls.packets_sent, ls.packet_errors, ls.bytes_written);
+                    (long long)ls.packets_sent, (long long)ls.packet_errors,
+		    (long long)ls.bytes_written);
     libnet_destroy(l);
     return (EXIT_SUCCESS);
 bad:
diff --git a/libnet/sample/udp2.c b/libnet/sample/udp2.c
index 127c1ce..bd71c52 100644
--- a/libnet/sample/udp2.c
+++ b/libnet/sample/udp2.c
@@ -137,7 +137,7 @@ main(int argc, char **argv)
                 cport,                              /* destination port */
                 LIBNET_UDP_H + payload_s,           /* packet size */
                 0,                                  /* checksum */
-                payload,                            /* payload */
+                (uint8_t *)payload,                 /* payload */
                 payload_s,                          /* payload size */
                 l,                                  /* libnet handle */
                 udp);                               /* libnet id */
@@ -208,13 +208,15 @@ main(int argc, char **argv)
 #endif
 
     libnet_timersub(&e, &s, &r);
-    fprintf(stderr, "Total time spent in loop: %d.%d\n", r.tv_sec, r.tv_usec);
+    fprintf(stderr, "Total time spent in loop: %d.%d\n", (int)r.tv_sec,
+		    (int)r.tv_usec);
 
     libnet_stats(l, &ls);
     fprintf(stderr, "Packets sent:  %lld\n"
                     "Packet errors: %lld\n"
                     "Bytes written: %lld\n",
-                    ls.packets_sent, ls.packet_errors, ls.bytes_written);
+                    (long long)ls.packets_sent, (long long)ls.packet_errors,
+		    (long long)ls.bytes_written);
     libnet_destroy(l);
     return (EXIT_SUCCESS);
 bad:
-- 
cgit v1.2.1