diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netccitt/hd_input.c | 8 | ||||
| -rw-r--r-- | sys/netccitt/hd_var.h | 14 | ||||
| -rw-r--r-- | sys/netccitt/if_x25subr.c | 6 | ||||
| -rw-r--r-- | sys/netccitt/pk_var.h | 7 | ||||
| -rw-r--r-- | sys/netiso/argo_debug.h | 4 | ||||
| -rw-r--r-- | sys/netiso/clnp_input.c | 5 | ||||
| -rw-r--r-- | sys/netiso/clnp_stat.h | 10 | ||||
| -rw-r--r-- | sys/netiso/cltp_usrreq.c | 8 | ||||
| -rw-r--r-- | sys/netiso/cltp_var.h | 6 | ||||
| -rw-r--r-- | sys/netiso/esis.c | 7 | ||||
| -rw-r--r-- | sys/netiso/esis.h | 7 | ||||
| -rw-r--r-- | sys/netiso/iso_pcb.c | 7 | ||||
| -rw-r--r-- | sys/netiso/iso_snpac.c | 8 | ||||
| -rw-r--r-- | sys/netiso/iso_var.h | 7 | ||||
| -rw-r--r-- | sys/netiso/tp_clnp.h | 6 | ||||
| -rw-r--r-- | sys/netiso/tp_ip.h | 4 | ||||
| -rw-r--r-- | sys/netiso/tp_pcb.c | 6 | ||||
| -rw-r--r-- | sys/netiso/tp_pcb.h | 4 | ||||
| -rw-r--r-- | sys/netiso/tp_stat.h | 13 |
19 files changed, 81 insertions, 56 deletions
diff --git a/sys/netccitt/hd_input.c b/sys/netccitt/hd_input.c index b259c5fa2e2..a30d2f953e1 100644 --- a/sys/netccitt/hd_input.c +++ b/sys/netccitt/hd_input.c @@ -1,4 +1,4 @@ -/* $NetBSD: hd_input.c,v 1.17 2001/11/13 00:12:57 lukem Exp $ */ +/* $NetBSD: hd_input.c,v 1.18 2002/05/12 21:30:35 matt Exp $ */ /* * Copyright (c) 1984 University of British Columbia. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd_input.c,v 1.17 2001/11/13 00:12:57 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd_input.c,v 1.18 2002/05/12 21:30:35 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,6 +60,10 @@ __KERNEL_RCSID(0, "$NetBSD: hd_input.c,v 1.17 2001/11/13 00:12:57 lukem Exp $"); #include <netccitt/x25.h> #include <netccitt/pk_extern.h> +struct hdcb *hdcbhead; /* head of linked list of hdcb's */ +struct Frmr_frame hd_frmr; /* rejected frame diagnostic info */ +struct ifqueue hdintrq; /* hdlc packet input queue */ + static void frame_reject __P((struct hdcb *, int, struct Hdlc_iframe *)); static void rej_routine __P((struct hdcb *, int)); static void free_iframes __P((struct hdcb *, int *, int)); diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h index 03baa5e6d8a..5a0fe4cf3ab 100644 --- a/sys/netccitt/hd_var.h +++ b/sys/netccitt/hd_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: hd_var.h,v 1.9 1998/09/13 16:21:17 christos Exp $ */ +/* $NetBSD: hd_var.h,v 1.10 2002/05/12 21:30:35 matt Exp $ */ /* * Copyright (c) 1984 University of British Columbia. @@ -100,16 +100,16 @@ struct hdcb { }; #ifdef _KERNEL -struct hdcb *hdcbhead; /* head of linked list of hdcb's */ -struct Frmr_frame hd_frmr; /* rejected frame diagnostic info */ -struct ifqueue hdintrq; /* hdlc packet input queue */ +extern struct hdcb *hdcbhead; /* head of linked list of hdcb's */ +extern struct Frmr_frame hd_frmr; /* rejected frame diagnostic info */ +extern struct ifqueue hdintrq; /* hdlc packet input queue */ struct Hdlc_frame; struct Hdlc_iframe; struct Hdlc_sframe; -int hd_t1; /* timer T1 value */ -int hd_t3; /* RR send timer */ -int hd_n2; /* frame retransmission limit */ +extern int hd_t1; /* timer T1 value */ +extern int hd_t3; /* RR send timer */ +extern int hd_n2; /* frame retransmission limit */ /* hd_debug.c */ diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c index c5ac93d0869..9b56343524b 100644 --- a/sys/netccitt/if_x25subr.c +++ b/sys/netccitt/if_x25subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_x25subr.c,v 1.27 2001/11/13 00:12:57 lukem Exp $ */ +/* $NetBSD: if_x25subr.c,v 1.28 2002/05/12 21:30:35 matt Exp $ */ /* * Copyright (c) 1990, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_x25subr.c,v 1.27 2001/11/13 00:12:57 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_x25subr.c,v 1.28 2002/05/12 21:30:35 matt Exp $"); #include "opt_inet.h" #include "opt_iso.h" @@ -700,11 +700,11 @@ x25_dg_rtinit(dst, ia, af) int x25_startproto = 1; +struct pklcdhead pk_listenhead; void pk_init() { - TAILQ_INIT(&pk_listenhead); if (x25_startproto) { pk_protolisten(0xcc, 1, x25_dgram_incoming); diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h index 859cc453f9a..3068aff9765 100644 --- a/sys/netccitt/pk_var.h +++ b/sys/netccitt/pk_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: pk_var.h,v 1.14 2001/06/19 07:37:16 jdolecek Exp $ */ +/* $NetBSD: pk_var.h,v 1.15 2002/05/12 21:30:35 matt Exp $ */ /* * Copyright (c) 1985 Computing Centre, University of British Columbia. @@ -235,8 +235,9 @@ struct mbuf_cache { #include <sys/queue.h> extern struct pkcb_q pkcb_q; -TAILQ_HEAD(, pklcd) pk_listenhead; +TAILQ_HEAD(pklcdhead, pklcd); +extern struct pklcdhead pk_listenhead; extern char *pk_name[], *pk_state[]; -int pk_t20, pk_t21, pk_t22, pk_t23; +extern int pk_t20, pk_t21, pk_t22, pk_t23; #endif diff --git a/sys/netiso/argo_debug.h b/sys/netiso/argo_debug.h index 9d020b37a20..79cb84b16dd 100644 --- a/sys/netiso/argo_debug.h +++ b/sys/netiso/argo_debug.h @@ -1,4 +1,4 @@ -/* $NetBSD: argo_debug.h,v 1.10 1997/09/08 02:06:31 mikel Exp $ */ +/* $NetBSD: argo_debug.h,v 1.11 2002/05/12 21:30:35 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -86,7 +86,7 @@ void Dump_buf __P((caddr_t, int)); #endif */ -unsigned char argo_debug[128]; +extern unsigned char argo_debug[128]; #endif /* ARGO_DEBUG */ diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c index d48a248da0b..4e45568fc2b 100644 --- a/sys/netiso/clnp_input.c +++ b/sys/netiso/clnp_input.c @@ -1,4 +1,4 @@ -/* $NetBSD: clnp_input.c,v 1.24 2001/11/13 01:10:47 lukem Exp $ */ +/* $NetBSD: clnp_input.c,v 1.25 2002/05/12 21:30:35 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -63,7 +63,7 @@ SOFTWARE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clnp_input.c,v 1.24 2001/11/13 01:10:47 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clnp_input.c,v 1.25 2002/05/12 21:30:35 matt Exp $"); #include "opt_iso.h" @@ -110,6 +110,7 @@ void x25esis_input(); #endif /* ISO_X25ESIS */ struct iso_ifaddrhead iso_ifaddr = TAILQ_HEAD_INITIALIZER(iso_ifaddr); struct ifqueue clnlintrq; +struct clnp_stat clnp_stat; /* * FUNCTION: clnp_init diff --git a/sys/netiso/clnp_stat.h b/sys/netiso/clnp_stat.h index 6a74dd6773a..4abcdb6dd39 100644 --- a/sys/netiso/clnp_stat.h +++ b/sys/netiso/clnp_stat.h @@ -1,4 +1,4 @@ -/* $NetBSD: clnp_stat.h,v 1.6 1996/02/13 22:08:46 christos Exp $ */ +/* $NetBSD: clnp_stat.h,v 1.7 2002/05/12 21:30:36 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -95,11 +95,15 @@ struct clnp_stat { * received */ int cns_er_inhist[CLNP_ERRORS + 1]; int cns_er_outhist[CLNP_ERRORS + 1]; -} clnp_stat; +}; + +#ifdef _KERNEL +extern struct clnp_stat clnp_stat; #ifdef INCSTAT #undef INCSTAT #endif /* INCSTAT */ -#define INCSTAT(x) clnp_stat./**/x/**/++ +#define INCSTAT(x) clnp_stat.x++ +#endif /* _KERNEL */ #endif /* _NETISO_CLNP_STAT_H_ */ diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c index 5df07f7efd0..45449e29826 100644 --- a/sys/netiso/cltp_usrreq.c +++ b/sys/netiso/cltp_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: cltp_usrreq.c,v 1.18 2001/11/13 01:10:48 lukem Exp $ */ +/* $NetBSD: cltp_usrreq.c,v 1.19 2002/05/12 21:30:36 matt Exp $ */ /* * Copyright (c) 1989, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cltp_usrreq.c,v 1.18 2001/11/13 01:10:48 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cltp_usrreq.c,v 1.19 2002/05/12 21:30:36 matt Exp $"); #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */ #include <sys/param.h> @@ -76,7 +76,9 @@ cltp_init() cltb.isop_next = cltb.isop_prev = &cltb; } -int cltp_cksum = 1; +int cltp_cksum = 1; +struct isopcb cltb; +struct cltpstat cltpstat; /* ARGUSED */ diff --git a/sys/netiso/cltp_var.h b/sys/netiso/cltp_var.h index 480c86254f8..275a7860062 100644 --- a/sys/netiso/cltp_var.h +++ b/sys/netiso/cltp_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: cltp_var.h,v 1.8 1996/05/22 13:55:48 mycroft Exp $ */ +/* $NetBSD: cltp_var.h,v 1.9 2002/05/12 21:30:36 matt Exp $ */ /* * Copyright (c) 1989, 1993 @@ -51,8 +51,8 @@ struct cltpstat { }; #ifdef _KERNEL -struct isopcb cltb; -struct cltpstat cltpstat; +extern struct isopcb cltb; +extern struct cltpstat cltpstat; /* cltp_usrreq.c */ void cltp_init __P((void)); diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c index d1989eed331..645a82f239b 100644 --- a/sys/netiso/esis.c +++ b/sys/netiso/esis.c @@ -1,4 +1,4 @@ -/* $NetBSD: esis.c,v 1.26 2001/11/13 01:10:48 lukem Exp $ */ +/* $NetBSD: esis.c,v 1.27 2002/05/12 21:30:36 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -63,7 +63,7 @@ SOFTWARE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esis.c,v 1.26 2001/11/13 01:10:48 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esis.c,v 1.27 2002/05/12 21:30:36 matt Exp $"); #include "opt_iso.h" #ifdef ISO @@ -106,14 +106,13 @@ __KERNEL_RCSID(0, "$NetBSD: esis.c,v 1.26 2001/11/13 01:10:48 lukem Exp $"); * */ LIST_HEAD(, rawcb) esis_pcb; +struct esis_stat esis_stat; int esis_sendspace = 2048; int esis_recvspace = 2048; short esis_holding_time = ESIS_HT; short esis_config_time = ESIS_CONFIG; short esis_esconfig_time = ESIS_CONFIG; -extern int iso_systype; struct sockaddr_dl esis_dl = {sizeof(esis_dl), AF_LINK}; -extern char all_es_snpa[], all_is_snpa[]; struct callout esis_config_ch; diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h index 61d729b29b7..86f71b315a6 100644 --- a/sys/netiso/esis.h +++ b/sys/netiso/esis.h @@ -1,4 +1,4 @@ -/* $NetBSD: esis.h,v 1.11 1997/11/03 15:01:19 is Exp $ */ +/* $NetBSD: esis.h,v 1.12 2002/05/12 21:30:36 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -117,7 +117,10 @@ struct esis_stat { }; #ifdef _KERNEL -struct esis_stat esis_stat; +extern struct esis_stat esis_stat; +extern short esis_holding_time; +extern short esis_config_time; +extern short esis_esconfig_time; struct socket; struct mbuf; struct snpa_hdr; diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c index 1bb5896af73..50536a0b227 100644 --- a/sys/netiso/iso_pcb.c +++ b/sys/netiso/iso_pcb.c @@ -1,4 +1,4 @@ -/* $NetBSD: iso_pcb.c,v 1.21 2001/11/13 01:10:49 lukem Exp $ */ +/* $NetBSD: iso_pcb.c,v 1.22 2002/05/12 21:30:36 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -66,7 +66,7 @@ SOFTWARE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iso_pcb.c,v 1.21 2001/11/13 01:10:49 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iso_pcb.c,v 1.22 2002/05/12 21:30:36 matt Exp $"); #include "opt_iso.h" @@ -102,6 +102,9 @@ struct iso_addr zeroiso_addr = { 0 }; +#ifdef ARGO_DEBUG +unsigned char argo_debug[128]; +#endif /* * FUNCTION: iso_pcballoc diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c index 050b57974fe..1bfc813aac5 100644 --- a/sys/netiso/iso_snpac.c +++ b/sys/netiso/iso_snpac.c @@ -1,4 +1,4 @@ -/* $NetBSD: iso_snpac.c,v 1.25 2001/11/13 01:10:49 lukem Exp $ */ +/* $NetBSD: iso_snpac.c,v 1.26 2002/05/12 21:30:36 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -63,13 +63,14 @@ SOFTWARE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iso_snpac.c,v 1.25 2001/11/13 01:10:49 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iso_snpac.c,v 1.26 2002/05/12 21:30:36 matt Exp $"); #include "opt_iso.h" #ifdef ISO #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/domain.h> #include <sys/protosw.h> @@ -97,9 +98,6 @@ __KERNEL_RCSID(0, "$NetBSD: iso_snpac.c,v 1.25 2001/11/13 01:10:49 lukem Exp $") #include <netiso/argo_debug.h> 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; -extern int hz; LIST_HEAD(, llinfo_llc) llinfo_llc; diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h index e95c8a7ba70..073930c7eed 100644 --- a/sys/netiso/iso_var.h +++ b/sys/netiso/iso_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: iso_var.h,v 1.16 2001/06/19 07:37:17 jdolecek Exp $ */ +/* $NetBSD: iso_var.h,v 1.17 2002/05/12 21:30:36 matt Exp $ */ /*- * Copyright (c) 1988, 1991, 1993 @@ -133,10 +133,13 @@ struct snpa_hdr { #ifdef _KERNEL TAILQ_HEAD(iso_ifaddrhead, iso_ifaddr); extern struct iso_ifaddrhead iso_ifaddr; /* linked list of iso address ifaces */ -extern struct ifqueue clnlintrq; /* clnl packet input queue */ +extern struct ifqueue clnlintrq; /* clnl packet input queue */ +extern int iso_systype; struct afhash; struct llinfo_llc; +extern char all_es_snpa[], all_is_snpa[]; + extern struct callout snpac_age_ch; extern struct callout esis_config_ch; diff --git a/sys/netiso/tp_clnp.h b/sys/netiso/tp_clnp.h index b9e2898f5fc..c739005862c 100644 --- a/sys/netiso/tp_clnp.h +++ b/sys/netiso/tp_clnp.h @@ -1,4 +1,4 @@ -/* $NetBSD: tp_clnp.h,v 1.6 1996/02/13 22:10:42 christos Exp $ */ +/* $NetBSD: tp_clnp.h,v 1.7 2002/05/12 21:30:36 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -83,7 +83,9 @@ SOFTWARE. #endif #include <netiso/iso_var.h> -struct isopcb tp_isopcb; +#ifdef _KERNEL +extern struct isopcb tp_isopcb; +#endif /* queue of active inpcbs for tp ; for tp with dod ip */ #endif /* _NETISO_TP_CLNP_H_ */ diff --git a/sys/netiso/tp_ip.h b/sys/netiso/tp_ip.h index 83be949f5bc..2de3e60263e 100644 --- a/sys/netiso/tp_ip.h +++ b/sys/netiso/tp_ip.h @@ -1,4 +1,4 @@ -/* $NetBSD: tp_ip.h,v 1.7 1996/02/13 22:11:12 christos Exp $ */ +/* $NetBSD: tp_ip.h,v 1.8 2002/05/12 21:30:37 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -80,7 +80,7 @@ SOFTWARE. #include <netinet/ip_var.h> -struct inpcbtable tp_inpcb; +extern struct inpcbtable tp_inpcb; /* queue of active inpcbs for tp ; for tp with dod ip */ #endif /* _NETISO_TP_IP_H_ */ diff --git a/sys/netiso/tp_pcb.c b/sys/netiso/tp_pcb.c index b5cbca67a05..c1f6db3312e 100644 --- a/sys/netiso/tp_pcb.c +++ b/sys/netiso/tp_pcb.c @@ -1,4 +1,4 @@ -/* $NetBSD: tp_pcb.c,v 1.22 2001/11/13 01:10:50 lukem Exp $ */ +/* $NetBSD: tp_pcb.c,v 1.23 2002/05/12 21:30:37 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -72,7 +72,7 @@ SOFTWARE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tp_pcb.c,v 1.22 2001/11/13 01:10:50 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tp_pcb.c,v 1.23 2002/05/12 21:30:37 matt Exp $"); #include "opt_inet.h" #include "opt_iso.h" @@ -260,6 +260,8 @@ struct isopcb tp_isopcb; struct isopcb tp_isopcb; #endif /* TPCONS */ +struct tp_stat tp_stat; +u_int tp_start_win; struct nl_protosw nl_protosw[] = { /* ISO_CLNS */ diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h index a75c144b92e..b7efa9e0ef6 100644 --- a/sys/netiso/tp_pcb.h +++ b/sys/netiso/tp_pcb.h @@ -1,4 +1,4 @@ -/* $NetBSD: tp_pcb.h,v 1.12 2000/03/23 07:03:31 thorpej Exp $ */ +/* $NetBSD: tp_pcb.h,v 1.13 2002/05/12 21:30:37 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -333,7 +333,7 @@ struct tp_pcb { }; -u_int tp_start_win; +extern u_int tp_start_win; #define ROUND(scaled_int) (((scaled_int) >> 8) + (((scaled_int) & 0x80) ? 1:0)) diff --git a/sys/netiso/tp_stat.h b/sys/netiso/tp_stat.h index 267319897bf..d3a5c63f3e2 100644 --- a/sys/netiso/tp_stat.h +++ b/sys/netiso/tp_stat.h @@ -1,4 +1,4 @@ -/* $NetBSD: tp_stat.h,v 1.6 1996/02/13 22:11:53 christos Exp $ */ +/* $NetBSD: tp_stat.h,v 1.7 2002/05/12 21:30:37 matt Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -187,10 +187,14 @@ struct tp_stat { * ACK_DONT 0 / ACK_STRAT_EACH 0x1 / ACK_STRAT_FULLWIN 0x4 ACK_DUP * 0x8 / ACK_EOT 0x10 / ACK_REORDER 0x20 ACK_USRRCV ** ACK_FCC ** */ -} tp_stat; -#define TP_PM_MAX 0xa /* 10 decimal */ +}; +#ifdef _KERNEL +extern struct tp_stat tp_stat; #define IncStat(x) tp_stat./**/x/**/++ +#endif + +#define TP_PM_MAX 0xa /* 10 decimal */ #ifdef TP_PERF_MEAS @@ -270,8 +274,7 @@ struct tp_pmeas { #else -int PStat_Junk; -#define PStat(tpcb, x) PStat_Junk +#define PStat(tpcb, x) 0 #define IncPStat(tpcb, x) /* no-op */ #define tpmeas(a,b,c,d,e,f) 0 |
