From e714a91e2bf7fdc189572d4afbca214a3c3fa101 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 12 May 2005 04:27:01 +0000 Subject: 2005-05-12 Ralf Corsepius * libnetworking/netinet/ip_var.h: Partial update from FreeBSD. Remove some useless BYTE_PACKs. --- cpukit/libnetworking/netinet/ip_var.h | 57 ++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 28 deletions(-) (limited to 'cpukit/libnetworking/netinet/ip_var.h') diff --git a/cpukit/libnetworking/netinet/ip_var.h b/cpukit/libnetworking/netinet/ip_var.h index 75aeb94816..a8ebc6a75f 100644 --- a/cpukit/libnetworking/netinet/ip_var.h +++ b/cpukit/libnetworking/netinet/ip_var.h @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,6 +27,10 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.94 2005/01/07 01:45:44 imp Exp $ + */ + +/* * $Id$ */ @@ -45,11 +45,11 @@ * Overlay for ip header used by other protocols (tcp, udp). */ struct ipovly { - caddr_t ih_next BYTE_PACK; - caddr_t ih_prev BYTE_PACK; /* for protocol sequence q's */ + caddr_t ih_next; + caddr_t ih_prev; /* for protocol sequence q's */ u_char ih_x1; /* (unused) */ u_char ih_pr; /* protocol */ - u_short ih_len BYTE_PACK; /* protocol length */ + u_short ih_len; /* protocol length */ struct in_addr ih_src; /* source internet address */ struct in_addr ih_dst; /* destination internet address */ }; @@ -64,12 +64,12 @@ struct ipq { struct ipq *next,*prev; /* to other reass headers */ u_char ipq_ttl; /* time for reass q to live */ u_char ipq_p; /* protocol of this fragment */ - u_short ipq_id BYTE_PACK; /* sequence id for reassembly */ + u_short ipq_id; /* sequence id for reassembly */ struct ipasfrag *ipq_next,*ipq_prev; /* to ip headers of fragments */ struct in_addr ipq_src,ipq_dst; #ifdef IPDIVERT - u_short ipq_divert BYTE_PACK; /* divert protocol port */ + u_short ipq_divert; /* divert protocol port */ #endif }; @@ -158,6 +158,7 @@ struct ipstat { /* flags passed to ip_output as last parameter */ #define IP_FORWARDING 0x1 /* most of ip header exists */ #define IP_RAWOUTPUT 0x2 /* raw ip header exists */ +#define IP_SENDONES 0x4 /* send all-ones broadcast */ #define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */ #define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */ @@ -170,34 +171,34 @@ extern int ip_defttl; /* default IP ttl */ extern u_char ip_protox[]; extern struct socket *ip_rsvpd; /* reservation protocol daemon */ extern struct socket *ip_mrouter; /* multicast routing daemon */ -extern int (*legal_vif_num) __P((int)); -extern u_long (*ip_mcast_src) __P((int)); +extern int (*legal_vif_num)(int); +extern u_long (*ip_mcast_src)(int); extern int rsvp_on; int ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **)); -void ip_drain __P((void)); -void ip_freemoptions __P((struct ip_moptions *)); -void ip_init __P((void)); -extern int (*ip_mforward) __P((struct ip *, struct ifnet *, struct mbuf *, - struct ip_moptions *)); +void ip_drain(void); +void ip_freemoptions(struct ip_moptions *); +void ip_init(void); +extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, + struct ip_moptions *); int ip_output __P((struct mbuf *, struct mbuf *, struct route *, int, struct ip_moptions *)); -void ip_savecontrol __P((struct inpcb *, struct mbuf **, struct ip *, - struct mbuf *)); -void ip_slowtimo __P((void)); +void ip_savecontrol(struct inpcb *, struct mbuf **, struct ip *, + struct mbuf *); +void ip_slowtimo(void); struct mbuf * ip_srcroute __P((void)); -void ip_stripoptions __P((struct mbuf *, struct mbuf *)); +void ip_stripoptions(struct mbuf *, struct mbuf *); int rip_ctloutput __P((int, struct socket *, int, int, struct mbuf **)); -void rip_init __P((void)); -void rip_input __P((struct mbuf *, int)); -int rip_output __P((struct mbuf *, struct socket *, u_long)); +void rip_init(void); +void rip_input(struct mbuf *, int); +int rip_output(struct mbuf *, struct socket *, u_long); int rip_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *)); -void ipip_input __P((struct mbuf *, int)); -void rsvp_input __P((struct mbuf *, int)); -int ip_rsvp_init __P((struct socket *)); -int ip_rsvp_done __P((void)); +void ipip_input(struct mbuf *, int); +void rsvp_input(struct mbuf *, int); +int ip_rsvp_init(struct socket *); +int ip_rsvp_done(void); int ip_rsvp_vif_init __P((struct socket *, struct mbuf *)); int ip_rsvp_vif_done __P((struct socket *, struct mbuf *)); void ip_rsvp_force_done __P((struct socket *)); @@ -213,4 +214,4 @@ extern u_short ip_divert_ignore; #endif /* _KERNEL */ -#endif /* _NETINET_IP_VAR_H_ */ +#endif /* !_NETINET_IP_VAR_H_ */ -- cgit v1.2.3