libnet (inconsistently) uses various signed and/or unsigned typedefs instead of char

ANSI C uses char for string literals and the standard library, so this generates many warnings. I've fixed a number of the places where types representing null-terminated strings weren't typed correctly.

26 files changed, 43 insertions, 43 deletions

diff --git a/libnet/include/ifaddrlist.h b/libnet/include/ifaddrlist.h
index 4c0dca6..8ba7380 100644
--- a/libnet/include/ifaddrlist.h
+++ b/libnet/include/ifaddrlist.h
@@ -27,13 +27,13 @@ struct ifaddrlist
 #else
     u_int32_t addr;              
 #endif
-    int8_t *device;
+    char *device;
 };
 
 struct libnet_ifaddr_list
 {
     u_int32_t addr;
-    int8_t *device;
+    char *device;
 };
 
 int
diff --git a/libnet/include/libnet/libnet-functions.h b/libnet/include/libnet/libnet-functions.h
index e7b2fd2..c4fe599 100644
--- a/libnet/include/libnet/libnet-functions.h
+++ b/libnet/include/libnet/libnet-functions.h
@@ -103,7 +103,7 @@ libnet_getfd(libnet_t *l);
  * @return the canonical name of the device used for packet injection. Note 
  * it can be NULL without being an error.
  */
-int8_t *
+const char *
 libnet_getdevice(libnet_t *l);
 
 /**
@@ -1705,7 +1705,7 @@ libnet_get_hwaddr(libnet_t *l);
  * @return a byte string or NULL on failure
  */
 u_int8_t *
-libnet_hex_aton(int8_t *s, int *len);
+libnet_hex_aton(const char *s, int *len);
 
 /**
  * [Advanced Interface]
@@ -1819,7 +1819,7 @@ libnet_cq_remove_by_label(char *label);
  * @param l pointer to a libnet context
  * @return pointer to the libnet context's label
  */   
-int8_t *
+const char *
 libnet_cq_getlabel(libnet_t *l);
  
 /**
diff --git a/libnet/sample/cdp.c b/libnet/sample/cdp.c
index 6ebe04f..0f3896d 100644
--- a/libnet/sample/cdp.c
+++ b/libnet/sample/cdp.c
@@ -41,7 +41,7 @@ main(int argc, char *argv[])
     int c, len;
     libnet_t *l;
     libnet_ptag_t t;
-    u_char *value;
+    char *value;
     u_char values[100];
     u_short tmp;
     u_long tmp2;
@@ -72,7 +72,7 @@ main(int argc, char *argv[])
             0,                                      /* checksum */
             LIBNET_CDP_DEVID,                       /* type */
             len,                                    /* length */
-            value,                                  /* value */
+            (u_char*)value,                         /* value */
             NULL,                                   /* payload */
             0,                                      /* payload size */
             l,                                      /* libnet handle */
diff --git a/libnet/sample/fddi_tcp1.c b/libnet/sample/fddi_tcp1.c
index e363333..c58b788 100644
--- a/libnet/sample/fddi_tcp1.c
+++ b/libnet/sample/fddi_tcp1.c
@@ -37,7 +37,7 @@ int
 main(int argc, char *argv[])
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     char *payload;
diff --git a/libnet/sample/fddi_tcp2.c b/libnet/sample/fddi_tcp2.c
index 1ed29c0..42b62f7 100644
--- a/libnet/sample/fddi_tcp2.c
+++ b/libnet/sample/fddi_tcp2.c
@@ -37,7 +37,7 @@ int
 main(int argc, char *argv[])
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     char *payload;
diff --git a/libnet/sample/icmp6_echoreq.c b/libnet/sample/icmp6_echoreq.c
index d874372..416b2f5 100644
--- a/libnet/sample/icmp6_echoreq.c
+++ b/libnet/sample/icmp6_echoreq.c
@@ -48,7 +48,7 @@ main(int argc, char **argv)
     u_short src_prt = 0;
     libnet_t *l;
     libnet_ptag_t t;
-    u_char *cp;
+    char *cp;
     char errbuf[LIBNET_ERRBUF_SIZE];
     int i, c, packet_amt, burst_int, burst_amt, build_ip;
 	char srcname[100],dstname[100];
