* Removed superfluous prototypes from in.h. Minor cleanup.

* Fixed in6.h header. to be able to be compiled.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19552 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-12-18 17:12:54 +00:00
parent da758f9fce
commit c2c739ce33
2 changed files with 12 additions and 23 deletions

View File

@ -39,15 +39,15 @@ typedef uint32_t in_addr_t;
/* Protocol definitions - add to as required... */ /* Protocol definitions - add to as required... */
enum { enum {
IPPROTO_IP = 0, /* 0, IPv4 */ IPPROTO_IP = 0, /* 0, IPv4 */
IPPROTO_ICMP = 1, /* 1, ICMP (v4) */ IPPROTO_ICMP = 1, /* 1, ICMP (v4) */
IPPROTO_IGMP = 2, /* 2, IGMP (group management) */ IPPROTO_IGMP = 2, /* 2, IGMP (group management) */
IPPROTO_TCP = 6, /* 6, tcp */ IPPROTO_TCP = 6, /* 6, tcp */
IPPROTO_UDP = 17, /* 17, UDP */ IPPROTO_UDP = 17, /* 17, UDP */
IPPROTO_IPV6 = 41, /* 41, IPv6 in IPv6 */ IPPROTO_IPV6 = 41, /* 41, IPv6 in IPv6 */
IPPROTO_ROUTING = 43, /* 43, Routing */ IPPROTO_ROUTING = 43, /* 43, Routing */
IPPROTO_ICMPV6 = 58, /* 58, IPv6 ICMP */ IPPROTO_ICMPV6 = 58, /* 58, IPv6 ICMP */
IPPROTO_ETHERIP = 97, /* 97, Ethernet in IPv4 */ IPPROTO_ETHERIP = 97, /* 97, Ethernet in IPv4 */
IPPROTO_RAW = 255 /* 255 */ IPPROTO_RAW = 255 /* 255 */
}; };
@ -155,19 +155,8 @@ struct sockaddr_in {
#define satosin(sa) ((struct sockaddr_in *)(sa)) #define satosin(sa) ((struct sockaddr_in *)(sa))
#define sintosa(sin) ((struct sockaddr *)(sin)) #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 #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif
#endif /* NETINET_IN_H */ #endif /* NETINET_IN_H */

View File

@ -20,8 +20,8 @@ struct in6_addr {
struct sockaddr_in6 { struct sockaddr_in6 {
uint8_t sin6_len; uint8_t sin6_len;
sa_family_t sin6_family; uint8_t sin6_family;
in_port_t sin6_port uint16_t sin6_port;
uint32_t sin6_flowinfo; uint32_t sin6_flowinfo;
struct in6_addr sin6_addr; struct in6_addr sin6_addr;
uint32_t sin6_scope_id; uint32_t sin6_scope_id;