From owner-p4-projects@FreeBSD.ORG Mon Jul 24 02:01:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54E6916A4DF; Mon, 24 Jul 2006 02:01:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17DCF16A4DA for ; Mon, 24 Jul 2006 02:01:53 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8706E43D46 for ; Mon, 24 Jul 2006 02:01:45 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6O21jbr096921 for ; Mon, 24 Jul 2006 02:01:45 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6O21hXc096907 for perforce@freebsd.org; Mon, 24 Jul 2006 02:01:43 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 24 Jul 2006 02:01:43 GMT Message-Id: <200607240201.k6O21hXc096907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 102234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2006 02:01:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=102234 Change 102234 by trhodes@trhodes_local on 2006/07/24 02:00:56 Do a bit of style(9) cleanup to make this code more read friendly, remove __P, etc. Reviewed by: gnn Approved by: gnn Obtained from: Requirement to do something during a boring ride home (BSDCan). Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_core.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_input.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_output.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/dest6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_core.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_input.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_output.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/frag6.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.h#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_cksum.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#7 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_proto.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_rmx.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_src.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_var.h#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_ecn.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_forward.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_id.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_input.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_output.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6protosw.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_core.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_input.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_output.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6.c#4 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_nbr.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_rtr.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.c#6 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/route6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6.c#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/tcp6_var.h#2 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_output.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#8 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_var.h#2 edit Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah.h#2 (text+ko) ==== @@ -42,19 +42,19 @@ #endif struct ah { - u_int8_t ah_nxt; /* Next Header */ - u_int8_t ah_len; /* Length of data, in 32bit */ - u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ + uint8_t ah_nxt; /* Next Header */ + uint8_t ah_len; /* Length of data, in 32bit */ + uint16_t ah_reserve; /* Reserved for future use */ + uint32_t ah_spi; /* Security parameter index */ /* variable size, 32bit bound*/ /* Authentication data */ }; struct newah { - u_int8_t ah_nxt; /* Next Header */ - u_int8_t ah_len; /* Length of data + 1, in 32bit */ - u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ - u_int32_t ah_seq; /* Sequence number field */ + uint8_t ah_nxt; /* Next Header */ + uint8_t ah_len; /* Length of data + 1, in 32bit */ + uint16_t ah_reserve; /* Reserved for future use */ + uint32_t ah_spi; /* Security parameter index */ + uint32_t ah_seq; /* Sequence number field */ /* variable size, 32bit bound*/ /* Authentication data */ }; @@ -67,28 +67,28 @@ }; struct ah_algorithm { - int (*sumsiz) __P((struct secasvar *)); - int (*mature) __P((struct secasvar *)); + int (*sumsiz)(struct secasvar *); + int (*mature)(struct secasvar *); int keymin; /* in bits */ int keymax; /* in bits */ const char *name; - int (*init) __P((struct ah_algorithm_state *, struct secasvar *)); - void (*update) __P((struct ah_algorithm_state *, u_int8_t *, size_t)); - void (*result) __P((struct ah_algorithm_state *, u_int8_t *, size_t)); + int (*init)(struct ah_algorithm_state *, struct secasvar *); + void (*update) (struct ah_algorithm_state *, uint8_t *, size_t); + void (*result) (struct ah_algorithm_state *, uint8_t *, size_t); }; #define AH_MAXSUMSIZE (512 / 8) -extern const struct ah_algorithm *ah_algorithm_lookup __P((int)); +extern const struct ah_algorithm *ah_algorithm_lookup(int); /* cksum routines */ -extern int ah_hdrlen __P((struct secasvar *)); +extern int ah_hdrlen(struct secasvar *); -extern size_t ah_hdrsiz __P((struct ipsecrequest *)); -extern void ah4_input __P((struct mbuf *, int)); -extern int ah4_output __P((struct mbuf *, struct ipsecrequest *)); -extern int ah4_calccksum __P((struct mbuf *, u_int8_t *, size_t, - const struct ah_algorithm *, struct secasvar *)); +extern size_t ah_hdrsiz(struct ipsecrequest *); +extern void ah4_input(struct mbuf *, int); +extern int ah4_output(struct mbuf *, struct ipsecrequest *); +extern int ah4_calccksum(struct mbuf *, uint8_t *, size_t, + const struct ah_algorithm *, struct secasvar *); #endif /* _KERNEL */ #endif /* _NETINET6_AH_H_ */ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah6.h#2 (text+ko) ==== @@ -40,13 +40,13 @@ #ifdef _KERNEL struct secasvar; -extern int ah6_input __P((struct mbuf **, int *, int)); -extern int ah6_output __P((struct mbuf *, u_char *, struct mbuf *, - struct ipsecrequest *)); -extern int ah6_calccksum __P((struct mbuf *, u_int8_t *, size_t, - const struct ah_algorithm *, struct secasvar *)); +extern int ah6_input(struct mbuf **, int *, int); +extern int ah6_output(struct mbuf *, u_char *, struct mbuf *, + struct ipsecrequest *); +extern int ah6_calccksum(struct mbuf *, uint8_t *, size_t, + const struct ah_algorithm *, struct secasvar *); -extern void ah6_ctlinput __P((int, struct sockaddr *, void *)); +extern void ah6_ctlinput(int, struct sockaddr *, void *); #endif #endif /*_NETINET6_AH6_H_*/ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_aesxcbcmac.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_core.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_input.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ah_output.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/dest6.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_aesctr.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_core.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_input.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_output.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/esp_rijndael.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/frag6.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/icmp6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.h#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_cksum.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_ifattach.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.c#7 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_pcb.h#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_proto.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_rmx.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_src.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_var.h#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_ecn.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_forward.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_id.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_input.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_output.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_var.h#2 (text+ko) ==== @@ -69,15 +69,15 @@ * being reassembled is attached to one of these structures. */ struct ip6q { - u_int32_t ip6q_head; - u_int16_t ip6q_len; - u_int8_t ip6q_nxt; /* ip6f_nxt in first fragment */ - u_int8_t ip6q_hlim; + uint32_t ip6q_head; + uint16_t ip6q_len; + uint8_t ip6q_nxt; /* ip6f_nxt in first fragment */ + uint8_t ip6q_hlim; struct ip6asfrag *ip6q_down; struct ip6asfrag *ip6q_up; - u_int32_t ip6q_ident; - u_int8_t ip6q_arrive; - u_int8_t ip6q_ttl; + uint32_t ip6q_ident; + uint8_t ip6q_arrive; + uint8_t ip6q_ttl; struct in6_addr ip6q_src, ip6q_dst; struct ip6q *ip6q_next; struct ip6q *ip6q_prev; @@ -89,10 +89,10 @@ }; struct ip6asfrag { - u_int32_t ip6af_head; - u_int16_t ip6af_len; - u_int8_t ip6af_nxt; - u_int8_t ip6af_hlim; + uint32_t ip6af_head; + uint16_t ip6af_len; + uint8_t ip6af_nxt; + uint8_t ip6af_hlim; /* must not override the above members during reassembling */ struct ip6asfrag *ip6af_down; struct ip6asfrag *ip6af_up; @@ -100,7 +100,7 @@ int ip6af_offset; /* offset in ip6af_m to next header */ int ip6af_frglen; /* fragmentable part length */ int ip6af_off; /* fragment offset */ - u_int16_t ip6af_mff; /* more fragment bit in frag off */ + uint16_t ip6af_mff; /* more fragment bit in frag off */ }; #define IP6_REASS_MBUF(ip6af) (*(struct mbuf **)&((ip6af)->ip6af_m)) @@ -179,7 +179,7 @@ * Control options for incoming packets */ -struct ip6stat { +struct ip6stat { u_quad_t ip6s_total; /* total packets received */ u_quad_t ip6s_tooshort; /* packet too short */ u_quad_t ip6s_toosmall; /* not enough data */ @@ -250,22 +250,22 @@ * XXX do not make it a kitchen sink! */ struct ip6aux { - u_int32_t ip6a_flags; -#define IP6A_SWAP 0x01 /* swapped home/care-of on packet */ -#define IP6A_HASEEN 0x02 /* HA was present */ -#define IP6A_BRUID 0x04 /* BR Unique Identifier was present */ -#define IP6A_RTALERTSEEN 0x08 /* rtalert present */ +uint32_t ip6a_flags; +#define IP6A_SWAP 0x01 /* swapped home/care-of on packet */ +#define IP6A_HASEEN 0x02 /* HA was present */ +#define IP6A_BRUID 0x04 /* BR Unique Identifier was present */ +#define IP6A_RTALERTSEEN 0x08 /* rtalert present */ - /* ip6.ip6_src */ - struct in6_addr ip6a_careof; /* care-of address of the peer */ - struct in6_addr ip6a_home; /* home address of the peer */ - u_int16_t ip6a_bruid; /* BR unique identifier */ +/* ip6.ip6_src */ +struct in6_addr ip6a_careof; /* care-of address of the peer */ +struct in6_addr ip6a_home; /* home address of the peer */ +uint16_t ip6a_bruid; /* BR unique identifier */ - /* ip6.ip6_dst */ - struct in6_ifaddr *ip6a_dstia6; /* my ifaddr that matches ip6_dst */ +/* ip6.ip6_dst */ +struct in6_ifaddr *ip6a_dstia6; /* my ifaddr that matches ip6_dst */ - /* rtalert */ - u_int16_t ip6a_rtalert; /* rtalert option value */ +/* rtalert */ +uint16_t ip6a_rtalert; /* rtalert option value */ /* * decapsulation history will be here. @@ -301,109 +301,104 @@ extern struct socket *ip6_mrouter; /* multicast routing daemon */ extern int ip6_sendredirects; /* send IP redirects when forwarding? */ extern int ip6_maxfragpackets; /* Maximum packets in reassembly queue */ -extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */ +extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */ extern int ip6_sourcecheck; /* Verify source interface */ extern int ip6_sourcecheck_interval; /* Interval between log messages */ extern int ip6_accept_rtadv; /* Acts as a host not a router */ extern int ip6_keepfaith; /* Firewall Aided Internet Translator */ extern int ip6_log_interval; extern time_t ip6_log_time; -extern int ip6_hdrnestlimit; /* upper limit of # of extension headers */ +extern int ip6_hdrnestlimit; /* upper limit of # of extension headers */ extern int ip6_dad_count; /* DupAddrDetectionTransmits */ -extern int ip6_auto_flowlabel; -extern int ip6_auto_linklocal; +extern int ip6_auto_flowlabel; +extern int ip6_auto_linklocal; -extern int ip6_anonportmin; /* minimum ephemeral port */ -extern int ip6_anonportmax; /* maximum ephemeral port */ -extern int ip6_lowportmin; /* minimum reserved port */ -extern int ip6_lowportmax; /* maximum reserved port */ +extern int ip6_anonportmin; /* minimum ephemeral port */ +extern int ip6_anonportmax; /* maximum ephemeral port */ +extern int ip6_lowportmin; /* minimum reserved port */ +extern int ip6_lowportmax; /* maximum reserved port */ -extern int ip6_use_tempaddr; /* whether to use temporary addresses. */ -extern int ip6_prefer_tempaddr; /* whether to prefer temporary addresses - in the source address selection */ +extern int ip6_use_tempaddr; /* whether to use temporary addresses. */ +extern int ip6_prefer_tempaddr; /* whether to prefer temporary addresses + in the source address selection */ -extern int ip6_use_defzone; /* whether to use the default scope zone - when unspecified */ +extern int ip6_use_defzone; /* whether to use the default scope zone + when unspecified */ extern struct pfil_head inet6_pfil_hook; /* packet filter hooks */ #ifdef IPSTEALTH -extern int ip6stealth; +extern int ip6stealth; #endif -extern struct pr_usrreqs rip6_usrreqs; -struct sockopt; +extern struct pr_usrreqs rip6_usrreqs; +struct sockopt; -struct inpcb; +struct inpcb; +int icmp6_ctloutput(struct socket *, struct sockopt *sopt); -int icmp6_ctloutput __P((struct socket *, struct sockopt *sopt)); +struct in6_ifaddr; +void ip6_init(void); +void ip6_input(struct mbuf *); +struct in6_ifaddr *ip6_getdstifaddr(struct mbuf *); +void ip6_freepcbopts(struct ip6_pktopts *); +void ip6_freemoptions(struct ip6_moptions *); +int ip6_unknown_opt(uint8_t *, struct mbuf *, int); +char * ip6_get_prevhdr(struct mbuf *, int); +int ip6_nexthdr(struct mbuf *, int, int, int *); +int ip6_lasthdr(struct mbuf *, int, int, int *); -struct in6_ifaddr; -void ip6_init __P((void)); -void ip6_input __P((struct mbuf *)); -struct in6_ifaddr *ip6_getdstifaddr __P((struct mbuf *)); -void ip6_freepcbopts __P((struct ip6_pktopts *)); -void ip6_freemoptions __P((struct ip6_moptions *)); -int ip6_unknown_opt __P((u_int8_t *, struct mbuf *, int)); -char * ip6_get_prevhdr __P((struct mbuf *, int)); -int ip6_nexthdr __P((struct mbuf *, int, int, int *)); -int ip6_lasthdr __P((struct mbuf *, int, int, int *)); +struct ip6aux *ip6_addaux(struct mbuf *); +struct ip6aux *ip6_findaux(struct mbuf *); +void ip6_delaux(struct mbuf *); -struct ip6aux *ip6_addaux __P((struct mbuf *)); -struct ip6aux *ip6_findaux __P((struct mbuf *)); -void ip6_delaux __P((struct mbuf *)); +int ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); +int ip6_process_hopopts(struct mbuf *, uint8_t *, int, uint32_t *, uint32_t *); +void ip6_savecontrol(struct inpcb *, struct mbuf *, struct mbuf **); +void ip6_notify_pmtu(struct inpcb *, struct sockaddr_in6 *, uint32_t *); +int ip6_sysctl(int *, u_int, void *, size_t *, void *, size_t); -int ip6_mforward __P((struct ip6_hdr *, struct ifnet *, struct mbuf *)); -int ip6_process_hopopts __P((struct mbuf *, u_int8_t *, int, u_int32_t *, - u_int32_t *)); -void ip6_savecontrol __P((struct inpcb *, struct mbuf *, struct mbuf **)); -void ip6_notify_pmtu __P((struct inpcb *, struct sockaddr_in6 *, - u_int32_t *)); -int ip6_sysctl __P((int *, u_int, void *, size_t *, void *, size_t)); +void ip6_forward(struct mbuf *, int); -void ip6_forward __P((struct mbuf *, int)); +void ip6_mloopback(struct ifnet *, struct mbuf *, struct sockaddr_in6 *); +int ip6_output(struct mbuf *, struct ip6_pktopts *, + struct route_in6 *, int, struct ip6_moptions *, struct ifnet **, + struct inpcb *); +int ip6_ctloutput(struct socket *, struct sockopt *); +int ip6_raw_ctloutput(struct socket *, struct sockopt *); +void ip6_initpktopts(struct ip6_pktopts *); +int ip6_setpktopts(struct mbuf *, struct ip6_pktopts *, + struct ip6_pktopts *, int, int); +void ip6_clearpktopts(struct ip6_pktopts *, int); +struct ip6_pktopts *ip6_copypktopts(struct ip6_pktopts *, int); +int ip6_optlen(struct inpcb *); -void ip6_mloopback __P((struct ifnet *, struct mbuf *, struct sockaddr_in6 *)); -int ip6_output __P((struct mbuf *, struct ip6_pktopts *, - struct route_in6 *, - int, - struct ip6_moptions *, struct ifnet **, - struct inpcb *)); -int ip6_ctloutput __P((struct socket *, struct sockopt *)); -int ip6_raw_ctloutput __P((struct socket *, struct sockopt *)); -void ip6_initpktopts __P((struct ip6_pktopts *)); -int ip6_setpktopts __P((struct mbuf *, struct ip6_pktopts *, - struct ip6_pktopts *, int, int)); -void ip6_clearpktopts __P((struct ip6_pktopts *, int)); -struct ip6_pktopts *ip6_copypktopts __P((struct ip6_pktopts *, int)); -int ip6_optlen __P((struct inpcb *)); +int route6_input(struct mbuf **, int *, int); -int route6_input __P((struct mbuf **, int *, int)); +void frag6_init(void); +int frag6_input(struct mbuf **, int *, int); +void frag6_slowtimo(void); +void frag6_drain(void); -void frag6_init __P((void)); -int frag6_input __P((struct mbuf **, int *, int)); -void frag6_slowtimo __P((void)); -void frag6_drain __P((void)); +void rip6_init(void); +int rip6_input(struct mbuf **, int *, int); +void rip6_ctlinput(int, struct sockaddr *, void *); +int rip6_ctloutput(struct socket *, struct sockopt *); +int rip6_output(struct mbuf *, ...); +int rip6_usrreq(struct socket *, + int, struct mbuf *, struct mbuf *, struct mbuf *, struct thread *); -void rip6_init __P((void)); -int rip6_input __P((struct mbuf **, int *, int)); -void rip6_ctlinput __P((int, struct sockaddr *, void *)); -int rip6_ctloutput __P((struct socket *, struct sockopt *)); -int rip6_output __P((struct mbuf *, ...)); -int rip6_usrreq __P((struct socket *, - int, struct mbuf *, struct mbuf *, struct mbuf *, struct thread *)); +int dest6_input(struct mbuf **, int *, int); +int none_input(struct mbuf **, int *, int); -int dest6_input __P((struct mbuf **, int *, int)); -int none_input __P((struct mbuf **, int *, int)); - -struct in6_addr *in6_selectsrc __P((struct sockaddr_in6 *, +struct in6_addr *in6_selectsrc(struct sockaddr_in6 *, struct ip6_pktopts *, struct ip6_moptions *, struct route_in6 *, - struct in6_addr *, struct ifnet **, int *)); -int in6_selectroute __P((struct sockaddr_in6 *, struct ip6_pktopts *, + struct in6_addr *, struct ifnet **, int *); +int in6_selectroute(struct sockaddr_in6 *, struct ip6_pktopts *, struct ip6_moptions *, struct route_in6 *, struct ifnet **, - struct rtentry **, int)); -u_int32_t ip6_randomid __P((void)); -u_int32_t ip6_randomflowlabel __P((void)); + struct rtentry **, int); +uint32_t ip6_randomid(void); +uint32_t ip6_randomflowlabel(void); #endif /* _KERNEL */ #endif /* !_NETINET6_IP6_VAR_H_ */ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6protosw.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_core.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_input.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_output.c#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipsec6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6.c#4 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6_var.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#5 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_nbr.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_rtr.c#3 (text+ko) ==== @@ -64,25 +64,25 @@ #define SDL(s) ((struct sockaddr_dl *)s) -static int rtpref __P((struct nd_defrouter *)); -static struct nd_defrouter *defrtrlist_update __P((struct nd_defrouter *)); -static int prelist_update __P((struct nd_prefixctl *, struct nd_defrouter *, - struct mbuf *, int)); -static struct in6_ifaddr *in6_ifadd __P((struct nd_prefixctl *, int)); -static struct nd_pfxrouter *pfxrtr_lookup __P((struct nd_prefix *, - struct nd_defrouter *)); -static void pfxrtr_add __P((struct nd_prefix *, struct nd_defrouter *)); -static void pfxrtr_del __P((struct nd_pfxrouter *)); +static int rtpref(struct nd_defrouter *); +static struct nd_defrouter *defrtrlist_update(struct nd_defrouter *); +static int prelist_update(struct nd_prefixctl *, struct nd_defrouter *, + struct mbuf *, int); +static struct in6_ifaddr *in6_ifadd(struct nd_prefixctl *, int); +static struct nd_pfxrouter *pfxrtr_lookup(struct nd_prefix *, + struct nd_defrouter *); +static void pfxrtr_add(struct nd_prefix *, struct nd_defrouter *); +static void pfxrtr_del(struct nd_pfxrouter *); static struct nd_pfxrouter *find_pfxlist_reachable_router - __P((struct nd_prefix *)); -static void defrouter_delreq __P((struct nd_defrouter *)); -static void nd6_rtmsg __P((int, struct rtentry *)); + (struct nd_prefix *); +static void defrouter_delreq(struct nd_defrouter *); +static void nd6_rtmsg(int, struct rtentry *); -static int in6_init_prefix_ltimes __P((struct nd_prefix *)); -static void in6_init_address_ltimes __P((struct nd_prefix *, - struct in6_addrlifetime *)); +static int in6_init_prefix_ltimes(struct nd_prefix *); +static void in6_init_address_ltimes(struct nd_prefix *, + struct in6_addrlifetime *); -static int rt6_deleteroute __P((struct radix_node *, void *)); +static int rt6_deleteroute(struct radix_node *, void *); extern int nd6_recalc_reachtm_interval; @@ -92,8 +92,8 @@ int ip6_use_tempaddr = 0; int ip6_desync_factor; -u_int32_t ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; -u_int32_t ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; +uint32_t ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; +uint32_t ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; /* * shorter lifetimes for debugging purposes. int ip6_temp_preferred_lifetime = 800; @@ -249,7 +249,6 @@ return; } #endif - icmp6len -= sizeof(*nd_ra); nd6_option_init(nd_ra + 1, icmp6len, &ndopts); if (nd6_options(&ndopts) < 0) { @@ -261,7 +260,7 @@ { struct nd_defrouter dr0; - u_int32_t advreachable = nd_ra->nd_ra_reachable; + uint32_t advreachable = nd_ra->nd_ra_reachable; /* remember if this is a multicasted advertisement */ if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) @@ -289,7 +288,6 @@ ndi->chlim = nd_ra->nd_ra_curhoplimit; dr = defrtrlist_update(&dr0); } - /* * prefix */ @@ -1116,7 +1114,7 @@ */ TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { struct in6_ifaddr *ifa6; - u_int32_t remaininglifetime; + uint32_t remaininglifetime; if (ifa->ifa_addr->sa_family != AF_INET6) continue; @@ -1205,10 +1203,10 @@ * intervals. */ if ((ifa6->ia6_flags & IN6_IFF_TEMPORARY) != 0) { - u_int32_t maxvltime, maxpltime; + uint32_t maxvltime, maxpltime; if (ip6_temp_valid_lifetime > - (u_int32_t)((time_second - ifa6->ia6_createtime) + + (uint32_t)((time_second - ifa6->ia6_createtime) + ip6_desync_factor)) { maxvltime = ip6_temp_valid_lifetime - (time_second - ifa6->ia6_createtime) - @@ -1216,7 +1214,7 @@ } else maxvltime = 0; if (ip6_temp_preferred_lifetime > - (u_int32_t)((time_second - ifa6->ia6_createtime) + + (uint32_t)((time_second - ifa6->ia6_createtime) + ip6_desync_factor)) { maxpltime = ip6_temp_preferred_lifetime - (time_second - ifa6->ia6_createtime) - ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/pim6_var.h#2 (text+ko) ==== @@ -52,7 +52,7 @@ }; #if (defined(KERNEL)) || (defined(_KERNEL)) -int pim6_input __P((struct mbuf **, int*, int)); +int pim6_input(struct mbuf **, int*, int); #endif /* KERNEL */ /* ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.c#6 (text+ko) ==== @@ -145,7 +145,6 @@ m_freem(m); return IPPROTO_DONE; } - init_sin6(&fromsa, m); /* general init */ INP_INFO_RLOCK(&ripcbinfo); @@ -268,7 +267,7 @@ struct ip6ctlparam *ip6cp = NULL; const struct sockaddr_in6 *sa6_src = NULL; void *cmdarg; - struct inpcb *(*notify) __P((struct inpcb *, int)) = in6_rtchange; + struct inpcb *(*notify)(struct inpcb *, int) = in6_rtchange; if (sa->sa_family != AF_INET6 || sa->sa_len != sizeof(struct sockaddr_in6)) @@ -428,7 +427,7 @@ in6p->in6p_cksum != -1) { struct mbuf *n; int off; - u_int16_t *p; + uint16_t *p; /* compute checksum */ if (so->so_proto->pr_protocol == IPPROTO_ICMPV6) @@ -448,7 +447,7 @@ } if (!n) goto bad; - p = (u_int16_t *)(mtod(n, caddr_t) + off); + p = (uint16_t *)(mtod(n, caddr_t) + off); *p = 0; *p = in6_cksum(m, ip6->ip6_nxt, sizeof(*ip6), plen); } ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/raw_ip6.h#2 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/route6.c#2 (text+ko) ==== @@ -49,8 +49,8 @@ #include -static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *, - struct ip6_rthdr0 *)); +static int ip6_rthdr0(struct mbuf *, struct ip6_hdr *, + struct ip6_rthdr0 *); int route6_input(mp, offp, proto) @@ -227,7 +227,7 @@ ip6_forward(m, 1); #endif - return (-1); /* m would be freed in ip6_forward() */ + return (-1); /* m would be freed in ip6_forward() */ bad: m_freem(m); ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6.c#2 (text+ko) ==== @@ -197,7 +197,6 @@ return (0); } - /* * Get a scope of the address. Node-local, link-local, site-local or global. */ @@ -223,7 +222,6 @@ } } - if (addr->s6_addr[0] == 0xff) { scope = addr->s6_addr[1] & 0x0f; @@ -296,11 +294,11 @@ return (0); } -u_int32_t +uint32_t scope6_addr2default(addr) struct in6_addr *addr; { - u_int32_t id; + uint32_t id; /* * special case: The loopback address should be considered as @@ -333,7 +331,7 @@ int defaultok; { struct ifnet *ifp; - u_int32_t zoneid; + uint32_t zoneid; if ((zoneid = sin6->sin6_scope_id) == 0 && defaultok) zoneid = scope6_addr2default(&sin6->sin6_addr); @@ -369,13 +367,13 @@ sa6_recoverscope(sin6) struct sockaddr_in6 *sin6; { - u_int32_t zoneid; + uint32_t zoneid; if (sin6->sin6_scope_id != 0) { log(LOG_NOTICE, "sa6_recoverscope: assumption failure (non 0 ID): %s%%%d\n", ip6_sprintf(&sin6->sin6_addr), sin6->sin6_scope_id); - /* XXX: proceed anyway... */ + /* XXX: proceed anyway ... */ } if (IN6_IS_SCOPE_LINKLOCAL(&sin6->sin6_addr) || IN6_IS_ADDR_MC_INTFACELOCAL(&sin6->sin6_addr)) { @@ -406,10 +404,10 @@ in6_setscope(in6, ifp, ret_id) struct in6_addr *in6; struct ifnet *ifp; - u_int32_t *ret_id; /* unnecessary? */ + uint32_t *ret_id; /* unnecessary? */ { int scope; - u_int32_t zoneid = 0; + uint32_t zoneid = 0; struct scope6_id *sid; IF_AFDATA_LOCK(ifp); ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/scope6_var.h#2 (text+ko) ==== @@ -39,22 +39,22 @@ * 16 is correspondent to 4bit multicast scope field. * i.e. from node-local to global with some reserved/unassigned types. */ - u_int32_t s6id_list[16]; + uint32_t s6id_list[16]; }; -void scope6_init __P((void)); -struct scope6_id *scope6_ifattach __P((struct ifnet *)); -void scope6_ifdetach __P((struct scope6_id *)); -int scope6_set __P((struct ifnet *, struct scope6_id *)); -int scope6_get __P((struct ifnet *, struct scope6_id *)); -void scope6_setdefault __P((struct ifnet *)); -int scope6_get_default __P((struct scope6_id *)); -u_int32_t scope6_in6_addrscope __P((struct in6_addr *)); -u_int32_t scope6_addr2default __P((struct in6_addr *)); -int sa6_embedscope __P((struct sockaddr_in6 *, int)); -int sa6_recoverscope __P((struct sockaddr_in6 *)); -int in6_setscope __P((struct in6_addr *, struct ifnet *, u_int32_t *)); -int in6_clearscope __P((struct in6_addr *)); +void scope6_init(void); +struct scope6_id *scope6_ifattach(struct ifnet *); +void scope6_ifdetach(struct scope6_id *); +int scope6_set(struct ifnet *, struct scope6_id *); +int scope6_get(struct ifnet *, struct scope6_id *); +void scope6_setdefault(struct ifnet *); +int scope6_get_default(struct scope6_id *); +uint32_t scope6_in6_addrscope(struct in6_addr *); +uint32_t scope6_addr2default(struct in6_addr *); +int sa6_embedscope(struct sockaddr_in6 *, int); +int sa6_recoverscope(struct sockaddr_in6 *); +int in6_setscope(struct in6_addr *, struct ifnet *, uint32_t *); +int in6_clearscope(struct in6_addr *); #endif /* _KERNEL */ #endif /* _NETINET6_SCOPE6_VAR_H_ */ ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/tcp6_var.h#2 (text+ko) ==== @@ -72,9 +72,9 @@ extern int tcp_v6mssdflt; /* XXX */ struct ip6_hdr; -void tcp6_ctlinput __P((int, struct sockaddr *, void *)); -void tcp6_init __P((void)); -int tcp6_input __P((struct mbuf **, int *, int)); +void tcp6_ctlinput(int, struct sockaddr *, void *); +void tcp6_init(void); +int tcp6_input(struct mbuf **, int *, int); struct rtentry *tcp_rtlookup6(struct in_conninfo *); extern struct pr_usrreqs tcp6_usrreqs; ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_output.c#3 (text+ko) ==== @@ -124,8 +124,8 @@ struct sockaddr *addr6; struct thread *td; { - u_int32_t ulen = m->m_pkthdr.len; - u_int32_t plen = sizeof(struct udphdr) + ulen; + uint32_t ulen = m->m_pkthdr.len; + uint32_t plen = sizeof(struct udphdr) + ulen; struct ip6_hdr *ip6; struct udphdr *udp6; struct in6_addr *laddr, *faddr; ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#8 (text+ko) ==== @@ -117,7 +117,7 @@ */ extern struct protosw inetsw[]; -static void udp6_detach __P((struct socket *so)); +static void udp6_detach(struct socket *so); static void udp6_append(struct inpcb *in6p, struct mbuf *n, int off, @@ -269,12 +269,12 @@ continue; if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) { if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, - &ip6->ip6_dst)) + &ip6->ip6_dst)) continue; } if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) { if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr, - &ip6->ip6_src) || + &ip6->ip6_src) || in6p->in6p_fport != uh->uh_sport) continue; } @@ -370,10 +370,10 @@ struct ip6ctlparam *ip6cp = NULL; const struct sockaddr_in6 *sa6_src = NULL; void *cmdarg; - struct inpcb *(*notify) __P((struct inpcb *, int)) = udp_notify; + struct inpcb *(*notify) (struct inpcb *, int) = udp_notify; struct udp_portonly { - u_int16_t uh_sport; - u_int16_t uh_dport; + uint16_t uh_sport; + uint16_t uh_dport; } *uhp; if (sa->sa_family != AF_INET6 || ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_var.h#2 (text+ko) ==== @@ -68,11 +68,11 @@ extern struct pr_usrreqs udp6_usrreqs; -void udp6_ctlinput __P((int, struct sockaddr *, void *)); -int udp6_input __P((struct mbuf **, int *, int)); -int udp6_output __P((struct inpcb *inp, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, - struct thread *td)); +void udp6_ctlinput(int, struct sockaddr *, void *); +int udp6_input(struct mbuf **, int *, int); +int udp6_output(struct inpcb *inp, struct mbuf *m, + struct sockaddr *addr, struct mbuf *control, + struct thread *td); #endif >>> TRUNCATED FOR MAIL (1000 lines) <<<