@@ -123,7 +123,7 @@ main(int argc, char **argv)
     {
         for (i = 0; i < packet_amt; i++)
         {
-			char payload[56];
+			u_int8_t 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);
diff --git a/libnet/sample/mpls.c b/libnet/sample/mpls.c
index 7e6a070..35ad385 100644
--- a/libnet/sample/mpls.c
+++ b/libnet/sample/mpls.c
@@ -39,7 +39,7 @@ int
 main(int argc, char *argv[])
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     u_char *payload;
diff --git a/libnet/sample/ospf_hello.c b/libnet/sample/ospf_hello.c
index a4e3494..8ffe864 100644
--- a/libnet/sample/ospf_hello.c
+++ b/libnet/sample/ospf_hello.c
@@ -46,7 +46,7 @@ main(int argc, char **argv)
     libnet_ptag_t t;
     u_long src, dst, nbr;
     char errbuf[LIBNET_ERRBUF_SIZE];
-    u_char *to, *from, *neighbor;
+    char *to, *from, *neighbor;
     u_char auth[8] = {0,0,0,0,0,0,0,0};
 
 
diff --git a/libnet/sample/rpc_tcp.c b/libnet/sample/rpc_tcp.c
index 4a19b54..aa2278e 100644
--- a/libnet/sample/rpc_tcp.c
+++ b/libnet/sample/rpc_tcp.c
@@ -39,7 +39,7 @@ int
 main(int argc, char **argv)
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     char *payload;
diff --git a/libnet/sample/rpc_udp.c b/libnet/sample/rpc_udp.c
index 06f4b26..cccb614 100644
--- a/libnet/sample/rpc_udp.c
+++ b/libnet/sample/rpc_udp.c
@@ -40,7 +40,7 @@ int
 main(int argc, char *argv[])
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     libnet_ptag_t ip;
diff --git a/libnet/sample/synflood.c b/libnet/sample/synflood.c
index e3fe8b5..a785a80 100644
--- a/libnet/sample/synflood.c
+++ b/libnet/sample/synflood.c
@@ -50,7 +50,7 @@ main(int argc, char **argv)
     u_short src_prt = 0;
     libnet_t *l;
     libnet_ptag_t t;
-    u_char *cp;
+    char *cp;
     char errbuf[LIBNET_ERRBUF_SIZE];
     int i, c, packet_amt, burst_int, burst_amt, build_ip;
 
diff --git a/libnet/sample/synflood6.c b/libnet/sample/synflood6.c
index 88ee43f..6ad2a53 100644
--- a/libnet/sample/synflood6.c
+++ b/libnet/sample/synflood6.c
@@ -52,7 +52,7 @@ main(int argc, char **argv)
     u_short src_prt = 0;
     libnet_t *l;
     libnet_ptag_t t;
-    u_char *cp;
+    char *cp;
     char errbuf[LIBNET_ERRBUF_SIZE];
     int i, c, packet_amt, burst_int, burst_amt, build_ip;
 	char srcname[100],dstname[100];
diff --git a/libnet/sample/synflood6_frag.c b/libnet/sample/synflood6_frag.c
index 54e2aab..13a5fdc 100644
--- a/libnet/sample/synflood6_frag.c
+++ b/libnet/sample/synflood6_frag.c
@@ -52,7 +52,7 @@ main(int argc, char **argv)
     u_short src_prt = 0;
     libnet_t *l;
     libnet_ptag_t tcp, ip, ip_frag;
-    u_char *cp;
+    char *cp;
     char errbuf[LIBNET_ERRBUF_SIZE];
     int i, j, c, packet_amt, burst_int, burst_amt;
     char srcname[100], dstname[100];
diff --git a/libnet/sample/tcp1.c b/libnet/sample/tcp1.c
index 4253cf6..8ee4958 100644
--- a/libnet/sample/tcp1.c
+++ b/libnet/sample/tcp1.c
@@ -42,7 +42,7 @@ int
 main(int argc, char *argv[])
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     char *payload;
@@ -125,7 +125,7 @@ main(int argc, char *argv[])
     }
 
     t = libnet_build_tcp_options(
-        "\003\003\012\001\002\004\001\011\010\012\077\077\077\077\000\000\000\000\000\000",
+        (u_int8_t*)"\003\003\012\001\002\004\001\011\010\012\077\077\077\077\000\000\000\000\000\000",
         20,
         l,
         0);
