From 8ace436639fe1e299625492ecb660f59e2cb1884 Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Sun, 7 Nov 1993 17:50:41 +0000 Subject: [PATCH] Made all header files idempotent and moved incorrect common data from headers into a related source file. Removed bogus af.c and af.h and deleted all references thereto. --- sys/net/bpf.h | 6 ++- sys/net/bpfdesc.h | 6 ++- sys/net/if.c | 5 ++- sys/net/if.h | 27 +++++++++--- sys/net/if_arp.h | 6 ++- sys/net/if_dl.h | 6 ++- sys/net/if_llc.h | 6 ++- sys/net/if_ppp.h | 6 ++- sys/net/if_slvar.h | 6 ++- sys/net/if_types.h | 6 ++- sys/net/netisr.h | 10 +++-- sys/net/radix.h | 6 ++- sys/net/raw_cb.c | 4 +- sys/net/raw_cb.h | 8 +++- sys/net/route.c | 12 ++++- sys/net/route.h | 14 +++--- sys/net/rtsock.c | 4 +- sys/net/slcompress.h | 6 ++- sys/net/slip.h | 6 ++- sys/netccitt/hd_var.h | 6 ++- sys/netccitt/hdlc.h | 8 +++- sys/netccitt/pk.h | 6 ++- sys/netccitt/pk_var.h | 6 ++- sys/netccitt/x25.h | 6 ++- sys/netccitt/x25acct.h | 6 ++- sys/netccitt/x25err.h | 6 ++- sys/netinet/icmp_var.h | 8 +++- sys/netinet/if_ether.h | 8 +++- sys/netinet/in.c | 5 ++- sys/netinet/in_pcb.h | 6 ++- sys/netinet/in_systm.h | 6 ++- sys/netinet/in_var.h | 10 +++-- sys/netinet/ip.h | 6 ++- sys/netinet/ip_icmp.c | 3 +- sys/netinet/ip_icmp.h | 6 ++- sys/netinet/ip_input.c | 5 ++- sys/netinet/ip_var.h | 12 +++-- sys/netinet/tcp.h | 6 ++- sys/netinet/tcp_debug.c | 6 ++- sys/netinet/tcp_debug.h | 10 +++-- sys/netinet/tcp_fsm.h | 8 +++- sys/netinet/tcp_seq.h | 8 +++- sys/netinet/tcp_subr.c | 10 ++++- sys/netinet/tcp_timer.h | 6 ++- sys/netinet/tcp_var.h | 10 +++-- sys/netinet/tcpip.h | 6 ++- sys/netinet/udp.h | 6 ++- sys/netinet/udp_usrreq.c | 5 ++- sys/netinet/udp_var.h | 10 +++-- sys/netiso/clnl.h | 6 ++- sys/netiso/clnp.h | 34 +++++---------- sys/netiso/clnp_stat.h | 6 ++- sys/netiso/clnp_subr.c | 8 +++- sys/netiso/cltp_usrreq.c | 6 ++- sys/netiso/cltp_var.h | 10 +++-- sys/netiso/cons.h | 8 +++- sys/netiso/cons_pcb.h | 14 ++++-- sys/netiso/eonvar.h | 12 ++++- sys/netiso/esis.c | 4 +- sys/netiso/esis.h | 26 ++++------- sys/netiso/if_cons.c | 6 ++- sys/netiso/if_eon.c | 4 +- sys/netiso/iso.c | 6 ++- sys/netiso/iso_errno.h | 4 +- sys/netiso/iso_map.h | 6 ++- sys/netiso/iso_pcb.h | 6 ++- sys/netiso/iso_snpac.c | 4 +- sys/netiso/iso_snpac.h | 10 +++-- sys/netiso/iso_var.h | 14 +++--- sys/netiso/tp_clnp.h | 4 +- sys/netiso/tp_events.h | 94 +++++++++++++++++++++++----------------- sys/netiso/tp_ip.h | 4 +- sys/netiso/tp_meas.h | 8 +++- sys/netiso/tp_param.h | 10 ++--- sys/netiso/tp_pcb.h | 13 +++--- sys/netiso/tp_seq.h | 4 +- sys/netiso/tp_stat.h | 17 +++++--- sys/netiso/tp_states.h | 6 ++- sys/netiso/tp_subr.c | 16 ++++++- sys/netiso/tp_timer.h | 4 +- sys/netiso/tp_tpdu.h | 54 +++++++++-------------- sys/netiso/tp_trace.h | 15 +++---- sys/netiso/tp_user.h | 14 ++---- sys/netns/idp.h | 6 ++- sys/netns/idp_usrreq.c | 3 +- sys/netns/idp_var.h | 8 +++- sys/netns/ns.c | 10 ++++- sys/netns/ns.h | 18 +++++--- sys/netns/ns_error.c | 4 +- sys/netns/ns_error.h | 8 +++- sys/netns/ns_if.h | 10 +++-- sys/netns/ns_pcb.c | 4 +- sys/netns/ns_pcb.h | 8 +++- sys/netns/sp.h | 6 ++- sys/netns/spidp.h | 6 ++- sys/netns/spp_debug.c | 5 ++- sys/netns/spp_debug.h | 10 +++-- sys/netns/spp_timer.h | 6 ++- sys/netns/spp_usrreq.c | 5 ++- sys/netns/spp_var.h | 24 +++++----- 100 files changed, 639 insertions(+), 319 deletions(-) diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 563d74528e..30b61e693a 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)bpf.h 7.1 (Berkeley) 5/7/91 - * $Id$ + * $Id: bpf.h,v 1.2 1993/10/16 17:43:05 rgrimes Exp $ */ +#ifndef _NET_BPF_H_ +#define _NET_BPF_H_ 1 + /* * Alignment macros. BPF_WORDALIGN rounds up to the next * even multiple of BPF_ALIGNMENT. @@ -241,3 +244,4 @@ extern void bpf_mtap(); */ #define BPF_MEMWORDS 16 +#endif /* _NET_BPF_H_ */ diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index 562ff43704..ff8f189ede 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)bpfdesc.h 7.1 (Berkeley) 5/7/91 - * $Id$ + * $Id: bpfdesc.h,v 1.2 1993/10/16 17:43:09 rgrimes Exp $ */ +#ifndef _NET_BPFDESC_H_ +#define _NET_BPFDESC_H_ 1 + /* * Descriptor associated with each open bpf file. */ @@ -86,3 +89,4 @@ struct bpf_if { u_int bif_hdrlen; /* length of header (with padding) */ struct ifnet *bif_ifp; /* correspoding interface */ }; +#endif /* _NET_BPFDESC_H_ */ diff --git a/sys/net/if.c b/sys/net/if.c index 6c766487c7..feabc0e4bd 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)if.c 7.14 (Berkeley) 4/20/91 - * $Id$ + * $Id: if.c,v 1.4 1993/10/16 17:43:10 rgrimes Exp $ */ #include "param.h" @@ -45,13 +45,14 @@ #include "ioctl.h" #include "if.h" -#include "af.h" #include "if_dl.h" #include "if_types.h" #include "ether.h" int ifqmaxlen = IFQ_MAXLEN; +struct ifqueue rawintrq; /* raw packet input queue */ +struct ifnet *ifnet; /* list of configured interfaces */ /* * Network interface utility routines. diff --git a/sys/net/if.h b/sys/net/if.h index 4f224d4795..77f2a9ac58 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)if.h 7.11 (Berkeley) 3/19/91 - * $Id$ + * $Id: if.h,v 1.5 1993/10/16 17:43:12 rgrimes Exp $ */ +#ifndef _NET_IF_H_ +#define _NET_IF_H_ 1 + /* * Structures defining a network interface, providing a packet * transport mechanism (ala level 0 of the PUP protocols). @@ -132,13 +135,24 @@ struct ifnet { #define IFF_ALLMULTI 0x200 /* receive all multicast packets */ #define IFF_OACTIVE 0x400 /* transmission in progress */ #define IFF_SIMPLEX 0x800 /* can't hear own transmissions */ -#define IFF_LLC0 0x1000 /* interface driver control/status */ -#define IFF_LLC1 0x2000 /* interface driver control/status */ -#define IFF_LLC2 0x4000 /* interface driver control/status */ +#define IFF_LLC0 0x1000 /* IEEE 802.2 LLC class 0 */ +#define IFF_LLC1 0x2000 /* IEEE 802.2 LLC class 1 */ +#define IFF_LLC2 0x4000 /* IEEE 802.2 LLC class 2 */ +#ifdef notyet +#define IFF_ALTPHYS 0x8000 /* alternative physical connection */ +#define IFF_MULTICAST 0x10000 /* i'face supports multicast */ +#define IFF_VIRTUAL 0x20000 /* i'face is really a VIF */ +/* flags set internally only: */ +#define IFF_CANTCHANGE \ + (IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|IFF_SIMPLEX\ + IFF_MULTICAST|IFF_VIRTUAL) +#else /* current code */ /* flags set internally only: */ #define IFF_CANTCHANGE \ (IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|IFF_SIMPLEX) +#endif /* not notyet */ + /* * Output queues (ifp->if_snd) and internetwork datagram level (pup level 1) @@ -246,10 +260,11 @@ struct ifconf { #ifdef KERNEL #include "../net/if_arp.h" -struct ifqueue rawintrq; /* raw packet input queue */ -struct ifnet *ifnet; +extern struct ifqueue rawintrq; /* raw packet input queue */ +extern struct ifnet *ifnet; struct ifaddr *ifa_ifwithaddr(), *ifa_ifwithnet(); struct ifaddr *ifa_ifwithdstaddr(); #else KERNEL #include #endif KERNEL +#endif /* _NET_IF_H_ */ diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 8c2eb5d7d9..fdd00dd0eb 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)if_arp.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: if_arp.h,v 1.2 1993/10/16 17:43:13 rgrimes Exp $ */ +#ifndef _NET_IF_ARP_H_ +#define _NET_IF_ARP_H_ 1 + /* * Address Resolution Protocol. * @@ -77,3 +80,4 @@ struct arpreq { #define ATF_PERM 0x04 /* permanent entry */ #define ATF_PUBL 0x08 /* publish entry (respond for other host) */ #define ATF_USETRAILERS 0x10 /* has requested trailers */ +#endif /* _NET_IF_ARP_H_ */ diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 4c7e89c6de..0fec09ff1c 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)if_dl.h 7.2 (Berkeley) 2/22/91 - * $Id$ + * $Id: if_dl.h,v 1.2 1993/10/16 17:43:15 rgrimes Exp $ */ +#ifndef _NET_IF_DL_H_ +#define _NET_IF_DL_H_ 1 + /* * A Link-Level Sockaddr may specify the interface in one of two * ways: either by means of a system-provided index number (computed @@ -79,3 +82,4 @@ char *link_ntoa __P((const struct sockaddr_dl *)); __END_DECLS #endif /* !KERNEL */ +#endif /* _NET_IF_DL_H_ */ diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h index 6add37ebd0..3cb797e1c2 100644 --- a/sys/net/if_llc.h +++ b/sys/net/if_llc.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)if_llc.h 7.2 (Berkeley) 6/28/90 - * $Id$ + * $Id: if_llc.h,v 1.2 1993/10/16 17:43:17 rgrimes Exp $ */ +#ifndef _NET_IF_LLC_H_ +#define _NET_IF_LLC_H_ 1 + /* * IEEE 802.2 Link Level Control headers, for use in conjunction with * 802.{3,4,5} media access control methods. @@ -81,3 +84,4 @@ struct llc { #define LLC_ISO_LSAP 0xfe #define LLC_SNAP_LSAP 0xaa +#endif /* _NET_IF_LLC_H_ */ diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h index 5c41bf0a63..b689c94ce9 100644 --- a/sys/net/if_ppp.h +++ b/sys/net/if_ppp.h @@ -19,10 +19,13 @@ * Modified by Paul Mackerras (paulus@cs.anu.edu.au) * Added PPP_MRU, sc_outm, sc_fastq, sc_bpf. * - * $Id$ + * $Id: if_ppp.h,v 1.2 1993/08/31 05:40:38 rgrimes Exp $ * From: if_ppp.h,v 1.4 1993/08/29 11:22:37 paulus Exp $ */ +#ifndef _NET_IF_PPP_H_ +#define _NET_IF_PPP_H_ 1 + /* * Standard PPP header. */ @@ -117,3 +120,4 @@ struct ppp_softc { #define ifr_mtu ifr_metric #endif +#endif /* _NET_IF_PPP_H_ */ diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h index 7956d17d36..b26aa919e7 100644 --- a/sys/net/if_slvar.h +++ b/sys/net/if_slvar.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)if_slvar.h 7.7 (Berkeley) 5/7/91 - * $Id$ + * $Id: if_slvar.h,v 1.2 1993/10/16 17:43:22 rgrimes Exp $ */ +#ifndef _NET_IF_SLVAR_H_ +#define _NET_IF_SLVAR_H_ 1 + /* * Definitions for SLIP interface data structures * @@ -72,3 +75,4 @@ struct sl_softc { #define SLIOCGFLAGS _IOR('t', 90, int) /* get configuration flags */ #define SLIOCSFLAGS _IOW('t', 89, int) /* set configuration flags */ #define SLIOCGUNIT _IOR('t', 88, int) /* get slip unit number */ +#endif /* _NET_IF_SLVAR_H_ */ diff --git a/sys/net/if_types.h b/sys/net/if_types.h index 51dc4ae2b4..9267af29c1 100644 --- a/sys/net/if_types.h +++ b/sys/net/if_types.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)if_types.h 7.3 (Berkeley) 6/28/90 - * $Id$ + * $Id: if_types.h,v 1.3 1993/10/16 17:43:25 rgrimes Exp $ */ +#ifndef _NET_IF_TYPES_H_ +#define _NET_IF_TYPES_H_ 1 + /* interface types for benefit of parsing media address headers */ #define IFT_OTHER 0x1 /* none of the following */ @@ -64,3 +67,4 @@ #define IFT_NSIP 0x1b /* XNS over IP */ #define IFT_SLIP 0x1c /* IP over generic TTY */ #define IFT_PPP 0x1d /* PPP over generic TTY */ +#endif /* _NET_IF_TYPES_H_ */ diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 980a3b1b8a..9d08467fd1 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)netisr.h 7.8 (Berkeley) 5/7/91 - * $Id$ + * $Id: netisr.h,v 1.2 1993/10/16 17:43:27 rgrimes Exp $ */ +#ifndef _NET_NETISR_H_ +#define _NET_NETISR_H_ 1 + /* * The networking code runs off software interrupts. * @@ -75,13 +78,14 @@ } #ifndef LOCORE #ifdef KERNEL -int softem; +extern int softem; #endif #endif #endif /* i386 */ #ifndef LOCORE #ifdef KERNEL -int netisr; /* scheduling bits for network */ +extern int netisr; /* scheduling bits for network */ #endif #endif +#endif /* _NET_NETISR_H_ */ diff --git a/sys/net/radix.h b/sys/net/radix.h index 548503428d..43da91ee50 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)radix.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: radix.h,v 1.2 1993/10/16 17:43:32 rgrimes Exp $ */ +#ifndef _NET_RADIX_H_ +#define _NET_RADIX_H_ 1 + /* * Radix search tree node layout. */ @@ -117,3 +120,4 @@ extern struct radix_node_head { #define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT)) #define Free(p) free((caddr_t)p, M_RTABLE); #endif /*KERNEL*/ +#endif /* _NET_RADIX_H_ */ diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index cd01d41842..f9b77a76f9 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)raw_cb.c 7.11 (Berkeley) 6/28/90 - * $Id$ + * $Id: raw_cb.c,v 1.2 1993/10/16 17:43:34 rgrimes Exp $ */ #include "param.h" @@ -62,6 +62,8 @@ u_long raw_sendspace = RAWSNDQ; u_long raw_recvspace = RAWRCVQ; +struct rawcb rawcb; + /* * Allocate a control block and a nominal amount * of buffer space for the socket. diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h index 5e3be10287..f8591c3722 100644 --- a/sys/net/raw_cb.h +++ b/sys/net/raw_cb.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)raw_cb.h 7.6 (Berkeley) 6/28/90 - * $Id$ + * $Id: raw_cb.h,v 1.2 1993/10/16 17:43:36 rgrimes Exp $ */ +#ifndef _NET_RAW_CB_H_ +#define _NET_RAW_CB_H_ 1 + /* * Raw protocol interface control block. Used * to tie a socket to the generic raw interface. @@ -56,5 +59,6 @@ struct rawcb { #define RAWRCVQ 8192 #ifdef KERNEL -struct rawcb rawcb; /* head of list */ +extern struct rawcb rawcb; /* head of list */ #endif +#endif /* _NET_RAW_CB_H_ */ diff --git a/sys/net/route.c b/sys/net/route.c index 0f1662d875..94dd70a86c 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)route.c 7.22 (Berkeley) 6/27/91 - * $Id$ + * $Id: route.c,v 1.2 1993/10/16 17:43:39 rgrimes Exp $ */ #include "param.h" @@ -45,7 +45,6 @@ #include "ioctl.h" #include "if.h" -#include "af.h" #include "route.h" #include "raw_cb.h" @@ -60,6 +59,15 @@ #define SA(p) ((struct sockaddr *)(p)) +#if 1 /* XXX these are obsolete, should be */ + /* deleted if nobody depends on them in */ + /* user-land */ +struct mbuf *rthost[RTHASHSIZ]; +struct mbuf *rtnet[RTHASHSIZ]; +#endif + +struct rtstat rtstat; + int rttrash; /* routes not in table but not freed */ struct sockaddr wildcard; /* zero valued cookie for wildcard searches */ int rthashsize = RTHASHSIZ; /* for netstat, etc. */ diff --git a/sys/net/route.h b/sys/net/route.h index ccdf41f727..140998ed00 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)route.h 7.13 (Berkeley) 4/25/91 - * $Id$ + * $Id: route.h,v 1.2 1993/10/16 17:43:41 rgrimes Exp $ */ +#ifndef _NET_ROUTE_H_ +#define _NET_ROUTE_H_ 1 + /* * Kernel resident routing tables. * @@ -197,7 +200,7 @@ struct route_cb { #define RTA_AUTHOR 0x40 /* sockaddr for author of redirect */ #ifdef KERNEL -struct route_cb route_cb; +extern struct route_cb route_cb; #endif #ifdef KERNEL @@ -217,8 +220,9 @@ struct route_cb route_cb; #else #define RTHASHMOD(h) ((h) % RTHASHSIZ) #endif -struct mbuf *rthost[RTHASHSIZ]; -struct mbuf *rtnet[RTHASHSIZ]; -struct rtstat rtstat; +extern struct mbuf *rthost[RTHASHSIZ]; +extern struct mbuf *rtnet[RTHASHSIZ]; +extern struct rtstat rtstat; struct rtentry *rtalloc1(); #endif +#endif /* _NET_ROUTE_H_ */ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 5f6b885ff6..fcf6b1e390 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)rtsock.c 7.18 (Berkeley) 6/27/91 - * $Id$ + * $Id: rtsock.c,v 1.3 1993/10/16 17:43:43 rgrimes Exp $ */ #include "param.h" @@ -43,13 +43,13 @@ #include "domain.h" #include "protosw.h" -#include "af.h" #include "if.h" #include "route.h" #include "raw_cb.h" #include "machine/mtpr.h" +struct route_cb route_cb; struct sockaddr route_dst = { 2, PF_ROUTE, }; struct sockaddr route_src = { 2, PF_ROUTE, }; struct sockproto route_proto = { PF_ROUTE, }; diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index 4554d12eb9..100662ce67 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -2,7 +2,7 @@ /* * Definitions for tcp compression routines. * - * $Id$ + * $Id: slcompress.h,v 1.2 1993/08/27 02:10:32 rgrimes Exp $ * From: slcompress.h,v 1.13 1993/08/09 02:37:32 paulus Exp * From: slcompress.h,v 1.10 89/12/31 08:53:02 van Exp * @@ -44,6 +44,9 @@ * - added sl_uncompress_tcp_part. */ +#ifndef _NET_SLCOMPRESS_H_ +#define _NET_SLCOMPRESS_H_ 1 + #define MAX_STATES 16 /* must be > 2 and < 256 */ #define MAX_HDR MLEN /* XXX 4bsd-ism: should really be 128 */ @@ -164,3 +167,4 @@ extern int sl_uncompress_tcp __P((u_char **bufp, int len, u_int type, extern int sl_uncompress_tcp_part __P((u_char **bufp, int buflen, int total_len, u_int type, struct slcompress *)); +#endif /* _NET_SLCOMPRESS_H_ */ diff --git a/sys/net/slip.h b/sys/net/slip.h index 9bbdba3244..799d630a32 100644 --- a/sys/net/slip.h +++ b/sys/net/slip.h @@ -15,9 +15,12 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * from: unknown - * $Id$ + * $Id: slip.h,v 1.2 1993/10/16 17:43:44 rgrimes Exp $ */ +#ifndef _NET_SLIP_H_ +#define _NET_SLIP_H_ 1 + /* * Definitions that user level programs might need to know to interact * with serial line IP (slip) lines. @@ -46,3 +49,4 @@ #define SLIPDIR_IN 0 #define SLIPDIR_OUT 1 +#endif /* _NET_SLIP_H_ */ diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h index 4d67d2fe47..f5acba44bb 100644 --- a/sys/netccitt/hd_var.h +++ b/sys/netccitt/hd_var.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)hd_var.h 7.4 (Berkeley) 5/29/91 - * $Id$ + * $Id: hd_var.h,v 1.2 1993/10/16 19:46:41 rgrimes Exp $ */ +#ifndef _NETCCITT_HD_VAR_H_ +#define _NETCCITT_HD_VAR_H_ 1 + /* * * hdlc control block @@ -106,3 +109,4 @@ int hd_t1; /* timer T1 value */ int hd_t3; /* RR send timer */ int hd_n2; /* frame retransmission limit */ #endif +#endif /* _NETCCITT_HD_VAR_H_ */ diff --git a/sys/netccitt/hdlc.h b/sys/netccitt/hdlc.h index 09613edbb4..4a1f47365f 100644 --- a/sys/netccitt/hdlc.h +++ b/sys/netccitt/hdlc.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)hdlc.h 7.4 (Berkeley) 5/6/91 - * $Id$ + * $Id: hdlc.h,v 1.2 1993/10/16 19:46:43 rgrimes Exp $ */ +#ifndef _NETCCITT_HDLC_H_ +#define _NETCCITT_HDLC_H_ 1 + #ifndef ORDER4 #define FALSE 0 #define TRUE 1 @@ -152,6 +155,9 @@ struct Hdlc_frame { #define TX 0 #define RX 1 +#ifdef KERNEL bool range_check (); bool valid_nr (); struct mbuf *hd_remove (); +#endif /* KERNEL */ +#endif /* _NETCCITT_HDLC_H_ */ diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h index b741b236af..052d0c922c 100644 --- a/sys/netccitt/pk.h +++ b/sys/netccitt/pk.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)pk.h 7.8 (Berkeley) 4/30/91 - * $Id$ + * $Id: pk.h,v 1.2 1993/10/16 19:46:46 rgrimes Exp $ */ +#ifndef _NETCCITT_PK_H_ +#define _NETCCITT_PK_H_ 1 + /* * * X.25 Packet Level Definitions: @@ -191,3 +194,4 @@ struct mbuf *pk_template (); #define DIAG_TYPE 14 * MAXSTATES #define INVALID_PACKET 15 * MAXSTATES #define DELETE_PACKET INVALID_PACKET +#endif /* _NETCCITT_PK_H_ */ diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h index ff1b558864..4a918b3302 100644 --- a/sys/netccitt/pk_var.h +++ b/sys/netccitt/pk_var.h @@ -36,10 +36,13 @@ * SUCH DAMAGE. * * from: @(#)pk_var.h 7.11 (Berkeley) 5/29/91 - * $Id$ + * $Id: pk_var.h,v 1.2 1993/10/16 19:46:58 rgrimes Exp $ */ +#ifndef _NETCCITT_PK_VAR_H_ +#define _NETCCITT_PK_VAR_H_ 1 + /* * * X.25 Logical Channel Descriptor @@ -173,3 +176,4 @@ struct pklcd *pk_attach(); extern char *pk_name[], *pk_state[]; int pk_t20, pk_t21, pk_t22, pk_t23; #endif +#endif /* _NETCCITT_PK_VAR_H_ */ diff --git a/sys/netccitt/x25.h b/sys/netccitt/x25.h index f4d77c90ac..59d5d8663f 100644 --- a/sys/netccitt/x25.h +++ b/sys/netccitt/x25.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)x25.h 7.8 (Berkeley) 5/29/91 - * $Id$ + * $Id: x25.h,v 1.2 1993/10/16 19:47:00 rgrimes Exp $ */ +#ifndef _NETCCITT_X25_H_ +#define _NETCCITT_X25_H_ 1 + #ifdef KERNEL #define PRC_IFUP 3 #define PRC_LINKUP 4 @@ -151,3 +154,4 @@ struct ifreq_x25 { #define SIOCSIFCONF_X25 _IOW('i', 12, struct ifreq_x25) /* set ifnet config */ #define SIOCGIFCONF_X25 _IOWR('i',13, struct ifreq_x25) /* get ifnet config */ #endif +#endif /* _NETCCITT_X25_H_ */ diff --git a/sys/netccitt/x25acct.h b/sys/netccitt/x25acct.h index 6d2b6f64d7..ce01a811d9 100644 --- a/sys/netccitt/x25acct.h +++ b/sys/netccitt/x25acct.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)x25acct.h 7.2 (Berkeley) 5/11/90 - * $Id$ + * $Id: x25acct.h,v 1.2 1993/10/16 19:47:01 rgrimes Exp $ */ +#ifndef _NETCCITT_X25ACCT_H_ +#define _NETCCITT_X25ACCT_H_ 1 + /* * Format of X.25 accounting record written * to X25ACCTF whenever a circuit is closed. @@ -69,3 +72,4 @@ struct x25acct { long x25acct_txcnt; /* packets transmitted */ long x25acct_rxcnt; /* packets received */ }; +#endif /* _NETCCITT_X25ACCT_H_ */ diff --git a/sys/netccitt/x25err.h b/sys/netccitt/x25err.h index 4c0757c0a0..b38bd2193f 100644 --- a/sys/netccitt/x25err.h +++ b/sys/netccitt/x25err.h @@ -36,9 +36,12 @@ * SUCH DAMAGE. * * from: @(#)x25err.h 7.2 (Berkeley) 5/11/90 - * $Id$ + * $Id: x25err.h,v 1.2 1993/10/16 19:47:02 rgrimes Exp $ */ +#ifndef _NETCCITT_X25ERR_H_ +#define _NETCCITT_X25ERR_H_ 1 + /* * * X.25 Reset and Clear errors and diagnostics. These values are @@ -63,3 +66,4 @@ #define EXCNCG 118 /* Clear: network congestion */ #define EXCNOB 119 /* Clear: not obtainable */ +#endif /* _NETCCITT_X25ERR_H_ */ diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index 51570cef49..eaf426331e 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)icmp_var.h 7.5 (Berkeley) 6/28/90 - * $Id$ + * $Id: icmp_var.h,v 1.2 1993/10/16 18:25:52 rgrimes Exp $ */ +#ifndef _NETINET_ICMP_VAR_H_ +#define _NETINET_ICMP_VAR_H_ 1 + /* * Variables related to this implementation * of the internet control message protocol. @@ -54,5 +57,6 @@ struct icmpstat { }; #ifdef KERNEL -struct icmpstat icmpstat; +extern struct icmpstat icmpstat; #endif +#endif /* _NETINET_ICMP_VAR_H_ */ diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 3ad2cd6f3f..4b45dde099 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)if_ether.h 7.5 (Berkeley) 6/28/90 - * $Id$ + * $Id: if_ether.h,v 1.2 1993/10/16 18:25:55 rgrimes Exp $ */ +#ifndef _NETINET_IF_ETHER_H_ +#define _NETINET_IF_ETHER_H_ 1 + /* * Structure of a 10Mb/s Ethernet header. */ @@ -102,8 +105,9 @@ struct arptab { }; #ifdef KERNEL -u_char etherbroadcastaddr[6]; +extern u_char etherbroadcastaddr[6]; /* defined in net/if_ethersubr.c */ struct arptab *arptnew(); int ether_output(), ether_input(); char *ether_sprintf(); #endif +#endif /* _NETINET_IF_ETHER_H_ */ diff --git a/sys/netinet/in.c b/sys/netinet/in.c index cf261759fb..e97d3241ce 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)in.c 7.17 (Berkeley) 4/20/91 - * $Id$ + * $Id: in.c,v 1.2 1993/10/16 18:25:57 rgrimes Exp $ */ #include "param.h" @@ -47,6 +47,9 @@ #include "in_var.h" #ifdef INET +struct in_ifaddr *in_ifaddr; +struct ifqueue ipintrq; + /* * Formulate an Internet address from network + host. */ diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 1667ea79cd..55254dc85d 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)in_pcb.h 7.6 (Berkeley) 6/28/90 - * $Id$ + * $Id: in_pcb.h,v 1.2 1993/10/16 18:26:03 rgrimes Exp $ */ +#ifndef _NETINET_IN_PCB_H_ +#define _NETINET_IN_PCB_H_ 1 + /* * Common structure pcb for internet protocol implementation. * Here are stored pointers to local and foreign host table @@ -90,3 +93,4 @@ struct raw_inpcb { #ifdef KERNEL struct inpcb *in_pcblookup(); #endif +#endif /* _NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index 448e0e5da9..59b249f06b 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)in_systm.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: in_systm.h,v 1.2 1993/10/16 18:26:06 rgrimes Exp $ */ +#ifndef _NETINET_IN_SYSTM_H_ +#define _NETINET_IN_SYSTM_H_ 1 + /* * Miscellaneous internetwork * definitions for kernel. @@ -55,3 +58,4 @@ typedef u_long n_time; /* ms since 00:00 GMT, byte rev */ #ifdef KERNEL n_time iptime(); #endif +#endif /* _NETINET_IN_SYSTM_H_ */ diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 0daace81e6..b799b0199d 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)in_var.h 7.6 (Berkeley) 6/28/90 - * $Id$ + * $Id: in_var.h,v 1.2 1993/10/16 18:26:07 rgrimes Exp $ */ +#ifndef _NETINET_IN_VAR_H_ +#define _NETINET_IN_VAR_H_ 1 + /* * Interface address, Internet version. One of these structures * is allocated for each interface with an Internet address. @@ -71,7 +74,8 @@ struct in_aliasreq { #define IA_SIN(ia) (&(((struct in_ifaddr *)(ia))->ia_addr)) #ifdef KERNEL -struct in_ifaddr *in_ifaddr; +extern struct in_ifaddr *in_ifaddr; struct in_ifaddr *in_iaonnetof(); -struct ifqueue ipintrq; /* ip packet input queue */ +extern struct ifqueue ipintrq; /* ip packet input queue */ #endif +#endif /* _NETINET_IN_VAR_H_ */ diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h index bc93cc69dd..accaaa00ef 100644 --- a/sys/netinet/ip.h +++ b/sys/netinet/ip.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)ip.h 7.10 (Berkeley) 6/28/90 - * $Id$ + * $Id: ip.h,v 1.2 1993/10/16 18:26:08 rgrimes Exp $ */ +#ifndef _NETINET_IP_H_ +#define _NETINET_IP_H_ 1 + /* * Definitions for internet protocol version 4. * Per RFC 791, September 1981. @@ -165,3 +168,4 @@ struct ip_timestamp { #define IPTTLDEC 1 /* subtracted when forwarding */ #define IP_MSS 576 /* default maximum segment size */ +#endif /* _NETINET_IP_H_ */ diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 1e99abb9c0..ba0ee06ba7 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ip_icmp.c 7.15 (Berkeley) 4/20/91 - * $Id$ + * $Id: ip_icmp.c,v 1.2 1993/10/16 18:26:11 rgrimes Exp $ */ #include "param.h" @@ -63,6 +63,7 @@ int icmpprintfs = 0; #endif extern struct protosw inetsw[]; +struct icmpstat icmpstat; /* * Generate an error packet of type error diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h index 1dd385265e..5493577262 100644 --- a/sys/netinet/ip_icmp.h +++ b/sys/netinet/ip_icmp.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)ip_icmp.h 7.5 (Berkeley) 6/28/90 - * $Id$ + * $Id: ip_icmp.h,v 1.2 1993/10/16 18:26:12 rgrimes Exp $ */ +#ifndef _NETINET_IP_ICMP_H_ +#define _NETINET_IP_ICMP_H_ 1 + /* * Interface Control Message Protocol Definitions. * Per RFC 792, September 1981. @@ -132,3 +135,4 @@ struct icmp { (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \ (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \ (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY) +#endif /* _NETINET_IP_ICMP_H_ */ diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 4d28578648..8cb7e01872 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ip_input.c 7.19 (Berkeley) 5/25/91 - * $Id$ + * $Id: ip_input.c,v 1.2 1993/10/16 18:26:14 rgrimes Exp $ */ #include "param.h" @@ -77,6 +77,9 @@ extern struct protosw inetsw[]; u_char ip_protox[IPPROTO_MAX]; int ipqmaxlen = IFQ_MAXLEN; struct in_ifaddr *in_ifaddr; /* first inet address */ +struct ipstat ipstat; +struct ipq ipq; +u_short ip_id; /* * We need to save the IP options in case a protocol wants to respond diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 606209ff50..1fccdb32fb 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)ip_var.h 7.7 (Berkeley) 6/28/90 - * $Id$ + * $Id: ip_var.h,v 1.2 1993/10/16 18:26:17 rgrimes Exp $ */ +#ifndef _NETINET_IP_VAR_H_ +#define _NETINET_IP_VAR_H_ 1 + /* * Overlay for ip header used by other protocols (tcp, udp). */ @@ -129,9 +132,10 @@ struct ipstat { #define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */ #define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */ -struct ipstat ipstat; -struct ipq ipq; /* ip reass. queue */ -u_short ip_id; /* ip packet ctr, for ids */ +extern struct ipstat ipstat; +extern struct ipq ipq; /* ip reass. queue */ +extern u_short ip_id; /* ip packet ctr, for ids */ struct mbuf *ip_srcroute(); #endif +#endif /* _NETINET_IP_VAR_H_ */ diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index a2474c5d88..5b9fea3237 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)tcp.h 7.7 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcp.h,v 1.2 1993/10/16 18:26:20 rgrimes Exp $ */ +#ifndef _NETINET_TCP_H_ +#define _NETINET_TCP_H_ 1 + typedef u_long tcp_seq; /* * TCP header. @@ -83,3 +86,4 @@ struct tcphdr { */ #define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ #define TCP_MAXSEG 0x02 /* set maximum segment size */ +#endif /* _NETINET_TCP_H_ */ diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index 5818827601..8d35cbeff4 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tcp_debug.c 7.6 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcp_debug.c,v 1.2 1993/10/16 18:26:22 rgrimes Exp $ */ #ifdef TCPDEBUG @@ -69,6 +69,10 @@ #ifdef TCPDEBUG int tcpconsdebug = 0; #endif + +struct tcp_debug tcp_debug[TCP_NDEBUG]; +int tcp_debx; + /* * Tcp debug routines */ diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h index fd3aab6e5f..95b9d847ce 100644 --- a/sys/netinet/tcp_debug.h +++ b/sys/netinet/tcp_debug.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)tcp_debug.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcp_debug.h,v 1.2 1993/10/16 18:26:23 rgrimes Exp $ */ +#ifndef _NETINET_TCP_DEBUG_H_ +#define _NETINET_TCP_DEBUG_H_ 1 + struct tcp_debug { n_time td_time; short td_act; @@ -56,5 +59,6 @@ char *tanames[] = #endif #define TCP_NDEBUG 100 -struct tcp_debug tcp_debug[TCP_NDEBUG]; -int tcp_debx; +extern struct tcp_debug tcp_debug[TCP_NDEBUG]; +extern int tcp_debx; +#endif /* _NETINET_TCP_DEBUG_H_ */ diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h index 9c4bfc3523..8bd19d5c28 100644 --- a/sys/netinet/tcp_fsm.h +++ b/sys/netinet/tcp_fsm.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)tcp_fsm.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcp_fsm.h,v 1.2 1993/10/16 18:26:24 rgrimes Exp $ */ +#ifndef _NETINET_TCP_FSM_H_ +#define _NETINET_TCP_FSM_H_ 1 + /* * TCP FSM state definitions. * Per RFC793, September, 1981. @@ -74,7 +77,7 @@ u_char tcp_outflags[TCP_NSTATES] = { #endif #ifdef KPROF -int tcp_acounts[TCP_NSTATES][PRU_NREQ]; +extern int tcp_acounts[TCP_NSTATES][PRU_NREQ]; #endif #ifdef TCPSTATES @@ -84,3 +87,4 @@ char *tcpstates[] = { "LAST_ACK", "FIN_WAIT_2", "TIME_WAIT", }; #endif +#endif /* _NETINET_TCP_FSM_H_ */ diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h index e295693c8a..610980d4e1 100644 --- a/sys/netinet/tcp_seq.h +++ b/sys/netinet/tcp_seq.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)tcp_seq.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcp_seq.h,v 1.2 1993/10/16 18:26:30 rgrimes Exp $ */ +#ifndef _NETINET_TCP_SEQ_H_ +#define _NETINET_TCP_SEQ_H_ 1 + /* * TCP sequence numbers are 32 bit integers operated * on with modular arithmetic. These macros can be @@ -59,5 +62,6 @@ #define TCP_ISSINCR (125*1024) /* increment for tcp_iss each second */ #ifdef KERNEL -tcp_seq tcp_iss; /* tcp initial send seq # */ +extern tcp_seq tcp_iss; /* tcp initial send seq # */ #endif +#endif /* _NETINET_TCP_SEQ_H_ */ diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 95f2b9cfbe..76466f8f6a 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tcp_subr.c 7.20 (Berkeley) 12/1/90 - * $Id$ + * $Id: tcp_subr.c,v 1.2 1993/10/16 18:26:31 rgrimes Exp $ */ #include "param.h" @@ -66,6 +66,14 @@ int tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ; extern struct inpcb *tcp_last_inpcb; +#ifdef KPROF +int tcp_acounts[TCP_NSTATES][PRU_NREQ]; +#endif +tcp_seq tcp_iss; +struct inpcb tcb; +struct tcpstat tcpstat; + + /* * Tcp initialization */ diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 5ce5871b2c..0ad7461c32 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)tcp_timer.h 7.8 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcp_timer.h,v 1.2 1993/10/16 18:26:35 rgrimes Exp $ */ +#ifndef _NETINET_TCP_TIMER_H_ +#define _NETINET_TCP_TIMER_H_ 1 + /* * Definitions of the TCP timers. These timers are counted * down PR_SLOWHZ times a second. @@ -128,3 +131,4 @@ extern int tcp_maxidle; /* time to drop after starting probes */ extern int tcp_ttl; /* time to live for TCP segs */ extern int tcp_backoff[]; #endif +#endif /* _NETINET_TCP_TIMER_H_ */ diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index b0551c52db..f9d3b54d08 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)tcp_var.h 7.10 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcp_var.h,v 1.2 1993/10/16 18:26:38 rgrimes Exp $ */ +#ifndef _NETINET_TCP_VAR_H_ +#define _NETINET_TCP_VAR_H_ 1 + /* * Kernel variables for tcp. */ @@ -211,9 +214,10 @@ struct tcpstat { }; #ifdef KERNEL -struct inpcb tcb; /* head of queue of active tcpcb's */ -struct tcpstat tcpstat; /* tcp statistics */ +extern struct inpcb tcb; /* head of queue of active tcpcb's */ +extern struct tcpstat tcpstat; /* tcp statistics */ struct tcpiphdr *tcp_template(); struct tcpcb *tcp_close(), *tcp_drop(); struct tcpcb *tcp_timers(), *tcp_disconnect(), *tcp_usrclosed(); #endif +#endif /* _NETINET_TCP_VAR_H_ */ diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h index 4c37d44b53..95cff1aecd 100644 --- a/sys/netinet/tcpip.h +++ b/sys/netinet/tcpip.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)tcpip.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: tcpip.h,v 1.2 1993/10/16 18:26:40 rgrimes Exp $ */ +#ifndef _NETINET_TCPIP_H_ +#define _NETINET_TCPIP_H_ 1 + /* * Tcp+ip header, after ip options removed. */ @@ -58,3 +61,4 @@ struct tcpiphdr { #define ti_win ti_t.th_win #define ti_sum ti_t.th_sum #define ti_urp ti_t.th_urp +#endif /* _NETINET_TCPIP_H_ */ diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h index d731c5330e..3e1a81384e 100644 --- a/sys/netinet/udp.h +++ b/sys/netinet/udp.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)udp.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: udp.h,v 1.2 1993/10/16 18:26:41 rgrimes Exp $ */ +#ifndef _NETINET_UDP_H_ +#define _NETINET_UDP_H_ 1 + /* * Udp protocol header. * Per RFC 768, September, 1981. @@ -44,3 +47,4 @@ struct udphdr { short uh_ulen; /* udp length */ u_short uh_sum; /* udp checksum */ }; +#endif /* _NETINET_UDP_H_ */ diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cb875f0a75..ca9c769aad 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)udp_usrreq.c 7.20 (Berkeley) 4/20/91 - * $Id$ + * $Id: udp_usrreq.c,v 1.2 1993/10/16 18:26:43 rgrimes Exp $ */ #include "param.h" @@ -54,6 +54,9 @@ #include "udp.h" #include "udp_var.h" +struct inpcb udb; +struct udpstat udpstat; + struct inpcb *udp_last_inpcb = &udb; /* diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 1887105e62..bb6587ef0d 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)udp_var.h 7.7 (Berkeley) 6/28/90 - * $Id$ + * $Id: udp_var.h,v 1.2 1993/10/16 18:26:44 rgrimes Exp $ */ +#ifndef _NETINET_UDP_VAR_H_ +#define _NETINET_UDP_VAR_H_ 1 + /* * UDP kernel structures and variables. */ @@ -70,6 +73,7 @@ struct udpstat { #define UDP_TTL 30 /* default time to live for UDP packets */ #ifdef KERNEL -struct inpcb udb; -struct udpstat udpstat; +extern struct inpcb udb; +extern struct udpstat udpstat; #endif +#endif /* _NETINET_UDP_VAR_H_ */ diff --git a/sys/netiso/clnl.h b/sys/netiso/clnl.h index 10a3eae0f3..60d6c8fd13 100644 --- a/sys/netiso/clnl.h +++ b/sys/netiso/clnl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)clnl.h 7.3 (Berkeley) 5/6/91 - * $Id$ + * $Id: clnl.h,v 1.2 1993/10/16 21:04:41 rgrimes Exp $ */ /*********************************************************** @@ -57,9 +57,13 @@ SOFTWARE. ******************************************************************/ +#ifndef _NETISO_CLNL_H_ +#define _NETISO_CLNL_H_ 1 + /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ struct clnl_protosw { int (*clnl_input)(); /* input routine */ }; +#endif /* _NETISO_CLNL_H_ */ diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h index 2c8b4523ca..8a1d002151 100644 --- a/sys/netiso/clnp.h +++ b/sys/netiso/clnp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)clnp.h 7.8 (Berkeley) 5/6/91 - * $Id$ + * $Id: clnp.h,v 1.2 1993/10/16 21:04:42 rgrimes Exp $ */ /*********************************************************** @@ -57,28 +57,15 @@ SOFTWARE. ******************************************************************/ +#ifndef _NETISO_CLNP_H_ +#define _NETISO_CLNP_H_ 1 + /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -#ifndef BYTE_ORDER -/* - * Definitions for byte order, - * according to byte significance from low address to high. - */ -#define LITTLE_ENDIAN 1234 /* least-significant byte first (vax) */ -#define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long (pdp) */ - -#ifdef vax -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN /* mc68000, tahoe, most others */ -#endif -#endif BYTE_ORDER +#include -/* should be config option but cpp breaks with too many #defines */ -#define DECBIT /* * Return true if the mbuf is a cluster mbuf @@ -403,7 +390,7 @@ struct troll { - trollctl.tr_mtu_adj) #ifdef KERNEL -extern float troll_random; +extern float troll_random __P((void)); #endif #else /* NO TROLL */ @@ -414,7 +401,7 @@ extern float troll_random; #define SN_MTU(ifp, rt) (((rt && rt->rt_rmx.rmx_mtu) ?\ rt->rt_rmx.rmx_mtu : clnp_badmtu(ifp, rt, __LINE__, __FILE__))) -#endif TROLL +#endif /* not TROLL */ /* * Macro to remove an address from a clnp header @@ -472,6 +459,7 @@ caddr_t clnp_insert_addr(); struct iso_addr *clnp_srcaddr(); struct mbuf *clnp_reass(); #ifdef TROLL -struct troll trollctl; -#endif TROLL -#endif KERNEL +extern struct troll trollctl; +#endif /* TROLL */ +#endif /* KERNEL */ +#endif /* _NETISO_CLNP_H_ */ diff --git a/sys/netiso/clnp_stat.h b/sys/netiso/clnp_stat.h index 2f8cfebb07..d57170879c 100644 --- a/sys/netiso/clnp_stat.h +++ b/sys/netiso/clnp_stat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)clnp_stat.h 7.4 (Berkeley) 5/6/91 - * $Id$ + * $Id: clnp_stat.h,v 1.2 1993/10/16 21:04:55 rgrimes Exp $ */ /*********************************************************** @@ -92,7 +92,9 @@ struct clnp_stat { int cns_congest_rcvd; /* congestion experienced bit received */ int cns_er_inhist[CLNP_ERRORS + 1]; int cns_er_outhist[CLNP_ERRORS + 1]; -} clnp_stat ; +} ; + +extern struct clnp_stat clnp_stat; #ifdef INCSTAT #undef INCSTAT diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c index 6cabeea90e..6b9dd5d6d7 100644 --- a/sys/netiso/clnp_subr.c +++ b/sys/netiso/clnp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)clnp_subr.c 7.13 (Berkeley) 5/6/91 - * $Id$ + * $Id: clnp_subr.c,v 1.3 1993/10/16 21:04:56 rgrimes Exp $ */ /*********************************************************** @@ -86,6 +86,12 @@ SOFTWARE. #include "clnp_stat.h" #include "argo_debug.h" +#ifdef TROLL +struct troll trollctl; +#endif +struct clnp_stat clnp_stat; + + /* * FUNCTION: clnp_data_ck * diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c index c6cfee7512..8a21dad5a8 100644 --- a/sys/netiso/cltp_usrreq.c +++ b/sys/netiso/cltp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)cltp_usrreq.c 7.6 (Berkeley) 6/27/91 - * $Id$ + * $Id: cltp_usrreq.c,v 1.3 1993/10/16 21:04:59 rgrimes Exp $ */ #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */ @@ -56,6 +56,10 @@ #include "cltp_var.h" #endif +struct isopcb cltb; +struct cltpstat cltpstat; + + /* * CLTP protocol implementation. * Per ISO 8602, December, 1987. diff --git a/sys/netiso/cltp_var.h b/sys/netiso/cltp_var.h index 2ead968bf9..84449e9bc6 100644 --- a/sys/netiso/cltp_var.h +++ b/sys/netiso/cltp_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)cltp_var.h 7.3 (Berkeley) 6/28/90 - * $Id$ + * $Id: cltp_var.h,v 1.2 1993/10/16 21:05:00 rgrimes Exp $ */ +#ifndef _NETISO_CLTP_VAR_H_ +#define _NETISO_CLTP_VAR_H_ 1 + #define UD_TPDU_type 0x40 /* packet type */ #define CLTPOVAL_SRC 0xc1 /* Source TSAP -- required */ @@ -50,6 +53,7 @@ struct cltpstat { }; #ifdef KERNEL -struct isopcb cltb; -struct cltpstat cltpstat; +extern struct isopcb cltb; +extern struct cltpstat cltpstat; #endif +#endif /* _NETISO_CLTP_VAR_H_ */ diff --git a/sys/netiso/cons.h b/sys/netiso/cons.h index 816fcb0450..f8200506b3 100644 --- a/sys/netiso/cons.h +++ b/sys/netiso/cons.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)cons.h 7.3 (Berkeley) 5/6/91 - * $Id$ + * $Id: cons.h,v 1.2 1993/10/16 21:05:02 rgrimes Exp $ */ /*********************************************************** @@ -61,6 +61,9 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ +#ifndef _NETISO_CONS_H_ +#define _NETISO_CONS_H_ 1 + /* * interface between TP and CONS */ @@ -88,4 +91,5 @@ struct dte_addr { #define PRC_CONS_SEND_DONE 2 /* something unused in protosw.h */ -#endif KERNEL +#endif /* KERNEL */ +#endif /* _NETISO_CONS_H_ */ diff --git a/sys/netiso/cons_pcb.h b/sys/netiso/cons_pcb.h index 579c040235..645f72c201 100644 --- a/sys/netiso/cons_pcb.h +++ b/sys/netiso/cons_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)cons_pcb.h 7.4 (Berkeley) 5/6/91 - * $Id$ + * $Id: cons_pcb.h,v 1.2 1993/10/16 21:05:03 rgrimes Exp $ */ /*********************************************************** @@ -61,6 +61,9 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ +#ifndef _NETISO_CONS_PCB_H_ +#define _NETISO_CONS_PCB_H_ 1 + /* * protocol control block for the connection oriented network service */ @@ -175,11 +178,13 @@ struct cons_stat { u_int co_parse_facil_err; u_int co_addr_proto_consist_err; u_int co_no_copcb; -} cons_stat; +}; + +extern struct cons_stat cons_stat; -u_char x25_error_stats[CONL_ERROR_MAX + 1]; +extern u_char x25_error_stats[CONL_ERROR_MAX + 1]; -struct ifqueue consintrq; +extern struct ifqueue consintrq; /* reasons for clear are in a data mbuf chained to a clear ecn_request */ struct e_clear_data { @@ -190,3 +195,4 @@ struct e_clear_data { #ifdef KERNEL #define IncStat(XYZ) cons_stat.XYZ++ #endif KERNEL +#endif /* _NETISO_CONS_PCB_H_ */ diff --git a/sys/netiso/eonvar.h b/sys/netiso/eonvar.h index 8d4aeb21cc..a7cf40cdb8 100644 --- a/sys/netiso/eonvar.h +++ b/sys/netiso/eonvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)eonvar.h 7.5 (Berkeley) 5/6/91 - * $Id$ + * $Id: eonvar.h,v 1.2 1993/10/16 21:05:04 rgrimes Exp $ */ /*********************************************************** @@ -61,6 +61,9 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ +#ifndef _NETISO_EONVAR_H_ +#define _NETISO_EONVAR_H_ 1 + #define EON_986_VERSION 0x3 #define EON_VERSION 0x1 @@ -149,7 +152,11 @@ struct eon_stat { /* errors */ int es_badcsum; int es_badhdr; -} eonstat; +}; + +#ifdef KERNEL +extern struct eon_stat eon_stat; +#endif #undef IncStat #define IncStat(xxx) eonstat.xxx++ @@ -169,3 +176,4 @@ struct eon_llinfo { }; #define el_iphdr el_ei.ei_ip #define el_eonhdr el_ei.ei_eh +#endif /* _NETISO_EONVAR_H_ */ diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c index f80de34e19..9134e9cb26 100644 --- a/sys/netiso/esis.c +++ b/sys/netiso/esis.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)esis.c 7.19 (Berkeley) 6/27/91 - * $Id$ + * $Id: esis.c,v 1.2 1993/10/16 21:05:06 rgrimes Exp $ */ /*********************************************************** @@ -99,6 +99,8 @@ SOFTWARE. * */ struct rawcb esis_pcb; +struct esis_stat esis_stat; + int esis_config(), snpac_age(); int esis_sendspace = 2048; int esis_recvspace = 2048; diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h index fd4bcd9e91..fef43c30e2 100644 --- a/sys/netiso/esis.h +++ b/sys/netiso/esis.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)esis.h 7.4 (Berkeley) 5/6/91 - * $Id$ + * $Id: esis.h,v 1.2 1993/10/16 21:05:08 rgrimes Exp $ */ /*********************************************************** @@ -57,25 +57,14 @@ SOFTWARE. ******************************************************************/ -/* - * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison - */ +#ifndef _NETISO_ESIS_H_ +#define _NETISO_ESIS_H_ 1 -#ifndef BYTE_ORDER /* - * Definitions for byte order, - * according to byte significance from low address to high. + * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ -#define LITTLE_ENDIAN 1234 /* least-significant byte first (vax) */ -#define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long (pdp) */ -#ifdef vax -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN /* mc68000, tahoe, most others */ -#endif -#endif BYTE_ORDER +#include #define SNPAC_AGE 60 /* seconds */ #define ESIS_CONFIG 60 /* seconds */ @@ -128,5 +117,6 @@ struct esis_stat { }; #ifdef KERNEL -struct esis_stat esis_stat; -#endif KERNEL +extern struct esis_stat esis_stat; +#endif /* KERNEL */ +#endif /* _NETISO_ESIS_H_ */ diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c index 49fffa2687..7d31db0809 100644 --- a/sys/netiso/if_cons.c +++ b/sys/netiso/if_cons.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)if_cons.c 7.10 (Berkeley) 5/29/91 - * $Id$ + * $Id: if_cons.c,v 1.2 1993/10/16 21:05:10 rgrimes Exp $ */ /*********************************************************** @@ -157,6 +157,10 @@ NOTE: *********************************************************************/ +struct cons_stat cons_stat; +u_char x25_error_stats[CONL_ERROR_MAX + 1]; +struct ifqueue consintrq; + #define CONS_IFQMAXLEN 5 diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c index 01bcd56e0f..e8f7a609fc 100644 --- a/sys/netiso/if_eon.c +++ b/sys/netiso/if_eon.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)if_eon.c 7.16 (Berkeley) 6/27/91 - * $Id$ + * $Id: if_eon.c,v 1.2 1993/10/16 21:05:13 rgrimes Exp $ */ /*********************************************************** @@ -108,6 +108,8 @@ SOFTWARE. extern struct timeval time; extern struct ifnet loif; +struct eon_stat eonstat; + #define EOK 0 int eoninput(); diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c index 49290f774e..9831d06a60 100644 --- a/sys/netiso/iso.c +++ b/sys/netiso/iso.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)iso.c 7.14 (Berkeley) 6/27/91 - * $Id$ + * $Id: iso.c,v 1.3 1993/10/16 21:05:15 rgrimes Exp $ */ /*********************************************************** @@ -78,7 +78,6 @@ SOFTWARE. #include "../net/if.h" #include "../net/route.h" -#include "../net/af.h" #include "iso.h" #include "iso_var.h" @@ -89,6 +88,9 @@ SOFTWARE. #ifdef ISO +struct iso_ifaddr *iso_ifaddr; +struct ifqueue clnlintrq; + int iso_interfaces = 0; /* number of external interfaces */ extern struct ifnet loif; /* loopback interface */ int ether_output(), llc_rtrequest(); diff --git a/sys/netiso/iso_errno.h b/sys/netiso/iso_errno.h index e9066684f6..def8b9527b 100644 --- a/sys/netiso/iso_errno.h +++ b/sys/netiso/iso_errno.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)iso_errno.h 7.5 (Berkeley) 5/6/91 - * $Id$ + * $Id: iso_errno.h,v 1.2 1993/10/16 21:05:19 rgrimes Exp $ */ /*********************************************************** @@ -272,4 +272,4 @@ SOFTWARE. #define CONL_ERROR_MAX 0x1c3 -#endif __ISO_ERRNO__ +#endif /* __ISO_ERRNO__*/ diff --git a/sys/netiso/iso_map.h b/sys/netiso/iso_map.h index 70d36c4147..1e4f61beb3 100644 --- a/sys/netiso/iso_map.h +++ b/sys/netiso/iso_map.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)iso_map.h 7.3 (Berkeley) 5/6/91 - * $Id$ + * $Id: iso_map.h,v 1.2 1993/10/16 21:05:21 rgrimes Exp $ */ /*********************************************************** @@ -60,8 +60,12 @@ SOFTWARE. /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ +#ifndef _NETISO_ISO_MAP_H_ +#define _NETISO_ISO_MAP_H_ 1 + struct maptab { struct iso_addr map_isoa; /* iso address */ u_char map_enaddr[6]; /* ethernet address */ u_char map_valid; /* true if entry is valid */ }; +#endif /* _NETISO_ISO_MAP_H_ */ diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h index 17276b80e3..6db95b38e9 100644 --- a/sys/netiso/iso_pcb.h +++ b/sys/netiso/iso_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)iso_pcb.h 7.5 (Berkeley) 5/6/91 - * $Id$ + * $Id: iso_pcb.h,v 1.2 1993/10/16 21:05:24 rgrimes Exp $ */ /*********************************************************** @@ -61,6 +61,9 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ +#ifndef _NETISO_ISO_PCB_H_ +#define _NETISO_ISO_PCB_H_ 1 + #define MAXX25CRUDLEN 16 /* 16 bytes of call request user data */ /* @@ -109,3 +112,4 @@ struct rawisopcb { #ifdef KERNEL struct isopcb *iso_pcblookup(); #endif +#endif /* _NETISO_ISO_PCB_H_ */ diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c index 632a47543a..89a6203076 100644 --- a/sys/netiso/iso_snpac.c +++ b/sys/netiso/iso_snpac.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)iso_snpac.c 7.14 (Berkeley) 6/27/91 - * $Id$ + * $Id: iso_snpac.c,v 1.2 1993/10/16 21:05:26 rgrimes Exp $ */ /*********************************************************** @@ -87,6 +87,8 @@ SOFTWARE. #include "esis.h" #include "argo_debug.h" +struct llinfo_llc llinfo_llc; + int iso_systype = SNPA_ES; /* default to be an ES */ extern short esis_holding_time, esis_config_time, esis_esconfig_time; extern struct timeval time; diff --git a/sys/netiso/iso_snpac.h b/sys/netiso/iso_snpac.h index 703114af58..aa1a0b4500 100644 --- a/sys/netiso/iso_snpac.h +++ b/sys/netiso/iso_snpac.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)iso_snpac.h 7.8 (Berkeley) 5/6/91 - * $Id$ + * $Id: iso_snpac.h,v 1.2 1993/10/16 21:05:28 rgrimes Exp $ */ /*********************************************************** @@ -61,6 +61,9 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ +#ifndef _NETISO_ISO_SNPAC_H_ +#define _NETISO_ISO_SNPAC_H_ 1 + #define MAX_SNPALEN 8 /* curiously equal to sizeof x.121 ( plus 1 for nibble len) addr */ struct snpa_req { @@ -109,5 +112,6 @@ struct llinfo_llc { #define SIOCGSTYPE _IOR('a', 40, struct systype_req) /* get system type */ #ifdef KERNEL -struct llinfo_llc llinfo_llc; /* head for linked lists */ -#endif KERNEL +extern struct llinfo_llc llinfo_llc; /* head for linked lists */ +#endif /* KERNEL */ +#endif /* _NETISO_ISO_SNPAC_H_ */ diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h index 5c7c398ff3..dafd225788 100644 --- a/sys/netiso/iso_var.h +++ b/sys/netiso/iso_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)iso_var.h 7.5 (Berkeley) 5/6/91 - * $Id$ + * $Id: iso_var.h,v 1.2 1993/10/16 21:05:30 rgrimes Exp $ */ /*********************************************************** @@ -61,6 +61,9 @@ SOFTWARE. * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ +#ifndef _NETISO_ISO_VAR_H_ +#define _NETISO_ISO_VAR_H_ 1 + /* * Interface address, iso version. One of these structures is * allocated for each interface with an osi address. The ifaddr @@ -129,7 +132,8 @@ struct snpa_hdr { short snh_flags; }; #ifdef KERNEL -struct iso_ifaddr *iso_ifaddr; /* linked list of iso address ifaces */ -struct iso_ifaddr *iso_localifa(); /* linked list of iso address ifaces */ -struct ifqueue clnlintrq; /* clnl packet input queue */ -#endif KERNEL +extern struct iso_ifaddr *iso_ifaddr; /* linked list of iso address ifaces */ +struct iso_ifaddr *iso_localifa(); /* linked list of iso address ifaces */ +extern struct ifqueue clnlintrq; /* clnl packet input queue */ +#endif /* KERNEL */ +#endif /* _NETISO_ISO_VAR_H_ */ diff --git a/sys/netiso/tp_clnp.h b/sys/netiso/tp_clnp.h index 503178f278..9b258faf16 100644 --- a/sys/netiso/tp_clnp.h +++ b/sys/netiso/tp_clnp.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_clnp.h 7.3 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_clnp.h,v 1.2 1993/10/16 21:05:34 rgrimes Exp $ */ /*********************************************************** @@ -87,7 +87,7 @@ SOFTWARE. #endif #include "../netiso/iso_var.h" -struct isopcb tp_isopcb; +extern struct isopcb tp_isopcb; /* queue of active inpcbs for tp ; for tp with dod ip */ #endif __TP_CLNP__ diff --git a/sys/netiso/tp_events.h b/sys/netiso/tp_events.h index 7d8d9b084a..484a0cbccc 100644 --- a/sys/netiso/tp_events.h +++ b/sys/netiso/tp_events.h @@ -1,74 +1,87 @@ /* * from: unknown - * $Id$ + * $Id: tp_events.h,v 1.2 1993/10/16 21:05:41 rgrimes Exp $ */ +#ifndef _NETISO_TP_EVENTS_H_ +#define _NETISO_TP_EVENTS_H_ 1 + struct tp_event { - int ev_number; - struct timeval e_time; + int ev_number; + struct timeval e_time; #define TM_inact 0x0 #define TM_retrans 0x1 #define TM_sendack 0x2 #define TM_notused 0x3 - union{ -struct { SeqNum e_low; SeqNum e_high; int e_retrans; } EV_TM_reference; + union{ + struct { SeqNum e_low; SeqNum e_high; int e_retrans; } EV_TM_reference; #define TM_reference 0x4 -struct { SeqNum e_low; SeqNum e_high; int e_retrans; } EV_TM_data_retrans; + struct { SeqNum e_low; SeqNum e_high; int e_retrans; } EV_TM_data_retrans; #define TM_data_retrans 0x5 -struct { - u_char e_reason; - } EV_ER_TPDU; + struct { + u_char e_reason; + } EV_ER_TPDU; #define ER_TPDU 0x6 -struct { struct mbuf *e_data; /* first field */ - int e_datalen; /* 2nd field */ - u_int e_cdt; - } EV_CR_TPDU; + struct { + struct mbuf *e_data; /* first field */ + int e_datalen; /* 2nd field */ + u_int e_cdt; + } EV_CR_TPDU; #define CR_TPDU 0x7 -struct { struct mbuf *e_data; /* first field */ - int e_datalen; /* 2nd field */ - u_short e_sref; - u_char e_reason; - } EV_DR_TPDU; + struct { + struct mbuf *e_data; /* first field */ + int e_datalen; /* 2nd field */ + u_short e_sref; + u_char e_reason; + } EV_DR_TPDU; #define DR_TPDU 0x8 #define DC_TPDU 0x9 -struct { struct mbuf *e_data; /* first field */ - int e_datalen; /* 2nd field */ - u_short e_sref; - u_int e_cdt; - } EV_CC_TPDU; + struct { + struct mbuf *e_data; /* first field */ + int e_datalen; /* 2nd field */ + u_short e_sref; + u_int e_cdt; + } EV_CC_TPDU; #define CC_TPDU 0xa -struct { u_int e_cdt; - SeqNum e_seq; - SeqNum e_subseq; - u_char e_fcc_present; - } EV_AK_TPDU; + struct { + u_int e_cdt; + SeqNum e_seq; + SeqNum e_subseq; + u_char e_fcc_present; + } EV_AK_TPDU; #define AK_TPDU 0xb -struct { struct mbuf *e_data; /* first field */ - int e_datalen; /* 2nd field */ - u_int e_eot; - SeqNum e_seq; - } EV_DT_TPDU; + struct { + struct mbuf *e_data; /* first field */ + int e_datalen; /* 2nd field */ + u_int e_eot; + SeqNum e_seq; + } EV_DT_TPDU; #define DT_TPDU 0xc -struct { struct mbuf *e_data; /* first field */ - int e_datalen; /* 2nd field */ - SeqNum e_seq; - } EV_XPD_TPDU; + struct { + struct mbuf *e_data; /* first field */ + int e_datalen; /* 2nd field */ + SeqNum e_seq; + } EV_XPD_TPDU; #define XPD_TPDU 0xd -struct { SeqNum e_seq; } EV_XAK_TPDU; + struct { + SeqNum e_seq; + } EV_XAK_TPDU; #define XAK_TPDU 0xe #define T_CONN_req 0xf -struct { u_char e_reason; } EV_T_DISC_req; + struct { + u_char e_reason; + } EV_T_DISC_req; #define T_DISC_req 0x10 #define T_LISTEN_req 0x11 @@ -79,9 +92,10 @@ struct { u_char e_reason; } EV_T_DISC_req; #define T_DETACH 0x16 #define T_NETRESET 0x17 #define T_ACPT_req 0x18 - }ev_union; + } ev_union; };/* end struct event */ #define tp_NEVENTS 0x19 #define ATTR(X)ev_union.EV_/**/X/**/ +#endif /* _NETISO_TP_EVENTS_H_ */ diff --git a/sys/netiso/tp_ip.h b/sys/netiso/tp_ip.h index 33b3877134..edf34b68f6 100644 --- a/sys/netiso/tp_ip.h +++ b/sys/netiso/tp_ip.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_ip.h 7.3 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_ip.h,v 1.2 1993/10/16 21:05:46 rgrimes Exp $ */ /*********************************************************** @@ -84,7 +84,7 @@ SOFTWARE. #include "../netinet/ip_var.h" -struct inpcb tp_inpcb; +extern struct inpcb tp_inpcb; /* queue of active inpcbs for tp ; for tp with dod ip */ #endif __TP_IP__ diff --git a/sys/netiso/tp_meas.h b/sys/netiso/tp_meas.h index 1f6f5885ec..d626ebf51c 100644 --- a/sys/netiso/tp_meas.h +++ b/sys/netiso/tp_meas.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_meas.h 7.5 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_meas.h,v 1.2 1993/10/16 21:05:50 rgrimes Exp $ */ /*********************************************************** @@ -57,6 +57,9 @@ SOFTWARE. ******************************************************************/ +#ifndef _NETISO_TP_MEAS_H_ +#define _NETISO_TP_MEAS_H_ 1 + /* * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison */ @@ -92,4 +95,5 @@ extern struct tp_Meas tp_Meas[]; #define TPtime_open_X 0x28 /* xtd format */ #define TPtime_close 0x09 -#endif TP_PERF_MEAS +#endif /* TP_PERF_MEAS */ +#endif /* _NETISO_TP_MEAS_H_ */ diff --git a/sys/netiso/tp_param.h b/sys/netiso/tp_param.h index 7b96f55f03..cad220384c 100644 --- a/sys/netiso/tp_param.h +++ b/sys/netiso/tp_param.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_param.h 7.8 (Berkeley) 6/27/91 - * $Id$ + * $Id: tp_param.h,v 1.2 1993/10/16 21:05:53 rgrimes Exp $ */ /*********************************************************** @@ -348,7 +348,7 @@ bcopy((caddr_t)&(((struct tp_vbp *)(src))->tpv_val),(caddr_t)&(dst),sizeof(type) (tpcb)->tp_lcredit = xxi; \ } \ } -#endif ARGO_DEBUG +#endif /* ARGO_DEBUG */ #ifdef KERNEL @@ -361,7 +361,7 @@ bcopy((caddr_t)&(((struct tp_vbp *)(src))->tpv_val),(caddr_t)&(dst),sizeof(type) #define ATTR(X) ev_union.EV_ ## X #endif /* defined(__STDC__) || defined(__cplusplus) */ -#endif tp_NSTATES -#endif KERNEL +#endif /* tp_NSTATES */ +#endif /* KERNEL */ -#endif __TP_PARAM__ +#endif /* __TP_PARAM__ */ diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h index e22ccf7c8d..edee5c678d 100644 --- a/sys/netiso/tp_pcb.h +++ b/sys/netiso/tp_pcb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_pcb.h 7.9 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_pcb.h,v 1.2 1993/10/16 21:05:56 rgrimes Exp $ */ /*********************************************************** @@ -76,7 +76,7 @@ SOFTWARE. #include "../netiso/tp_user.h" #ifndef sblock #include "socketvar.h" -#endif sblock +#endif /* sblock */ /* NOTE: the code depends on REF_CLOSED > REF_OPEN > the rest, and * on REF_FREE being zero @@ -285,7 +285,7 @@ struct tp_pcb { /* performance stats - see tp_stat.h */ struct tp_pmeas *tp_p_meas; struct mbuf *tp_p_mbuf; -#endif TP_PERF_MEAS +#endif /* TP_PERF_MEAS */ /* addressing */ u_short tp_domain; /* domain (INET, ISO) */ /* for compatibility with the *old* way and with INET, be sure that @@ -315,7 +315,10 @@ struct tp_pcb { }; -u_int tp_start_win; +#ifdef KERNEL +extern u_int tp_start_win; +#endif + #define ROUND(scaled_int) (((scaled_int) >> 8) + (((scaled_int) & 0x80) ? 1:0)) @@ -369,4 +372,4 @@ extern struct tp_pcb *tp_intercepts; #define tpcbtoso(tp) ((struct socket *)((tp)->tp_sock)) #define tpcbtoref(tp) ((struct tp_ref *)((tp)->tp_ref)) -#endif __TP_PCB__ +#endif /* __TP_PCB__ */ diff --git a/sys/netiso/tp_seq.h b/sys/netiso/tp_seq.h index 914ac777ef..6774ec3e9c 100644 --- a/sys/netiso/tp_seq.h +++ b/sys/netiso/tp_seq.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_seq.h 7.5 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_seq.h,v 1.2 1993/10/16 21:05:58 rgrimes Exp $ */ /*********************************************************** @@ -120,4 +120,4 @@ SOFTWARE. #define IN_SWINDOW(tpcb, seq, lwe, uwe)\ ( SEQ_GT(tpcb, seq, lwe) && SEQ_LEQ(tpcb, seq, uwe) ) -#endif __TP_SEQ__ +#endif /* __TP_SEQ__ */ diff --git a/sys/netiso/tp_stat.h b/sys/netiso/tp_stat.h index 8e524b6033..2b83869f66 100644 --- a/sys/netiso/tp_stat.h +++ b/sys/netiso/tp_stat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_stat.h 7.5 (Berkeley) 6/27/91 - * $Id$ + * $Id: tp_stat.h,v 1.2 1993/10/16 21:05:59 rgrimes Exp $ */ /*********************************************************** @@ -184,7 +184,12 @@ struct tp_stat { * ACK_USRRCV ** * ACK_FCC ** */ -} tp_stat ; +} ; + +#ifdef KERNEL +struct tp_stat tp_stat; +#endif + #define TP_PM_MAX 0xa /* 10 decimal */ #define IncStat(x) tp_stat./**/x/**/++ @@ -265,9 +270,9 @@ struct tp_pmeas { #define IFPERF(tpcb) if (tpcb->tp_perf_on && tpcb->tp_p_meas) { #define ENDPERF } -#else +#else /* not TP_PERF_MEAS */ -int PStat_Junk; +extern int PStat_Junk; #define PStat(tpcb, x) PStat_Junk #define IncPStat(tpcb, x) /* no-op */ #define tpmeas(a,b,c,d,e,f) 0 @@ -275,6 +280,6 @@ int PStat_Junk; #define IFPERF(x) if (0) { #define ENDPERF } -#endif TP_PERF_MEAS +#endif /* TP_PERF_MEAS */ -#endif __TP_STAT__ +#endif /* __TP_STAT__ */ diff --git a/sys/netiso/tp_states.h b/sys/netiso/tp_states.h index 388b9ad79b..7731645032 100644 --- a/sys/netiso/tp_states.h +++ b/sys/netiso/tp_states.h @@ -1,8 +1,11 @@ /* * from: unknown - * $Id$ + * $Id: tp_states.h,v 1.2 1993/10/16 21:06:01 rgrimes Exp $ */ +#ifndef _NETISO_TP_STATES_H_ +#define _NETISO_TP_STATES_H_ 1 + #define ST_ERROR 0x0 #define TP_CLOSED 0x1 #define TP_CRSENT 0x2 @@ -14,3 +17,4 @@ #define TP_CONFIRMING 0x8 #define tp_NSTATES 0x9 +#endif /* _NETISO_TP_STATES_H_ */ diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c index 38ad30a907..b3a99e6c42 100644 --- a/sys/netiso/tp_subr.c +++ b/sys/netiso/tp_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_subr.c 7.9 (Berkeley) 6/27/91 - * $Id$ + * $Id: tp_subr.c,v 1.3 1993/10/16 21:06:03 rgrimes Exp $ */ /*********************************************************** @@ -94,6 +94,20 @@ SOFTWARE. #include "tp_trace.h" #include "tp_meas.h" #include "tp_seq.h" +#include "tp_clnp.h" + +struct isopcb tp_isopcb; +struct inpcb tp_inpcb; +u_int tp_start_win; +struct tp_stat tp_stat; +#ifndef TP_PERF_MEAS +int PStat_Junk; +#endif +#ifdef TPPT +int tp_Tracen = 0; +#endif + + int tp_emit(); static void tp_sbdrop(); diff --git a/sys/netiso/tp_timer.h b/sys/netiso/tp_timer.h index bb34cd828f..44b0a883a5 100644 --- a/sys/netiso/tp_timer.h +++ b/sys/netiso/tp_timer.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_timer.h 7.4 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_timer.h,v 1.2 1993/10/16 21:06:08 rgrimes Exp $ */ /*********************************************************** @@ -88,4 +88,4 @@ struct Ecallout { struct Ecallout *c_next; }; -#endif __TP_CALLOUT__ +#endif /* __TP_CALLOUT__ */ diff --git a/sys/netiso/tp_tpdu.h b/sys/netiso/tp_tpdu.h index 623f492e1b..7471f3b0e3 100644 --- a/sys/netiso/tp_tpdu.h +++ b/sys/netiso/tp_tpdu.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_tpdu.h 7.4 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_tpdu.h,v 1.2 1993/10/16 21:06:09 rgrimes Exp $ */ /*********************************************************** @@ -71,21 +71,7 @@ SOFTWARE. #ifndef __TP_TPDU__ #define __TP_TPDU__ -#ifndef BYTE_ORDER -/* - * Definitions for byte order, - * according to byte significance from low address to high. - */ -#define LITTLE_ENDIAN 1234 /* least-significant byte first (vax) */ -#define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long (pdp) */ - -#ifdef vax -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN /* mc68000, tahoe, most others */ -#endif -#endif BYTE_ORDER +#include /* This much of a tpdu is the same for all types of tpdus (except * DT tpdus in class 0; their exceptions are handled by the data @@ -130,12 +116,12 @@ struct tp0du { * This is used when the extended format seqence numbers are * being sent and received. */ - /* - * the seqeot field is an int that overlays the seq - * and eot fields, this allows the htonl operation - * to be applied to the entire 32 bit quantity, and - * simplifies the structure definitions. - */ + /* + * the seqeot field is an int that overlays the seq + * and eot fields, this allows the htonl operation + * to be applied to the entire 32 bit quantity, and + * simplifies the structure definitions. + */ union seq_type { struct { #if BYTE_ORDER == BIG_ENDIAN @@ -160,14 +146,14 @@ union tpdu_fixed_rest { struct { u_short _tpdufr_sref, /* source reference */ #if BYTE_ORDER == BIG_ENDIAN - _tpdufr_class: 4, /* class [ ISO 8073 13.3.3.e ] */ - _tpdufr_opt: 4, /* options [ ISO 8073 13.3.3.e ] */ + _tpdufr_class: 4, /* class [ ISO 8073 13.3.3.e ] */ + _tpdufr_opt: 4, /* options [ ISO 8073 13.3.3.e ] */ #endif #if BYTE_ORDER == LITTLE_ENDIAN - _tpdufr_opt: 4, /* options [ ISO 8073 13.3.3.e ] */ - _tpdufr_class: 4, /* class [ ISO 8073 13.3.3.e ] */ + _tpdufr_opt: 4, /* options [ ISO 8073 13.3.3.e ] */ + _tpdufr_class: 4, /* class [ ISO 8073 13.3.3.e ] */ #endif - _tpdufr_xx: 8; /* unused */ + _tpdufr_xx: 8; /* unused */ } CRCC; #define tpdu_CRli _tpduf._tpduf_li @@ -215,21 +201,21 @@ union tpdu_fixed_rest { struct { #if BYTE_ORDER == BIG_ENDIAN unsigned char _tpdufr_eot:1, /* end-of-tsdu */ - _tpdufr_seq:7; /* 7 bit sequence number */ + _tpdufr_seq:7; /* 7 bit sequence number */ #endif #if BYTE_ORDER == LITTLE_ENDIAN unsigned char _tpdufr_seq:7, /* 7 bit sequence number */ - _tpdufr_eot:1; /* end-of-tsdu */ + _tpdufr_eot:1; /* end-of-tsdu */ #endif }SEQEOT; struct { #if BYTE_ORDER == BIG_ENDIAN unsigned int _tpdufr_Xeot:1, /* end-of-tsdu */ - _tpdufr_Xseq:31; /* 31 bit sequence number */ + _tpdufr_Xseq:31; /* 31 bit sequence number */ #endif #if BYTE_ORDER == LITTLE_ENDIAN unsigned int _tpdufr_Xseq:31, /* 31 bit sequence number */ - _tpdufr_Xeot:1; /* end-of-tsdu */ + _tpdufr_Xeot:1; /* end-of-tsdu */ #endif }SEQEOT31; unsigned int _tpdufr_Xseqeot; @@ -254,11 +240,11 @@ union tpdu_fixed_rest { struct { #if BYTE_ORDER == BIG_ENDIAN unsigned _tpdufr_yrseq0:1, /* always zero */ - _tpdufr_yrseq:31; /* [ ISO 8073 13.9.3.d ] */ + _tpdufr_yrseq:31; /* [ ISO 8073 13.9.3.d ] */ #endif #if BYTE_ORDER == LITTLE_ENDIAN unsigned _tpdufr_yrseq:31, /* [ ISO 8073 13.9.3.d ] */ - _tpdufr_yrseq0:1; /* always zero */ + _tpdufr_yrseq0:1; /* always zero */ #endif unsigned short _tpdufr_cdt; /* [ ISO 8073 13.9.3.b ] */ } AK31; @@ -292,4 +278,4 @@ struct tpdu { union tpdu_fixed_rest _tpdufr; }; -#endif __TP_TPDU__ +#endif /* __TP_TPDU__ */ diff --git a/sys/netiso/tp_trace.h b/sys/netiso/tp_trace.h index 1f90a091b2..925e1600f5 100644 --- a/sys/netiso/tp_trace.h +++ b/sys/netiso/tp_trace.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_trace.h 7.5 (Berkeley) 6/27/91 - * $Id$ + * $Id: tp_trace.h,v 1.2 1993/10/16 21:06:12 rgrimes Exp $ */ /*********************************************************** @@ -147,7 +147,7 @@ struct tp_Trace { #define tpt_window tpt_stuff.tpt_Time.tptv_window #define tpt_size tpt_stuff.tpt_Time.tptv_size -#endif defined(TP_TRACEFILE)||!defined(KERNEL) +#endif /* defined(TP_TRACEFILE)||!defined(KERNEL) */ #ifdef TPPT @@ -165,7 +165,7 @@ struct tp_Trace { extern void tpTrace(); extern struct tp_Trace tp_Trace[]; extern u_char tp_traceflags[]; -int tp_Tracen = 0; +extern int tp_Tracen; #define IFTRACE(ascii)\ if(tp_traceflags[ascii]) { @@ -176,7 +176,7 @@ int tp_Tracen = 0; #define ENDTRACE } -#else TPPT +#else /* TPPT */ /*********************************************** * NO TPPT TRACE STUFF @@ -189,8 +189,5 @@ int tp_Tracen = 0; #define IFTRACE(ascii) if (0) { #define ENDTRACE } -#endif TPPT - - - -#endif __TP_TRACE__ +#endif /* TPPT */ +#endif /* __TP_TRACE__ */ diff --git a/sys/netiso/tp_user.h b/sys/netiso/tp_user.h index 0653773f9c..7751554eb0 100644 --- a/sys/netiso/tp_user.h +++ b/sys/netiso/tp_user.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)tp_user.h 7.10 (Berkeley) 5/6/91 - * $Id$ + * $Id: tp_user.h,v 1.2 1993/10/16 21:06:13 rgrimes Exp $ */ /*********************************************************** @@ -67,17 +67,11 @@ SOFTWARE. * These are the values a real-live user ;-) needs. */ -#ifndef _TYPES_ -#ifdef KERNEL -#include "../sys/types.h" -#else KERNEL -#include -#endif KERNEL -#endif - #ifndef __TP_USER__ #define __TP_USER__ +#include + struct tp_conn_param { /* PER CONNECTION parameters */ short p_Nretrans; @@ -168,4 +162,4 @@ struct tp_disc_reason { */ -#endif __TP_USER__ +#endif /* __TP_USER__ */ diff --git a/sys/netns/idp.h b/sys/netns/idp.h index 6b451e5771..011e48be19 100644 --- a/sys/netns/idp.h +++ b/sys/netns/idp.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)idp.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: idp.h,v 1.2 1993/10/16 19:54:08 rgrimes Exp $ */ +#ifndef _NETNS_IDP_H_ +#define _NETNS_IDP_H_ 1 + /* * Definitions for NS(tm) Internet Datagram Protocol */ @@ -45,3 +48,4 @@ struct idp { struct ns_addr idp_dna; /* Destination Network Address */ struct ns_addr idp_sna; /* Source Network Address */ }; +#endif /* _NETNS_IDP_H_ */ diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c index 9fb831a8ae..de278a145c 100644 --- a/sys/netns/idp_usrreq.c +++ b/sys/netns/idp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)idp_usrreq.c 7.11 (Berkeley) 6/27/91 - * $Id$ + * $Id: idp_usrreq.c,v 1.2 1993/10/16 19:54:11 rgrimes Exp $ */ #include "param.h" @@ -57,6 +57,7 @@ * IDP protocol implementation. */ +struct idpstat idpstat; struct sockaddr_ns idp_ns = { sizeof(idp_ns), AF_NS }; /* diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h index e382b905b7..478fa126f8 100644 --- a/sys/netns/idp_var.h +++ b/sys/netns/idp_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)idp_var.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: idp_var.h,v 1.2 1993/10/16 19:54:12 rgrimes Exp $ */ +#ifndef _NETNS_IDP_VAR_H_ +#define _NETNS_IDP_VAR_H_ 1 + /* * IDP Kernel Structures and Variables */ @@ -46,5 +49,6 @@ struct idpstat { }; #ifdef KERNEL -struct idpstat idpstat; +extern struct idpstat idpstat; #endif +#endif /* _NETNS_IDP_VAR_H_ */ diff --git a/sys/netns/ns.c b/sys/netns/ns.c index 914b002ebc..5b78fc812c 100644 --- a/sys/netns/ns.c +++ b/sys/netns/ns.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ns.c 7.8 (Berkeley) 6/27/91 - * $Id$ + * $Id: ns.c,v 1.2 1993/10/16 19:54:14 rgrimes Exp $ */ #include "param.h" @@ -45,7 +45,6 @@ #include "../net/if.h" #include "../net/route.h" -#include "../net/af.h" #include "ns.h" #include "ns_if.h" @@ -53,8 +52,15 @@ #ifdef NS struct ns_ifaddr *ns_ifaddr; +struct ifqueue nsintrq; + int ns_interfaces; extern struct sockaddr_ns ns_netmask, ns_hostmask; +union ns_host ns_thishost; +union ns_host ns_zerohost; +union ns_host ns_braodhost; +union ns_net ns_zeronet; +union ns_net ns_broadnet; /* * Generic internet control operations (ioctl's). diff --git a/sys/netns/ns.h b/sys/netns/ns.h index 97b5a2059d..df7ac110d6 100644 --- a/sys/netns/ns.h +++ b/sys/netns/ns.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)ns.h 7.8 (Berkeley) 2/22/91 - * $Id$ + * $Id: ns.h,v 1.2 1993/10/16 19:54:16 rgrimes Exp $ */ +#ifndef _NETNS_NS_H_ +#define _NETNS_NS_H_ 1 + /* * Constants and Structures defined by the Xerox Network Software * per "Internet Transport Protocols", XSIS 028112, December 1981 @@ -134,11 +137,11 @@ struct sockaddr_ns { #ifdef KERNEL extern struct domain nsdomain; -union ns_host ns_thishost; -union ns_host ns_zerohost; -union ns_host ns_broadhost; -union ns_net ns_zeronet; -union ns_net ns_broadnet; +extern union ns_host ns_thishost; +extern union ns_host ns_zerohost; +extern union ns_host ns_broadhost; +extern union ns_net ns_zeronet; +extern union ns_net ns_broadnet; u_short ns_cksum(); #else @@ -149,4 +152,5 @@ extern struct ns_addr ns_addr __P((const char *)); extern char *ns_ntoa __P((struct ns_addr)); __END_DECLS -#endif +#endif /* not KERNEL */ +#endif /* _NETNS_NS_H_ */ diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c index 0a0a7abf0c..fba0600008 100644 --- a/sys/netns/ns_error.c +++ b/sys/netns/ns_error.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ns_error.c 7.8 (Berkeley) 6/28/90 - * $Id$ + * $Id: ns_error.c,v 1.3 1993/10/16 19:55:12 rgrimes Exp $ */ #include "param.h" @@ -54,6 +54,8 @@ #define NS_ERRPRINTFS 1 #endif +struct ns_errstat ns_errstat; + #ifdef NS_ERRPRINTFS /* * NS_ERR routines: error generation, receive packet processing, and diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h index 8a68adb9a4..a811600bfb 100644 --- a/sys/netns/ns_error.h +++ b/sys/netns/ns_error.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)ns_error.h 7.5 (Berkeley) 6/28/90 - * $Id$ + * $Id: ns_error.h,v 1.2 1993/10/16 19:54:20 rgrimes Exp $ */ +#ifndef _NETNS_NS_ERROR_H_ +#define _NETNS_NS_ERROR_H_ 1 + /* * Xerox NS error messages */ @@ -87,5 +90,6 @@ struct ns_errstat { }; #ifdef KERNEL -struct ns_errstat ns_errstat; +extern struct ns_errstat ns_errstat; #endif +#endif /* _NETNS_NS_ERROR_H_ */ diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h index 0d2da9743e..2606f45b8e 100644 --- a/sys/netns/ns_if.h +++ b/sys/netns/ns_if.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)ns_if.h 7.6 (Berkeley) 6/28/90 - * $Id$ + * $Id: ns_if.h,v 1.2 1993/10/16 19:54:22 rgrimes Exp $ */ +#ifndef _NETNS_NS_IF_H_ +#define _NETNS_NS_IF_H_ 1 + /* * Interface address, xerox version. One of these structures * is allocated for each interface with an internet address. @@ -79,7 +82,8 @@ struct nsip_req { #endif #ifdef KERNEL -struct ns_ifaddr *ns_ifaddr; +extern struct ns_ifaddr *ns_ifaddr; struct ns_ifaddr *ns_iaonnetof(); -struct ifqueue nsintrq; /* XNS input packet queue */ +extern struct ifqueue nsintrq; /* XNS input packet queue */ #endif +#endif /* _NETNS_NS_IF_H_ */ diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c index d250f7fd6d..ada26fd723 100644 --- a/sys/netns/ns_pcb.c +++ b/sys/netns/ns_pcb.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ns_pcb.c 7.11 (Berkeley) 6/27/91 - * $Id$ + * $Id: ns_pcb.c,v 1.2 1993/10/16 19:54:28 rgrimes Exp $ */ #include "param.h" @@ -50,6 +50,8 @@ #include "ns_pcb.h" struct ns_addr zerons_addr; +struct nspcb nspcb; + ns_pcballoc(so, head) struct socket *so; diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h index 674c716af6..1447d6ec07 100644 --- a/sys/netns/ns_pcb.h +++ b/sys/netns/ns_pcb.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)ns_pcb.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: ns_pcb.h,v 1.2 1993/10/16 19:54:30 rgrimes Exp $ */ +#ifndef _NETNS_NS_PCB_H_ +#define _NETNS_NS_PCB_H_ 1 + /* * Ns protocol interface control block. */ @@ -76,6 +79,7 @@ struct nspcb { #ifdef KERNEL -struct nspcb nspcb; /* head of list */ +extern struct nspcb nspcb; /* head of list */ struct nspcb *ns_pcblookup(); #endif +#endif /* _NETNS_NS_PCB_H_ */ diff --git a/sys/netns/sp.h b/sys/netns/sp.h index 797851f33a..3c77a67ae0 100644 --- a/sys/netns/sp.h +++ b/sys/netns/sp.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)sp.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: sp.h,v 1.2 1993/10/16 19:54:32 rgrimes Exp $ */ +#ifndef _NETNS_SP_H_ +#define _NETNS_SP_H_ 1 + /* * Definitions for Xerox NS style sequenced packet protocol */ @@ -51,3 +54,4 @@ struct sphdr { u_short sp_ack; /* acknowledge number */ u_short sp_alo; /* allocation number */ }; +#endif /* _NETNS_SP_H_ */ diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h index 3c53f5a0eb..81af569ded 100644 --- a/sys/netns/spidp.h +++ b/sys/netns/spidp.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)spidp.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: spidp.h,v 1.2 1993/10/16 19:54:34 rgrimes Exp $ */ +#ifndef _NETNS_SPIDP_H_ +#define _NETNS_SPIDP_H_ 1 + /* * Definitions for NS(tm) Internet Datagram Protocol * containing a Sequenced Packet Protocol packet. @@ -61,3 +64,4 @@ struct spidp_q { #define si_seq si_s.sp_seq #define si_ack si_s.sp_ack #define si_alo si_s.sp_alo +#endif /* _NETNS_SPIDP_H_ */ diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c index 3bbc72aca1..572915bc7a 100644 --- a/sys/netns/spp_debug.c +++ b/sys/netns/spp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)spp_debug.c 7.7 (Berkeley) 6/28/90 - * $Id$ + * $Id: spp_debug.c,v 1.2 1993/10/16 19:54:35 rgrimes Exp $ */ #include "param.h" @@ -58,6 +58,9 @@ #define SANAMES #include "spp_debug.h" +struct spp_debug spp_debug[SPP_NDEBUG]; +int spp_debx; + int sppconsdebug = 0; /* * spp debug routines diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h index e52f1a1316..8d9008a405 100644 --- a/sys/netns/spp_debug.h +++ b/sys/netns/spp_debug.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)spp_debug.h 7.4 (Berkeley) 6/28/90 - * $Id$ + * $Id: spp_debug.h,v 1.2 1993/10/16 19:54:36 rgrimes Exp $ */ +#ifndef _NETNS_SPP_DEBUG_H_ +#define _NETNS_SPP_DEBUG_H_ 1 + struct spp_debug { u_long sd_time; short sd_act; @@ -56,5 +59,6 @@ char *sanames[] = #endif #define SPP_NDEBUG 100 -struct spp_debug spp_debug[SPP_NDEBUG]; -int spp_debx; +extern struct spp_debug spp_debug[SPP_NDEBUG]; +extern int spp_debx; +#endif /* _NETNS_SPP_DEBUG_H_ */ diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h index c7f8a4b9e9..be61887d74 100644 --- a/sys/netns/spp_timer.h +++ b/sys/netns/spp_timer.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)spp_timer.h 7.3 (Berkeley) 6/28/90 - * $Id$ + * $Id: spp_timer.h,v 1.2 1993/10/16 19:54:37 rgrimes Exp $ */ +#ifndef _NETNS_SPP_TIMER_H_ +#define _NETNS_SPP_TIMER_H_ 1 + /* * Definitions of the SPP timers. These timers are counted * down PR_SLOWHZ times a second. @@ -121,3 +124,4 @@ char *spptimers[] = #ifdef KERNEL extern int spp_backoff[]; #endif +#endif /* _NETNS_SPP_TIMER_H_ */ diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c index 13e7f72832..7f9d3c68ff 100644 --- a/sys/netns/spp_usrreq.c +++ b/sys/netns/spp_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)spp_usrreq.c 7.15 (Berkeley) 6/27/91 - * $Id$ + * $Id: spp_usrreq.c,v 1.2 1993/10/16 19:54:39 rgrimes Exp $ */ #include "param.h" @@ -58,6 +58,9 @@ #include "spp_var.h" #include "spp_debug.h" +struct spp_istat spp_istat; +u_short spp_iss; + /* * SP protocol implementation. */ diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h index e7bc92e976..2bffd626c4 100644 --- a/sys/netns/spp_var.h +++ b/sys/netns/spp_var.h @@ -31,9 +31,12 @@ * SUCH DAMAGE. * * from: @(#)spp_var.h 7.7 (Berkeley) 6/28/90 - * $Id$ + * $Id: spp_var.h,v 1.2 1993/10/16 19:54:41 rgrimes Exp $ */ +#ifndef _NETNS_SPP_VAR_H_ +#define _NETNS_SPP_VAR_H_ 1 + /* * Sp control block, one per connection */ @@ -184,17 +187,17 @@ struct spp_istat { }; #ifdef KERNEL -struct spp_istat spp_istat; +extern struct spp_istat spp_istat; /* Following was struct sppstat sppstat; */ #ifndef sppstat #define sppstat spp_istat.newstats #endif -u_short spp_iss; -extern struct sppcb *spp_close(), *spp_disconnect(), - *spp_usrclosed(), *spp_timers(), *spp_drop(); -#endif +extern u_short spp_iss; +extern struct sppcb *spp_close(), *spp_disconnect(); +extern struct sppcb *spp_usrclosed(), *spp_timers(), *spp_drop(); +#endif /* KERNEL */ #define SPP_ISSINCR 128 /* @@ -202,15 +205,8 @@ extern struct sppcb *spp_close(), *spp_disconnect(), * on with modular arithmetic. These macros can be * used to compare such integers. */ -#ifdef sun -short xnsCbug; -#define SSEQ_LT(a,b) ((xnsCbug = (short)((a)-(b))) < 0) -#define SSEQ_LEQ(a,b) ((xnsCbug = (short)((a)-(b))) <= 0) -#define SSEQ_GT(a,b) ((xnsCbug = (short)((a)-(b))) > 0) -#define SSEQ_GEQ(a,b) ((xnsCbug = (short)((a)-(b))) >= 0) -#else #define SSEQ_LT(a,b) (((short)((a)-(b))) < 0) #define SSEQ_LEQ(a,b) (((short)((a)-(b))) <= 0) #define SSEQ_GT(a,b) (((short)((a)-(b))) > 0) #define SSEQ_GEQ(a,b) (((short)((a)-(b))) >= 0) -#endif +#endif /* _NETNS_SPP_VAR_H_ */ -- 2.20.1