Changeset 158 for uKadecot/trunk/uip/net/ipv4/uip-fw.c

Timestamp:

Feb 20, 2016, 10:43:32 PM (8 years ago)

Author:

coas-nagasima

Message:

インクルードのパス指定をContikiに合わせ変更。
整数型の型名をContikiに合わせ変更。

File:

• uKadecot/trunk/uip/net/ipv4/uip-fw.c (modified) (9 diffs)

uKadecot/trunk/uip/net/ipv4/uip-fw.c

@@ -54 +54 @@
  */
 
-#include "uip.h"
-#include "uip_arch.h"
-#include "uip-fw.h"
+#include "net/ip/uip.h"
+#include "net/ip/uip_arch.h"
+#include "net/ipv4/uip-fw.h"
 
 #include <string.h> /* for memcpy() */
@@ -78 +78 @@
 struct tcpip_hdr {
   /* IP header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos;
-  u16_t len,
+  uint16_t len,
     ipid,
     ipoffset;
-  u8_t ttl,
+  uint8_t ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
   
   /* TCP header. */
-  u16_t srcport,
+  uint16_t srcport,
     destport;
-  u8_t seqno[4],
+  uint8_t seqno[4],
     ackno[4],
     tcpoffset,
     flags,
     wnd[2];
-  u16_t tcpchksum;
-  u8_t urgp[2];
-  u8_t optdata[4];
+  uint16_t tcpchksum;
+  uint8_t urgp[2];
+  uint8_t optdata[4];
 };
 
 struct icmpip_hdr {
   /* IP header. */
-  u8_t vhl,
+  uint8_t vhl,
     tos,
     len[2],
@@ -111 +111 @@
     ttl,
     proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
+  uint16_t ipchksum;
+  uint16_t srcipaddr[2],
     destipaddr[2];
   /* ICMP (echo) header. */
-  u8_t type, icode;
-  u16_t icmpchksum;
-  u16_t id, seqno;
-  u8_t payload[1];
+  uint8_t type, icode;
+  uint16_t icmpchksum;
+  uint16_t id, seqno;
+  uint8_t payload[1];
 };
 
@@ -142 +142 @@
  */
 struct fwcache_entry {
-  u16_t timer;
-  
-  u16_t srcipaddr[2];
-  u16_t destipaddr[2];
-  u16_t ipid;
-  u8_t proto;
-  u8_t unused;
+  uint16_t timer;
+  
+  uint16_t srcipaddr[2];
+  uint16_t destipaddr[2];
+  uint16_t ipid;
+  uint8_t proto;
+  uint8_t unused;
 
 #if notdef
-  u16_t payload[2];
+  uint16_t payload[2];
 #endif
 
 #if UIP_REASSEMBLY > 0
-  u16_t len, offset;
+  uint16_t len, offset;
 #endif
 };
@@ -217 +217 @@
 /*------------------------------------------------------------------------------*/
 static unsigned char
-ipaddr_maskcmp(u16_t *ipaddr, u16_t *netipaddr, u16_t *netmask)
+ipaddr_maskcmp(uint16_t *ipaddr, uint16_t *netipaddr, uint16_t *netmask)
 {
   return (ipaddr[0] & netmask [0]) == (netipaddr[0] & netmask[0]) &&
@@ -234 +234 @@
 time_exceeded(void)
 {
-  u16_t tmp16;
+  uint16_t tmp16;
 
   /* We don't send out ICMP errors for ICMP messages. */
@@ -250 +250 @@
   /* Calculate the ICMP checksum. */
   ICMPBUF->icmpchksum = 0;
-  ICMPBUF->icmpchksum = ~uip_chksum((u16_t *)&(ICMPBUF->type), 36);
+  ICMPBUF->icmpchksum = ~uip_chksum((uint16_t *)&(ICMPBUF->type), 36);
 
   /* Set the IP destination address to be the source address of the
@@ -367 +367 @@
  */
 /*------------------------------------------------------------------------------*/
-u8_t
+uint8_t
 uip_fw_output(void)
 {
@@ -415 +415 @@
  */
 /*------------------------------------------------------------------------------*/
-u8_t
+uint8_t
 uip_fw_forward(void)
 {