@@ -145,7 +145,7 @@ main(int argc, char *argv[])
         0,                                          /* checksum */
         10,                                          /* urgent pointer */
         LIBNET_TCP_H + 20 + payload_s,              /* TCP packet size */
-	    payload,                                    /* payload */
+	(u_int8_t*)payload,                         /* payload */
         payload_s,                                  /* payload size */
         l,                                          /* libnet handle */
         0);                                         /* libnet id */
diff --git a/libnet/sample/tcp2.c b/libnet/sample/tcp2.c
index e45de90..2dc71a5 100644
--- a/libnet/sample/tcp2.c
+++ b/libnet/sample/tcp2.c
@@ -39,7 +39,7 @@ int
 main(int argc, char **argv)
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     char *payload;
@@ -128,7 +128,7 @@ main(int argc, char **argv)
         0,                                          /* checksum */
         10,                                         /* urgent pointer */
         LIBNET_TCP_H + payload_s,                   /* TCP packet size */
-        payload,                                    /* payload */
+        (u_int8_t*)payload,                         /* payload */
         payload_s,                                  /* payload size */
         l,                                          /* libnet handle */
         0);                                         /* libnet id */
diff --git a/libnet/sample/tring_tcp1.c b/libnet/sample/tring_tcp1.c
index 9b9140f..44126ba 100644
--- a/libnet/sample/tring_tcp1.c
+++ b/libnet/sample/tring_tcp1.c
@@ -37,7 +37,7 @@ int
 main(int argc, char *argv[])
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     char *payload;
diff --git a/libnet/sample/tring_tcp2.c b/libnet/sample/tring_tcp2.c
index f5f85a2..d60936e 100644
--- a/libnet/sample/tring_tcp2.c
+++ b/libnet/sample/tring_tcp2.c
@@ -37,7 +37,7 @@ int
 main(int argc, char *argv[])
 {
     int c;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t t;
     char *payload;
diff --git a/libnet/sample/udp1.c b/libnet/sample/udp1.c
index b95e8e1..c42913f 100644
--- a/libnet/sample/udp1.c
+++ b/libnet/sample/udp1.c
@@ -42,7 +42,7 @@ int
 main(int argc, char *argv[])
 {
     int c, i, j, build_ip;
-    u_char *cp;
+    char *cp;
     libnet_t *l;
     libnet_ptag_t ip, ipo;
     libnet_ptag_t udp;
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
             dst_prt + i,                            /* destination port */
             LIBNET_UDP_H + payload_s,               /* packet length */
             0,                                      /* checksum */
-            payload,                                /* payload */
+            (u_int8_t*)payload,                     /* payload */
             payload_s,                              /* payload size */
             l,                                      /* libnet handle */
             udp);                                   /* libnet id */
diff --git a/libnet/src/libnet_build_ip.c b/libnet/src/libnet_build_ip.c
index 82b2394..3d3675b 100644
--- a/libnet/src/libnet_build_ip.c
+++ b/libnet/src/libnet_build_ip.c
@@ -407,7 +407,7 @@ libnet_ptag_t ptag)
     }
 
     /* append padding */
-    n = libnet_pblock_append(l, p, "\0\0\0", adj_size - options_s);
+    n = libnet_pblock_append(l, p, (u_int8_t*)"\0\0\0", adj_size - options_s);
     if (n == -1)
     {
         goto bad;
diff --git a/libnet/src/libnet_cq.c b/libnet/src/libnet_cq.c
index 3dd5317..77cb055 100644
--- a/libnet/src/libnet_cq.c
+++ b/libnet/src/libnet_cq.c
@@ -325,7 +325,7 @@ libnet_cq_find_by_label(char *label)
     return (p ? p->context : NULL);
 }
 
-int8_t *
+const char *
 libnet_cq_getlabel(libnet_t *l)
 {
     return (l->label);
diff --git a/libnet/src/libnet_if_addr.c b/libnet/src/libnet_if_addr.c
index 5ffd840..9ecedb3 100644
--- a/libnet/src/libnet_if_addr.c
+++ b/libnet/src/libnet_if_addr.c
@@ -109,12 +109,12 @@ libnet_check_iface(libnet_t *l)
 #endif
 
 int
-libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, int8_t *dev,
-register int8_t *errbuf)
+libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, char *dev,
+register char *errbuf)
 {
     register struct libnet_ifaddr_list *al;
     struct ifreq *ifr, *lifr, *pifr, nifr;
-    int8_t device[sizeof(nifr.ifr_name)];
+    char device[sizeof(nifr.ifr_name)];
     static struct libnet_ifaddr_list ifaddrlist[MAX_IPADDR];
     
     char *p;
@@ -282,8 +282,8 @@ static int8_t *iptos(u_int32_t in)
 }
 
 int
-libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, int8_t *dev,
-register int8_t *errbuf)
+libnet_ifaddrlist(register struct libnet_ifaddr_list **ipaddrp, char *dev,
+register char *errbuf)
 {
     int nipaddr = 0;    int i = 0;
 
@@ -326,7 +326,7 @@ int
 libnet_select_device(libnet_t *l)
 {
     int c, i;
-    int8_t err_buf[LIBNET_ERRBUF_SIZE];
+    char err_buf[LIBNET_ERRBUF_SIZE];
     struct libnet_ifaddr_list *address_list, *al;
     u_int32_t addr;
 
diff --git a/libnet/src/libnet_init.c b/libnet/src/libnet_init.c
index f83456c..976b44c 100644
--- a/libnet/src/libnet_init.c
+++ b/libnet/src/libnet_init.c
@@ -192,7 +192,7 @@ libnet_getfd(libnet_t *l)
     return (l->fd);
 }
 
-int8_t *
+const char *
 libnet_getdevice(libnet_t *l)
 {
     if (l == NULL)
diff --git a/libnet/src/libnet_internal.c b/libnet/src/libnet_internal.c
index 1a42a8e..60fb080 100644
--- a/libnet/src/libnet_internal.c
+++ b/libnet/src/libnet_internal.c
@@ -173,7 +173,7 @@ libnet_diag_dump_pblock(libnet_t *l)
 char *
 libnet_diag_dump_pblock_type(u_int8_t type)
 {
-    static int8_t buf[50];
+    static char buf[50];
     switch (type)
     {
         case LIBNET_PBLOCK_ARP_H:
diff --git a/libnet/src/libnet_link_linux.c b/libnet/src/libnet_link_linux.c
index d0bbf9a..7e2c285 100644
--- a/libnet/src/libnet_link_linux.c
+++ b/libnet/src/libnet_link_linux.c
@@ -175,7 +175,7 @@ libnet_close_link(libnet_t *l)
 
 #if (HAVE_PACKET_SOCKET)
 static int
-get_iface_index(int fd, const int8_t *device)
+get_iface_index(int fd, const char *device)
 {
     struct ifreq ifr;
  
diff --git a/libnet/src/libnet_port_list.c b/libnet/src/libnet_port_list.c
index 5c3a295..3526eb6 100644
--- a/libnet/src/libnet_port_list.c
+++ b/libnet/src/libnet_port_list.c
@@ -44,9 +44,9 @@ u_int16_t *all_lists;
 int
 libnet_plist_chain_new(libnet_t *l, libnet_plist_t **plist, char *token_list)
 {
-    int8_t libnet_plist_legal_tokens[] = "0123456789,- ";
+    char libnet_plist_legal_tokens[] = "0123456789,- ";
     libnet_plist_t *tmp;
-    int8_t *tok;
+    char *tok;
     int i, j, valid_token, cur_node;
     u_int16_t *all_lists_tmp;
     static u_int8_t cur_id;
diff --git a/libnet/src/libnet_resolve.c b/libnet/src/libnet_resolve.c
index d6d0ee5..3d95b77 100644
--- a/libnet/src/libnet_resolve.c
+++ b/libnet/src/libnet_resolve.c
@@ -364,12 +364,12 @@ libnet_get_ipaddr4(libnet_t *l)
 #endif /* WIN32 */
 
 u_int8_t *
-libnet_hex_aton(int8_t *s, int *len)
+libnet_hex_aton(const char *s, int *len)
 {
     u_int8_t *buf;
     int i;
     int32_t l;
-    int8_t *pp;
+    char *pp;
         
     while (isspace(*s))
     {
@@ -390,7 +390,7 @@ libnet_hex_aton(int8_t *s, int *len)
     /* expect len hex octets separated by ':' */
     for (i = 0; i < *len + 1; i++)
     {
-        l = strtol(s, (char **)&pp, 16);
+        l = strtol(s, &pp, 16);
         if (pp == s || l > 0xff || l < 0)
         {
             *len = 0;