diff --git a/headers/posix/netinet/in.h b/headers/posix/netinet/in.h index 0d39124033..b0c0e47b49 100644 --- a/headers/posix/netinet/in.h +++ b/headers/posix/netinet/in.h @@ -39,15 +39,15 @@ typedef uint32_t in_addr_t; /* Protocol definitions - add to as required... */ enum { - IPPROTO_IP = 0, /* 0, IPv4 */ - IPPROTO_ICMP = 1, /* 1, ICMP (v4) */ - IPPROTO_IGMP = 2, /* 2, IGMP (group management) */ - IPPROTO_TCP = 6, /* 6, tcp */ - IPPROTO_UDP = 17, /* 17, UDP */ - IPPROTO_IPV6 = 41, /* 41, IPv6 in IPv6 */ - IPPROTO_ROUTING = 43, /* 43, Routing */ - IPPROTO_ICMPV6 = 58, /* 58, IPv6 ICMP */ - IPPROTO_ETHERIP = 97, /* 97, Ethernet in IPv4 */ + IPPROTO_IP = 0, /* 0, IPv4 */ + IPPROTO_ICMP = 1, /* 1, ICMP (v4) */ + IPPROTO_IGMP = 2, /* 2, IGMP (group management) */ + IPPROTO_TCP = 6, /* 6, tcp */ + IPPROTO_UDP = 17, /* 17, UDP */ + IPPROTO_IPV6 = 41, /* 41, IPv6 in IPv6 */ + IPPROTO_ROUTING = 43, /* 43, Routing */ + IPPROTO_ICMPV6 = 58, /* 58, IPv6 ICMP */ + IPPROTO_ETHERIP = 97, /* 97, Ethernet in IPv4 */ IPPROTO_RAW = 255 /* 255 */ }; @@ -155,19 +155,8 @@ struct sockaddr_in { #define satosin(sa) ((struct sockaddr_in *)(sa)) #define sintosa(sin) ((struct sockaddr *)(sin)) -struct ifnet; // forward declaration - -/* Prototypes... */ -int in_broadcast (struct in_addr, struct ifnet *); -int in_canforward (struct in_addr); -int in_localaddr (struct in_addr); -void in_socktrim (struct sockaddr_in*); -/* uint16 in_cksum (struct mbuf *, int); */ -struct mbuf; -uint16_t in_cksum(struct mbuf *m, int len, int off); - #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif #endif /* NETINET_IN_H */ diff --git a/headers/posix/netinet6/in6.h b/headers/posix/netinet6/in6.h index abe5d9eab1..dc48a43b98 100644 --- a/headers/posix/netinet6/in6.h +++ b/headers/posix/netinet6/in6.h @@ -20,8 +20,8 @@ struct in6_addr { struct sockaddr_in6 { uint8_t sin6_len; - sa_family_t sin6_family; - in_port_t sin6_port + uint8_t sin6_family; + uint16_t sin6_port; uint32_t sin6_flowinfo; struct in6_addr sin6_addr; uint32_t sin6_scope_id;