[net] Remove stdint.h from ktcp source

Author: ghaerr

elkscmd/ktcp/dhcp.c

@@ -1,7 +1,6 @@
 /*
  * DHCP client, internal to ktcp.
  */
-#include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <arpa/inet.h>
@@ -25,11 +24,11 @@ static timeq_t dhcp_retry_time;
 static int dhcp_retry_count;
 static timeq_t dhcp_start_time;
 
-static uint32_t dhcp_xid;
-static uint32_t dhcp_yiaddr;
-static uint32_t dhcp_server_ip;
-static uint32_t dhcp_netmask_val;
-static uint32_t dhcp_gateway_val;
+static __u32 dhcp_xid;
+static __u32 dhcp_yiaddr;
+static __u32 dhcp_server_ip;
+static __u32 dhcp_netmask_val;
+static __u32 dhcp_gateway_val;
 
 static unsigned char dhcp_buf[DHCP_MSG_LEN];
 
@@ -44,12 +43,12 @@ static void dhcp_send_discover(void)
     msg->htype = 1;
     msg->hlen = 6;
     msg->xid = htonl(dhcp_xid);
-    msg->secs = htons((uint16_t)(((Now - dhcp_start_time) * 60) / 1000));
+    msg->secs = htons((__u16)(((Now - dhcp_start_time) * 60) / 1000));
     msg->flags = htons(0x8000);
     memcpy(msg->chaddr, eth_local_addr, 6);
 
     opts = (unsigned char *)(msg + 1);
-    *(uint32_t *)opts = htonl(DHCP_MAGIC_COOKIE);
+    *(__u32 *)opts = htonl(DHCP_MAGIC_COOKIE);
     opts += 4;
 
     *opts++ = DHCP_OPT_MSG_TYPE;
@@ -80,12 +79,12 @@ static void dhcp_send_request(void)
     msg->htype = 1;
     msg->hlen = 6;
     msg->xid = htonl(dhcp_xid);
-    msg->secs = htons((uint16_t)(((Now - dhcp_start_time) * 60) / 1000));
+    msg->secs = htons((__u16)(((Now - dhcp_start_time) * 60) / 1000));
     msg->flags = htons(0x8000);
     memcpy(msg->chaddr, eth_local_addr, 6);
 
     opts = (unsigned char *)(msg + 1);
-    *(uint32_t *)opts = htonl(DHCP_MAGIC_COOKIE);
+    *(__u32 *)opts = htonl(DHCP_MAGIC_COOKIE);
     opts += 4;
 
     *opts++ = DHCP_OPT_MSG_TYPE;
@@ -94,12 +93,12 @@ static void dhcp_send_request(void)
 
     *opts++ = DHCP_OPT_REQ_IP;
     *opts++ = 4;
-    *(uint32_t *)opts = dhcp_yiaddr;
+    *(__u32 *)opts = dhcp_yiaddr;
     opts += 4;
 
     *opts++ = DHCP_OPT_SERVER_ID;
     *opts++ = 4;
-    *(uint32_t *)opts = dhcp_server_ip;
+    *(__u32 *)opts = dhcp_server_ip;
     opts += 4;
 
     *opts++ = DHCP_OPT_END;
@@ -203,8 +202,10 @@ void dhcp_init(void)
     dhcp_retry_count = 0;
     dhcp_start_time = Now;
 
-    dhcp_xid = ((uint32_t)eth_local_addr[0] << 24) | ((uint32_t)eth_local_addr[1] << 16) |
-               (eth_local_addr[2] << 8)  | eth_local_addr[3];
+    dhcp_xid = ((unsigned long)eth_local_addr[0] << 24) |
+	       ((unsigned long)eth_local_addr[1] << 16) |
+                              (eth_local_addr[2] << 8)  |
+                               eth_local_addr[3];
     dhcp_xid ^= (Now & 0xFF) << 8;
 
     udp_register(DHCP_CLIENT_PORT, dhcp_input);
@@ -254,7 +255,7 @@ void dhcp_timer(void)
  * Handles OFFER, ACK, and NAK replies from the DHCP server.
  * Registered in dhcp_init() via udp_register().
  */
