u_short, ulong exterminated

fdiskXXX: add a bit of sanity (not enough by far)

4 files changed, 22 insertions, 24 deletions

diff --git a/networking/inetd.c b/networking/inetd.c
index ec7b2e8f7..4856b11ae 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -985,7 +985,7 @@ static void config(int sig ATTRIBUTE_UNUSED)
                         } else
 #endif
                         {
-                                u_short port = htons(atoi(sep->se_service));
+                                uint16_t port = htons(atoi(sep->se_service));
                                 // FIXME: atoi_or_else(str, 0) would be handy here
                                 if (!port) {
                                          /*XXX*/ strncpy(protoname, sep->se_proto, sizeof(protoname));
@@ -1037,8 +1037,8 @@ static void config(int sig ATTRIBUTE_UNUSED)
                                         register_rpc(sep);
                         } else
 #endif
-                                {
-                                u_short port = htons(atoi(sep->se_service));
+                        {
+                                uint16_t port = htons(atoi(sep->se_service));
 
                                 if (!port) {
                                          /*XXX*/ strncpy(protoname, sep->se_proto, sizeof(protoname));
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 490076543..1462543f1 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -316,8 +316,8 @@ static int pmtu;                       /* Path MTU Discovery (RFC1191) */
 
 static char *hostname;
 
-static u_short ident;
-static u_short port = 32768 + 666;     /* start udp dest port # for probe packets */
+static uint16_t ident;
+static uint16_t port = 32768 + 666;     /* start udp dest port # for probe packets */
 
 static int waittime = 5;               /* time to wait for response (in seconds) */
 static int nflag;                      /* print addresses numerically */
@@ -539,12 +539,12 @@ wait_for_reply(int sock, struct sockaddr_in *fromp, const struct timeval *tp)
 /*
  * Checksum routine for Internet Protocol family headers (C Version)
  */
-static u_short
-in_cksum(u_short *addr, int len)
+static uint16_t
+in_cksum(uint16_t *addr, int len)
 {
         int nleft = len;
-        u_short *w = addr;
-        u_short answer;
+        uint16_t *w = addr;
+        uint16_t answer;
         int sum = 0;
 
         /*
@@ -589,7 +589,7 @@ send_probe(int seq, int ttl, struct timeval *tp)
          */
         if (doipcksum) {
                 outip->ip_sum =
-                    in_cksum((u_short *)outip, sizeof(*outip) + optlen);
+                    in_cksum((uint16_t *)outip, sizeof(*outip) + optlen);
                 if (outip->ip_sum == 0)
                         outip->ip_sum = 0xffff;
         }
@@ -610,7 +610,7 @@ send_probe(int seq, int ttl, struct timeval *tp)
         if (useicmp) {
                 /* Always calculate checksum for icmp packets */
                 outicmp->icmp_cksum = 0;
-                outicmp->icmp_cksum = in_cksum((u_short *)outicmp,
+                outicmp->icmp_cksum = in_cksum((uint16_t *)outicmp,
                     packlen - (sizeof(*outip) + optlen));
                 if (outicmp->icmp_cksum == 0)
                         outicmp->icmp_cksum = 0xffff;
@@ -628,7 +628,7 @@ send_probe(int seq, int ttl, struct timeval *tp)
                 ui->ui_pr = oui->ui_pr;
                 ui->ui_len = outudp->len;
                 outudp->check = 0;
-                outudp->check = in_cksum((u_short *)ui, packlen);
+                outudp->check = in_cksum((uint16_t *)ui, packlen);
                 if (outudp->check == 0)
                         outudp->check = 0xffff;
                 *outip = tip;
@@ -637,11 +637,11 @@ send_probe(int seq, int ttl, struct timeval *tp)
 #if ENABLE_FEATURE_TRACEROUTE_VERBOSE
         /* XXX undocumented debugging hack */
         if (verbose > 1) {
-                const u_short *sp;
+                const uint16_t *sp;
                 int nshorts, i;
 
-                sp = (u_short *)outip;
-                nshorts = (u_int)packlen / sizeof(u_short);
+                sp = (uint16_t *)outip;
+                nshorts = (u_int)packlen / sizeof(uint16_t);
                 i = 0;
                 printf("[ %d bytes", packlen);
                 while (--nshorts >= 0) {
@@ -906,7 +906,7 @@ traceroute_main(int argc, char *argv[])
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
         int lsrr = 0;
 #endif
-        u_short off = 0;
+        uint16_t off = 0;
         struct IFADDRLIST *al;
         char *device = NULL;
         int max_ttl = 30;
@@ -1137,17 +1137,15 @@ traceroute_main(int argc, char *argv[])
                 outicmp = (struct icmp *)outp;
                 outicmp->icmp_type = ICMP_ECHO;
                 outicmp->icmp_id = htons(ident);
-
                 outdata = (struct outdata *)(outp + 8); /* XXX magic number */
         } else
 #endif
-               {
+        {
                 outip->ip_p = IPPROTO_UDP;
 
                 outudp = (struct udphdr *)outp;
                 outudp->source = htons(ident);
-                outudp->len =
-                    htons((u_short)(packlen - (sizeof(*outip) + optlen)));
+                outudp->len = htons((uint16_t)(packlen - (sizeof(*outip) + optlen)));
                 outdata = (struct outdata *)(outudp + 1);
         }
 
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 9c8b9c562..f78fd3fd8 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -15,9 +15,9 @@
 
 struct arpMsg {
         /* Ethernet header */
-        u_char   h_dest[6];                     /* destination ether addr */
-        u_char   h_source[6];                   /* source ether addr */
-        u_short  h_proto;                       /* packet type ID field */
+        uint8_t  h_dest[6];                     /* destination ether addr */
+        uint8_t  h_source[6];                   /* source ether addr */
+        uint16_t h_proto;                       /* packet type ID field */
 
         /* ARP packet */
         uint16_t htype;                         /* hardware type (must be ARPHRD_ETHER) */
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 052739400..a3ea327c3 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -103,7 +103,7 @@ static void xid_del(u_int32_t xid)
  */
 static int get_dhcp_packet_type(struct dhcpMessage *p)
 {
-        u_char *op;
+        uint8_t *op;
 
         /* it must be either a BOOTREQUEST or a BOOTREPLY */
         if (p->op != BOOTREQUEST && p->op != BOOTREPLY)