-void dhcp_input(struct iphdr_s *iph, uint16_t src_port, unsigned char *data, int len)
+void dhcp_input(struct iphdr_s *iph, __u16 src_port, unsigned char *data, int len)
 {
     struct dhcp_message_s *msg = (struct dhcp_message_s *)data;
     unsigned char *opts;
@@ -275,7 +276,7 @@ void dhcp_input(struct iphdr_s *iph, uint16_t src_port, unsigned char *data, int
 
     if (optlen < 4)
 	return;
-    if (*(uint32_t *)opts != htonl(DHCP_MAGIC_COOKIE))	/* DHCP option marker */
+    if (*(__u32 *)opts != htonl(DHCP_MAGIC_COOKIE))	/* DHCP option marker */
 	return;
     opts += 4;
     optlen -= 4;

elkscmd/ktcp/dhcp.h

@@ -1,7 +1,7 @@
 #ifndef DHCP_H
 #define DHCP_H
 
-#include <stdint.h>
+#include <sys/types.h>
 
 #define DHCP_CLIENT_PORT	68
 #define DHCP_SERVER_PORT	67
@@ -39,27 +39,27 @@
 #define DHCP_MAX_TIMEOUT	(16 << 4)
 
 struct dhcp_message_s {
-	uint8_t	op;
-	uint8_t	htype;
-	uint8_t	hlen;
-	uint8_t	hops;
-	uint32_t	xid;
-	uint16_t	secs;
-	uint16_t	flags;
-	uint32_t	ciaddr;
-	uint32_t	yiaddr;
-	uint32_t	siaddr;
-	uint32_t	giaddr;
-	uint8_t	chaddr[16];
-	uint8_t	sname[64];
-	uint8_t	file[128];
+	__u8		op;
+	__u8		htype;
+	__u8		hlen;
+	__u8		hops;
+	__u32		xid;
+	__u16		secs;
+	__u16		flags;
+	__u32		ciaddr;
+	__u32		yiaddr;
+	__u32		siaddr;
+	__u32		giaddr;
+	unsigned char	chaddr[16];
+	unsigned char	sname[64];
+	unsigned char	file[128];
 };
 
 extern char dhcp_enabled;
 extern char dhcp_timer_active;
 
 void dhcp_init(void);
 void dhcp_timer(void);
-void dhcp_input(struct iphdr_s *iph, uint16_t src_port, unsigned char *data, int len);
+void dhcp_input(struct iphdr_s *iph, __u16 src_port, unsigned char *data, int len);
 
 #endif

elkscmd/ktcp/udp.c

@@ -1,8 +1,6 @@
 /*
  * Internal UDP implementation for DHCP. Not accessible through sockets.
  */
-#include <sys/types.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <arpa/inet.h>
@@ -14,7 +12,7 @@
 
 struct udp_sock udp_socks[MAX_UDP_SOCKS];
 
-int udp_register(uint16_t local_port, udp_callback_t cb)
+int udp_register(__u16 local_port, udp_callback_t cb)
 {
     int i;
 
@@ -31,7 +29,7 @@ int udp_register(uint16_t local_port, udp_callback_t cb)
     return 0;
 }
 
-void udp_unregister(uint16_t local_port)
+void udp_unregister(__u16 local_port)
 {
     int i;
 
@@ -43,7 +41,7 @@ void udp_unregister(uint16_t local_port)
     }
 }
 
-void udp_send(ipaddr_t dst, uint16_t dstport, uint16_t srcport,
+void udp_send(ipaddr_t dst, __u16 dstport, __u16 srcport,
 	      unsigned char *data, int datalen, ipaddr_t src)
 {
     unsigned char buf[sizeof(struct udphdr_s) + 576];
@@ -69,8 +67,8 @@ void udp_process(struct iphdr_s *iph, unsigned char *packet)
 {
     struct udphdr_s *udp = (struct udphdr_s *)packet;
     int udplen = ntohs(udp->len);
-    uint16_t dest = ntohs(udp->dest);
-    uint16_t src = ntohs(udp->src);
+    __u16 dest = ntohs(udp->dest);
+    __u16 src = ntohs(udp->src);
     unsigned char *data = packet + sizeof(struct udphdr_s);
     int datalen = udplen - sizeof(struct udphdr_s);
     int i;