summaryrefslogtreecommitdiff
path: root/sys/netiso
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netiso')
-rw-r--r--sys/netiso/argo_debug.h4
-rw-r--r--sys/netiso/clnl.h4
-rw-r--r--sys/netiso/clnp.h108
-rw-r--r--sys/netiso/clnp_debug.c10
-rw-r--r--sys/netiso/cltp_var.h16
-rw-r--r--sys/netiso/eonvar.h20
-rw-r--r--sys/netiso/esis.h36
-rw-r--r--sys/netiso/idrp_var.h12
-rw-r--r--sys/netiso/if_cons.c14
-rw-r--r--sys/netiso/iso.h6
-rw-r--r--sys/netiso/iso_pcb.c4
-rw-r--r--sys/netiso/iso_pcb.h16
-rw-r--r--sys/netiso/iso_snpac.c4
-rw-r--r--sys/netiso/iso_var.h74
-rw-r--r--sys/netiso/tp_cons.c4
-rw-r--r--sys/netiso/tp_driver.c6
-rw-r--r--sys/netiso/tp_emit.c4
-rw-r--r--sys/netiso/tp_inet.c4
-rw-r--r--sys/netiso/tp_input.c10
-rw-r--r--sys/netiso/tp_iso.c4
-rw-r--r--sys/netiso/tp_pcb.h47
-rw-r--r--sys/netiso/tp_subr2.c4
-rw-r--r--sys/netiso/tp_var.h218
-rw-r--r--sys/netiso/tuba_subr.c6
-rw-r--r--sys/netiso/tuba_table.h32
25 files changed, 326 insertions, 341 deletions
diff --git a/sys/netiso/argo_debug.h b/sys/netiso/argo_debug.h
index fb3ec0eb017..25b90a2d953 100644
--- a/sys/netiso/argo_debug.h
+++ b/sys/netiso/argo_debug.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: argo_debug.h,v 1.3 1997/09/07 19:43:22 millert Exp $ */
+/* $OpenBSD: argo_debug.h,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: argo_debug.h,v 1.7 1996/02/13 22:07:57 christos Exp $ */
/*-
@@ -65,7 +65,7 @@ SOFTWARE.
#ifndef _NETISO_ARGO_DEBUG_H_
#define _NETISO_ARGO_DEBUG_H_
-void Dump_buf __P((caddr_t, int));
+void Dump_buf(caddr_t, int);
#define dump_buf(a, b) Dump_buf((caddr_t)(a), (int)(b))
/***********************************************
diff --git a/sys/netiso/clnl.h b/sys/netiso/clnl.h
index ccc9f67b4fd..c6d9b08d3e1 100644
--- a/sys/netiso/clnl.h
+++ b/sys/netiso/clnl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clnl.h,v 1.2 1996/03/04 10:34:42 mickey Exp $ */
+/* $OpenBSD: clnl.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: clnl.h,v 1.6 1996/02/13 22:08:02 christos Exp $ */
/*-
@@ -64,5 +64,5 @@ SOFTWARE.
*/
struct clnl_protosw {
/* input routine */
- void (*clnl_input) __P((struct mbuf *, ...));
+ void (*clnl_input)(struct mbuf *, ...);
};
diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h
index c90f8f2c8a0..1d65e5db43f 100644
--- a/sys/netiso/clnp.h
+++ b/sys/netiso/clnp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clnp.h,v 1.2 1996/03/04 10:34:44 mickey Exp $ */
+/* $OpenBSD: clnp.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: clnp.h,v 1.10 1996/02/13 22:08:09 christos Exp $ */
/*-
@@ -470,76 +470,76 @@ struct iso_ifaddr;
struct route_iso;
/* clnp_debug.c */
-char *clnp_hexp __P((char *, int, char *));
-char *clnp_iso_addrp __P((struct iso_addr *));
-char *clnp_saddr_isop __P((struct sockaddr_iso *));
+char *clnp_hexp(char *, int, char *);
+char *clnp_iso_addrp(struct iso_addr *);
+char *clnp_saddr_isop(struct sockaddr_iso *);
/* clnp_er.c */
-void clnp_er_input __P((struct mbuf *, struct iso_addr *, u_int));
-void clnp_discard __P((struct mbuf *, u_int));
-void clnp_emit_er __P((struct mbuf *, u_int));
-int clnp_er_index __P((u_int));
-
-int clnp_fragment __P((struct ifnet *, struct mbuf *, struct sockaddr *,
- int, int, int, struct rtentry *));
-struct mbuf *clnp_reass __P((struct mbuf *, struct iso_addr *,
- struct iso_addr *, struct clnp_segment *));
-int clnp_newpkt __P((struct mbuf *, struct iso_addr *, struct iso_addr *,
- struct clnp_segment *));
-void clnp_insert_frag __P((struct clnp_fragl *, struct mbuf *,
- struct clnp_segment *));
-struct mbuf *clnp_comp_pdu __P((struct clnp_fragl *));
+void clnp_er_input(struct mbuf *, struct iso_addr *, u_int);
+void clnp_discard(struct mbuf *, u_int);
+void clnp_emit_er(struct mbuf *, u_int);
+int clnp_er_index(u_int);
+
+int clnp_fragment(struct ifnet *, struct mbuf *, struct sockaddr *,
+ int, int, int, struct rtentry *);
+struct mbuf *clnp_reass(struct mbuf *, struct iso_addr *,
+ struct iso_addr *, struct clnp_segment *);
+int clnp_newpkt(struct mbuf *, struct iso_addr *, struct iso_addr *,
+ struct clnp_segment *);
+void clnp_insert_frag(struct clnp_fragl *, struct mbuf *,
+ struct clnp_segment *);
+struct mbuf *clnp_comp_pdu(struct clnp_fragl *);
#ifdef TROLL
-float troll_random __P((void));
-int troll_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
- struct rtentry *));
+float troll_random(void);
+int troll_output(struct ifnet *, struct mbuf *, struct sockaddr *,
+ struct rtentry *);
#endif
/* clnp_input.c */
-void clnp_init __P((void));
-void clnlintr __P((void));
-void clnp_input __P((struct mbuf *, ...));
+void clnp_init(void);
+void clnlintr(void);
+void clnp_input(struct mbuf *, ...);
/* clnp_options.c */
-void clnp_update_srcrt __P((struct mbuf *, struct clnp_optidx *));
-void clnp_dooptions __P((struct mbuf *, struct clnp_optidx *, struct ifnet *,
- struct iso_addr *));
-int clnp_set_opts __P((struct mbuf **, struct mbuf **));
-int clnp_opt_sanity __P((struct mbuf *, caddr_t, int, struct clnp_optidx *));
+void clnp_update_srcrt(struct mbuf *, struct clnp_optidx *);
+void clnp_dooptions(struct mbuf *, struct clnp_optidx *, struct ifnet *,
+ struct iso_addr *);
+int clnp_set_opts(struct mbuf **, struct mbuf **);
+int clnp_opt_sanity(struct mbuf *, caddr_t, int, struct clnp_optidx *);
/* clnp_output.c */
-int clnp_output __P((struct mbuf *, ...));
-void clnp_ctloutput __P((void));
+int clnp_output(struct mbuf *, ...);
+void clnp_ctloutput(void);
/* clnp_raw.c */
-void rclnp_input __P((struct mbuf *, ...));
-int rclnp_output __P((struct mbuf *, ...));
-int rclnp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-int clnp_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *));
+void rclnp_input(struct mbuf *, ...);
+int rclnp_output(struct mbuf *, ...);
+int rclnp_ctloutput(int, struct socket *, int, int, struct mbuf **);
+int clnp_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *);
/* clnp_subr.c */
-struct mbuf *clnp_data_ck __P((struct mbuf *, int));
-caddr_t clnp_extract_addr __P((caddr_t, int, struct iso_addr *,
- struct iso_addr *));
-int clnp_ours __P((struct iso_addr *));
-void clnp_forward __P((struct mbuf *, int, struct iso_addr *,
- struct clnp_optidx *, int, struct snpa_hdr *));
-caddr_t clnp_insert_addr __P((caddr_t, struct iso_addr *, struct iso_addr *));
-int clnp_route __P((struct iso_addr *, struct route_iso *, int,
- struct sockaddr **, struct iso_ifaddr **));
-int clnp_srcroute __P((struct mbuf *, struct clnp_optidx *, struct route_iso *,
+struct mbuf *clnp_data_ck(struct mbuf *, int);
+caddr_t clnp_extract_addr(caddr_t, int, struct iso_addr *,
+ struct iso_addr *);
+int clnp_ours(struct iso_addr *);
+void clnp_forward(struct mbuf *, int, struct iso_addr *,
+ struct clnp_optidx *, int, struct snpa_hdr *);
+caddr_t clnp_insert_addr(caddr_t, struct iso_addr *, struct iso_addr *);
+int clnp_route(struct iso_addr *, struct route_iso *, int,
+ struct sockaddr **, struct iso_ifaddr **);
+int clnp_srcroute(struct mbuf *, struct clnp_optidx *, struct route_iso *,
struct sockaddr **, struct iso_ifaddr **,
- struct iso_addr *));
-int clnp_echoreply __P((struct mbuf *, int, struct sockaddr_iso *,
- struct sockaddr_iso *, struct clnp_optidx *));
-int clnp_badmtu __P((struct ifnet *, struct rtentry *, int, char *));
-void clnp_ypocb __P((caddr_t, caddr_t, u_int));
+ struct iso_addr *);
+int clnp_echoreply(struct mbuf *, int, struct sockaddr_iso *,
+ struct sockaddr_iso *, struct clnp_optidx *);
+int clnp_badmtu(struct ifnet *, struct rtentry *, int, char *);
+void clnp_ypocb(caddr_t, caddr_t, u_int);
/* clnp_timer.c */
-struct clnp_fragl *clnp_freefrags __P((struct clnp_fragl *));
-void clnp_slowtimo __P((void));
-void clnp_drain __P((void));
+struct clnp_fragl *clnp_freefrags(struct clnp_fragl *);
+void clnp_slowtimo(void);
+void clnp_drain(void);
#ifdef TROLL
struct troll trollctl;
diff --git a/sys/netiso/clnp_debug.c b/sys/netiso/clnp_debug.c
index 53493e5bf16..775e11623b5 100644
--- a/sys/netiso/clnp_debug.c
+++ b/sys/netiso/clnp_debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clnp_debug.c,v 1.2 1996/03/04 10:34:46 mickey Exp $ */
+/* $OpenBSD: clnp_debug.c,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: clnp_debug.c,v 1.6 1996/02/13 22:08:13 christos Exp $ */
/*-
@@ -101,7 +101,7 @@ struct addr_rfc986 u_bad = {
{0x00, 0x01},
{0x01, 0xc0, 0x0c, 0x0c, 0xab, 0x11}
};
-int main __P((void));
+int main(void);
#include <stdio.h>
int
@@ -140,9 +140,9 @@ main()
unsigned int clnp_debug;
static char letters[] = "0123456789abcdef";
-char *clnp_hexp __P((char *, int, char *));
-char *clnp_iso_addrp __P((struct iso_addr *));
-char *clnp_saddr_isop __P((struct sockaddr_iso *));
+char *clnp_hexp(char *, int, char *);
+char *clnp_iso_addrp(struct iso_addr *);
+char *clnp_saddr_isop(struct sockaddr_iso *);
/*
* Print buffer in hex, return addr of where we left off.
diff --git a/sys/netiso/cltp_var.h b/sys/netiso/cltp_var.h
index d25098bf780..69acc06fb29 100644
--- a/sys/netiso/cltp_var.h
+++ b/sys/netiso/cltp_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cltp_var.h,v 1.2 1996/03/04 10:35:08 mickey Exp $ */
+/* $OpenBSD: cltp_var.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: cltp_var.h,v 1.7 1996/02/13 22:09:03 christos Exp $ */
/*
@@ -56,11 +56,11 @@ struct isopcb cltb;
struct cltpstat cltpstat;
/* cltp_usrreq.c */
-void cltp_init __P((void));
-void cltp_input __P((struct mbuf *, ...));
-void cltp_notify __P((struct isopcb *));
-void cltp_ctlinput __P((int, struct sockaddr *, void *));
-int cltp_output __P((struct mbuf *, ...));
-int cltp_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *));
+void cltp_init(void);
+void cltp_input(struct mbuf *, ...);
+void cltp_notify(struct isopcb *);
+void cltp_ctlinput(int, struct sockaddr *, void *);
+int cltp_output(struct mbuf *, ...);
+int cltp_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *);
#endif
diff --git a/sys/netiso/eonvar.h b/sys/netiso/eonvar.h
index 412d9180629..76244012ef6 100644
--- a/sys/netiso/eonvar.h
+++ b/sys/netiso/eonvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: eonvar.h,v 1.3 2001/01/19 06:37:38 itojun Exp $ */
+/* $OpenBSD: eonvar.h,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: eonvar.h,v 1.6 1996/02/13 22:09:18 christos Exp $ */
/*-
@@ -174,13 +174,13 @@ struct eon_llinfo {
#define el_eonhdr el_ei.ei_eh
#ifdef _KERNEL
-void eonprotoinit __P((void));
-void eonattach __P((void));
-int eonioctl __P((struct ifnet *, u_long, caddr_t));
-void eoniphdr __P((struct eon_iphdr *, caddr_t, struct route *, int, int));
-void eonrtrequest __P((int, struct rtentry *, struct rt_addrinfo *));
-int eonoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *,
- struct rtentry *));
-void eoninput __P((struct mbuf *, ...));
-void *eonctlinput __P((int, struct sockaddr *, void *));
+void eonprotoinit(void);
+void eonattach(void);
+int eonioctl(struct ifnet *, u_long, caddr_t);
+void eoniphdr(struct eon_iphdr *, caddr_t, struct route *, int, int);
+void eonrtrequest(int, struct rtentry *, struct rt_addrinfo *);
+int eonoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
+ struct rtentry *);
+void eoninput(struct mbuf *, ...);
+void *eonctlinput(int, struct sockaddr *, void *);
#endif
diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h
index 54698241120..bfdb4ea3443 100644
--- a/sys/netiso/esis.h
+++ b/sys/netiso/esis.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: esis.h,v 1.2 1996/03/04 10:35:18 mickey Exp $ */
+/* $OpenBSD: esis.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: esis.h,v 1.9 1996/02/13 22:09:29 christos Exp $ */
/*-
@@ -127,21 +127,21 @@ struct iso_addr;
struct rtentry;
struct sockaddr_dl;
-void esis_init __P((void));
-int esis_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *));
-void esis_input __P((struct mbuf *, ...));
-void esis_rdoutput __P((struct snpa_hdr *, struct mbuf *, struct clnp_optidx *,
- struct iso_addr *, struct rtentry *));
-int esis_insert_addr __P((caddr_t *, int *, struct iso_addr *, struct mbuf *,
- int));
-void esis_eshinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_ishinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_rdinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_config __P((void *));
-void esis_shoutput __P((struct ifnet *, int, int, caddr_t, int,
- struct iso_addr *));
-void isis_input __P((struct mbuf *, ...));
-int isis_output __P((struct mbuf *, ...));
-void *esis_ctlinput __P((int, struct sockaddr *, void *));
+void esis_init(void);
+int esis_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *);
+void esis_input(struct mbuf *, ...);
+void esis_rdoutput(struct snpa_hdr *, struct mbuf *, struct clnp_optidx *,
+ struct iso_addr *, struct rtentry *);
+int esis_insert_addr(caddr_t *, int *, struct iso_addr *, struct mbuf *,
+ int);
+void esis_eshinput(struct mbuf *, struct snpa_hdr *);
+void esis_ishinput(struct mbuf *, struct snpa_hdr *);
+void esis_rdinput(struct mbuf *, struct snpa_hdr *);
+void esis_config(void *);
+void esis_shoutput(struct ifnet *, int, int, caddr_t, int,
+ struct iso_addr *);
+void isis_input(struct mbuf *, ...);
+int isis_output(struct mbuf *, ...);
+void *esis_ctlinput(int, struct sockaddr *, void *);
#endif /* _KERNEL */
diff --git a/sys/netiso/idrp_var.h b/sys/netiso/idrp_var.h
index 279a775020c..a5340d342b8 100644
--- a/sys/netiso/idrp_var.h
+++ b/sys/netiso/idrp_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: idrp_var.h,v 1.1 1996/03/19 16:30:10 mickey Exp $ */
+/* $OpenBSD: idrp_var.h,v 1.2 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: idrp_var.h,v 1.1 1996/02/13 22:09:39 christos Exp $ */
/*
@@ -34,9 +34,9 @@
struct mbuf;
/* idrp_usrreq.c */
-void idrp_init __P((void));
-void idrp_input __P((struct mbuf *, ...));
-int idrp_output __P((struct mbuf *, ...));
-int idrp_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *));
+void idrp_init(void);
+void idrp_input(struct mbuf *, ...);
+int idrp_output(struct mbuf *, ...);
+int idrp_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *);
#endif
diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c
index 4c7dc72fa03..5644b0d6803 100644
--- a/sys/netiso/if_cons.c
+++ b/sys/netiso/if_cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cons.c,v 1.3 2001/05/16 12:54:07 ho Exp $ */
+/* $OpenBSD: if_cons.c,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: if_cons.c,v 1.7 1996/02/13 22:09:44 christos Exp $ */
/*-
@@ -159,12 +159,12 @@ unsigned LAST_CALL_PCB;
#define CONS_IFQMAXLEN 5
-Static int make_partial_x25_packet __P((struct isopcb *, struct pklcd *));
-Static int NSAPtoDTE __P((struct sockaddr_iso *, struct sockaddr_x25 *));
-Static int FACILtoNSAP __P((struct sockaddr_iso *, u_char *));
-Static void init_siso __P((struct sockaddr_iso *));
-Static int DTEtoNSAP __P((struct sockaddr_iso *, struct sockaddr_x25 *));
-Static int parse_facil __P((struct pklcd *, struct isopcb *, caddr_t, u_char));
+Static int make_partial_x25_packet(struct isopcb *, struct pklcd *);
+Static int NSAPtoDTE(struct sockaddr_iso *, struct sockaddr_x25 *);
+Static int FACILtoNSAP(struct sockaddr_iso *, u_char *);
+Static void init_siso(struct sockaddr_iso *);
+Static int DTEtoNSAP(struct sockaddr_iso *, struct sockaddr_x25 *);
+Static int parse_facil(struct pklcd *, struct isopcb *, caddr_t, u_char);
/* protosw pointers for getting to higher layer */
Static struct protosw *CLNP_proto;
diff --git a/sys/netiso/iso.h b/sys/netiso/iso.h
index de615248e1d..5924b9309f5 100644
--- a/sys/netiso/iso.h
+++ b/sys/netiso/iso.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iso.h,v 1.2 1996/03/04 10:35:28 mickey Exp $ */
+/* $OpenBSD: iso.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: iso.h,v 1.8 1996/02/13 22:09:58 christos Exp $ */
/*-
@@ -184,8 +184,8 @@ extern struct protosw isosw[];
#include <sys/cdefs.h>
__BEGIN_DECLS
-struct iso_addr *iso_addr __P((const char *));
-char *iso_ntoa __P((const struct iso_addr *));
+struct iso_addr *iso_addr(const char *);
+char *iso_ntoa(const struct iso_addr *);
/* THESE DON'T EXIST YET */
struct hostent *iso_gethostbyname(), *iso_gethostbyaddr();
diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c
index 4d4486d3a49..49808b07680 100644
--- a/sys/netiso/iso_pcb.c
+++ b/sys/netiso/iso_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iso_pcb.c,v 1.3 1996/04/21 22:29:29 deraadt Exp $ */
+/* $OpenBSD: iso_pcb.c,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: iso_pcb.c,v 1.10 1996/04/13 01:34:56 cgd Exp $ */
/*-
@@ -580,7 +580,7 @@ iso_pcbnotify(head, siso, errno, notify)
struct isopcb *head;
register struct sockaddr_iso *siso;
int errno;
- void (*notify) __P((struct isopcb *));
+ void (*notify)(struct isopcb *);
{
register struct isopcb *isop;
int s = splimp();
diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h
index 88c10543aee..7377bd98135 100644
--- a/sys/netiso/iso_pcb.h
+++ b/sys/netiso/iso_pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iso_pcb.h,v 1.2 1996/03/04 10:35:36 mickey Exp $ */
+/* $OpenBSD: iso_pcb.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: iso_pcb.h,v 1.7 1996/02/13 22:10:18 christos Exp $ */
/*-
@@ -117,13 +117,13 @@ struct inpcb;
struct mbuf;
struct sockaddr_iso;
-int iso_pcballoc __P((struct socket *, void *));
-int iso_pcbbind __P((void *, struct mbuf *));
-int iso_pcbconnect __P((void *, struct mbuf *));
-void iso_pcbdisconnect __P((void *));
-void iso_pcbdetach __P((void *));
+int iso_pcballoc(struct socket *, void *);
+int iso_pcbbind(void *, struct mbuf *);
+int iso_pcbconnect(void *, struct mbuf *);
+void iso_pcbdisconnect(void *);
+void iso_pcbdetach(void *);
void iso_pcbnotify __P((struct isopcb *, struct sockaddr_iso *, int,
void (*) (struct isopcb *)));
-struct isopcb *iso_pcblookup __P((struct isopcb *, int, caddr_t,
- struct sockaddr_iso *));
+struct isopcb *iso_pcblookup(struct isopcb *, int, caddr_t,
+ struct sockaddr_iso *);
#endif
diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c
index 083066ff3bd..e7f67a77e24 100644
--- a/sys/netiso/iso_snpac.c
+++ b/sys/netiso/iso_snpac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iso_snpac.c,v 1.7 2001/08/19 15:07:34 miod Exp $ */
+/* $OpenBSD: iso_snpac.c,v 1.8 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: iso_snpac.c,v 1.13 1996/05/07 02:45:16 thorpej Exp $ */
/*-
@@ -120,7 +120,7 @@ static struct sockaddr_dl gte_dl;
#define zap_linkaddr(a, b, c, i) \
(*a = blank_dl, bcopy(b, a->sdl_data, a->sdl_alen = c), a->sdl_index = i)
-static void snpac_fixdstandmask __P((int));
+static void snpac_fixdstandmask(int);
/*
* We only keep track of a single IS at a time.
diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h
index 22bd2ef39fc..dc95e436135 100644
--- a/sys/netiso/iso_var.h
+++ b/sys/netiso/iso_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iso_var.h,v 1.3 2001/01/19 06:37:38 itojun Exp $ */
+/* $OpenBSD: iso_var.h,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: iso_var.h,v 1.8 1996/02/13 22:10:32 christos Exp $ */
/*-
@@ -136,45 +136,45 @@ struct afhash;
struct llinfo_llc;
/* iso.c */
-int iso_addrmatch1 __P((struct iso_addr *, struct iso_addr *));
-int iso_addrmatch __P((struct sockaddr_iso *, struct sockaddr_iso *));
-int iso_netmatch __P((struct sockaddr_iso *, struct sockaddr_iso *));
-u_long iso_hashchar __P((caddr_t, int));
-int iso_hash __P((struct sockaddr_iso *, struct afhash *));
-int iso_netof __P((struct iso_addr *, caddr_t));
-int iso_control __P((struct socket *, u_long, caddr_t, struct ifnet *));
-void iso_ifscrub __P((struct ifnet *, struct iso_ifaddr *));
-int iso_ifinit __P((struct ifnet *, struct iso_ifaddr *, struct sockaddr_iso *,
- int ));
-struct ifaddr *iso_ifwithidi __P((struct sockaddr *));
-int iso_ck_addr __P((struct iso_addr *));
-int iso_eqtype __P((struct iso_addr *, struct iso_addr *));
-struct iso_ifaddr *iso_localifa __P((struct sockaddr_iso *));
-int iso_nlctloutput __P((int, int, caddr_t, struct mbuf *));
-void dump_isoaddr __P((struct sockaddr_iso *));
+int iso_addrmatch1(struct iso_addr *, struct iso_addr *);
+int iso_addrmatch(struct sockaddr_iso *, struct sockaddr_iso *);
+int iso_netmatch(struct sockaddr_iso *, struct sockaddr_iso *);
+u_long iso_hashchar(caddr_t, int);
+int iso_hash(struct sockaddr_iso *, struct afhash *);
+int iso_netof(struct iso_addr *, caddr_t);
+int iso_control(struct socket *, u_long, caddr_t, struct ifnet *);
+void iso_ifscrub(struct ifnet *, struct iso_ifaddr *);
+int iso_ifinit(struct ifnet *, struct iso_ifaddr *, struct sockaddr_iso *,
+ int );
+struct ifaddr *iso_ifwithidi(struct sockaddr *);
+int iso_ck_addr(struct iso_addr *);
+int iso_eqtype(struct iso_addr *, struct iso_addr *);
+struct iso_ifaddr *iso_localifa(struct sockaddr_iso *);
+int iso_nlctloutput(int, int, caddr_t, struct mbuf *);
+void dump_isoaddr(struct sockaddr_iso *);
/* iso_chksum.c */
-int iso_check_csum __P((struct mbuf *, int));
-void iso_gen_csum __P((struct mbuf *, int, int));
-int m_datalen __P((struct mbuf *));
-int m_compress __P((struct mbuf *, struct mbuf **));
+int iso_check_csum(struct mbuf *, int);
+void iso_gen_csum(struct mbuf *, int, int);
+int m_datalen(struct mbuf *);
+int m_compress(struct mbuf *, struct mbuf **);
/* iso_snpac.c */
-void llc_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *));
-void iso_setmcasts __P((struct ifnet *, int));
-int iso_snparesolve __P((struct ifnet *, struct sockaddr_iso *,
- caddr_t, int *));
-void snpac_free __P((struct llinfo_llc *));
-int snpac_add __P((struct ifnet *, struct iso_addr *, caddr_t, int,
- u_short, int));
-int snpac_ioctl __P((struct socket *, u_long, caddr_t));
-void snpac_logdefis __P((struct rtentry *));
-void snpac_age __P((void *));
-int snpac_ownmulti __P((caddr_t, u_int));
-void snpac_flushifp __P((struct ifnet *));
-void snpac_rtrequest __P((int, struct iso_addr *, struct iso_addr *,
- struct iso_addr *, int, struct rtentry **));
-void snpac_addrt __P((struct ifnet *, struct iso_addr *, struct iso_addr *,
- struct iso_addr *));
+void llc_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
+void iso_setmcasts(struct ifnet *, int);
+int iso_snparesolve(struct ifnet *, struct sockaddr_iso *,
+ caddr_t, int *);
+void snpac_free(struct llinfo_llc *);
+int snpac_add(struct ifnet *, struct iso_addr *, caddr_t, int,
+ u_short, int);
+int snpac_ioctl(struct socket *, u_long, caddr_t);
+void snpac_logdefis(struct rtentry *);
+void snpac_age(void *);
+int snpac_ownmulti(caddr_t, u_int);
+void snpac_flushifp(struct ifnet *);
+void snpac_rtrequest(int, struct iso_addr *, struct iso_addr *,
+ struct iso_addr *, int, struct rtentry **);
+void snpac_addrt(struct ifnet *, struct iso_addr *, struct iso_addr *,
+ struct iso_addr *);
#endif /* _KERNEL */
#endif /* _NETISO_ISO_VAR_H_ */
diff --git a/sys/netiso/tp_cons.c b/sys/netiso/tp_cons.c
index f4792d91283..42a1449fe27 100644
--- a/sys/netiso/tp_cons.c
+++ b/sys/netiso/tp_cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_cons.c,v 1.6 2001/09/05 22:32:40 deraadt Exp $ */
+/* $OpenBSD: tp_cons.c,v 1.7 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_cons.c,v 1.8 1996/02/14 21:32:37 christos Exp $ */
/*-
@@ -368,7 +368,7 @@ tpcons_output_dg(m0, va_alist)
struct mbuf;
-int tpcons_output __P((struct mbuf *m0, ...));
+int tpcons_output(struct mbuf *m0, ...);
int
#if __STDC__
diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c
index c2df0f0ee08..5ac37749670 100644
--- a/sys/netiso/tp_driver.c
+++ b/sys/netiso/tp_driver.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_driver.c,v 1.5 2001/05/16 12:54:07 ho Exp $ */
+/* $OpenBSD: tp_driver.c,v 1.6 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_driver.c,v 1.8 1996/03/16 23:13:45 christos Exp $ */
#include "tp_states.h"
@@ -41,8 +41,8 @@ static struct act_ent {
static int trick_hc = 1;
#include "tp_events.h"
-static int _Xebec_action __P((int, struct tp_event *, struct tp_pcb *));
-static int _Xebec_index __P((struct tp_event *, struct tp_pcb *));
+static int _Xebec_action(int, struct tp_event *, struct tp_pcb *);
+static int _Xebec_index(struct tp_event *, struct tp_pcb *);
static int
_Xebec_action(a, e, p)
diff --git a/sys/netiso/tp_emit.c b/sys/netiso/tp_emit.c
index 2b6a40b986a..61dcc847c2e 100644
--- a/sys/netiso/tp_emit.c
+++ b/sys/netiso/tp_emit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_emit.c,v 1.7 2001/06/23 03:54:58 angelos Exp $ */
+/* $OpenBSD: tp_emit.c,v 1.8 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_emit.c,v 1.8 1996/03/16 23:13:48 christos Exp $ */
/*-
@@ -858,7 +858,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
int erlen;
struct tp_pcb *tpcb;
caddr_t cons_channel;
- int (*dgout_routine) __P((struct mbuf *, ...));
+ int (*dgout_routine)(struct mbuf *, ...);
{
int dutype;
int datalen = 0;
diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c
index 72f1a429d12..ac0de1823de 100644
--- a/sys/netiso/tp_inet.c
+++ b/sys/netiso/tp_inet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_inet.c,v 1.6 2001/06/27 03:49:54 angelos Exp $ */
+/* $OpenBSD: tp_inet.c,v 1.7 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_inet.c,v 1.11 1996/03/16 23:13:49 christos Exp $ */
/*-
@@ -665,7 +665,7 @@ tpip_ctlinput(cmd, sa, dummy)
{
struct sockaddr_in *sin = (struct sockaddr_in *) sa;
extern int inetctlerrmap[];
- void (*notify) __P((struct inpcb *, int));
+ void (*notify)(struct inpcb *, int);
int errno;
if (cmd < 0 || cmd >= PRC_NCMDS)
diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c
index b7d6b2394dc..1702a4dbc9f 100644
--- a/sys/netiso/tp_input.c
+++ b/sys/netiso/tp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_input.c,v 1.3 1996/04/21 22:29:47 deraadt Exp $ */
+/* $OpenBSD: tp_input.c,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_input.c,v 1.9 1996/03/16 23:13:51 christos Exp $ */
/*-
@@ -119,8 +119,8 @@ SOFTWARE.
#include <machine/stdarg.h>
-static struct socket *tp_newsocket __P((struct socket *, struct sockaddr *,
- caddr_t, u_int, u_int));
+static struct socket *tp_newsocket(struct socket *, struct sockaddr *,
+ caddr_t, u_int, u_int);
struct mbuf *
tp_inputprep(m)
@@ -428,7 +428,7 @@ tp_input(m, va_alist)
{
struct sockaddr *faddr, *laddr; /* NSAP addresses */
caddr_t cons_channel;
- int (*dgout_routine) __P((struct mbuf *, ...));
+ int (*dgout_routine)(struct mbuf *, ...);
int ce_bit;
register struct tp_pcb *tpcb;
register struct tpdu *hdr;
@@ -456,7 +456,7 @@ tp_input(m, va_alist)
laddr = va_arg(ap, struct sockaddr *);
cons_channel = va_arg(ap, caddr_t);
/* XXX: Does va_arg does not work for function ptrs */
- dgout_routine = (int (*) __P((struct mbuf *, ...))) va_arg(ap, void *);
+ dgout_routine = (int (*)(struct mbuf *, ...)) va_arg(ap, void *);
ce_bit = va_arg(ap, int);
va_end(ap);
diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c
index bbd0a4b145e..89832dc37f5 100644
--- a/sys/netiso/tp_iso.c
+++ b/sys/netiso/tp_iso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_iso.c,v 1.3 1996/04/21 22:29:50 deraadt Exp $ */
+/* $OpenBSD: tp_iso.c,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_iso.c,v 1.8 1996/03/16 23:13:54 christos Exp $ */
/*-
@@ -525,7 +525,7 @@ tpclnp_input(m, va_alist)
{
struct sockaddr_iso *src, *dst;
int clnp_len, ce_bit;
- void (*input) __P((struct mbuf *, ...)) = tp_input;
+ void (*input)(struct mbuf *, ...) = tp_input;
va_list ap;
va_start(ap, m);
diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h
index 68af0d3d2c0..151395bbb21 100644
--- a/sys/netiso/tp_pcb.h
+++ b/sys/netiso/tp_pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_pcb.h,v 1.2 1996/03/04 10:36:20 mickey Exp $ */
+/* $OpenBSD: tp_pcb.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_pcb.h,v 1.9 1996/02/13 22:11:44 christos Exp $ */
/*-
@@ -123,39 +123,24 @@ struct tp_refinfo {
struct nl_protosw {
int nlp_afamily; /* address family */
- void (*nlp_putnetaddr) /* puts addresses in nl pcb */
- __P((void *, struct sockaddr *, int));
- void (*nlp_getnetaddr) /* gets addresses from nl pcb */
- __P((void *, struct mbuf *, int));
- int (*nlp_cmpnetaddr) /* compares address in pcb */
- __P((void *, struct sockaddr *, int));
+ void (*nlp_putnetaddr) /* puts addresses in nl pcb */(void *, struct sockaddr *, int);
+ void (*nlp_getnetaddr) /* gets addresses from nl pcb */(void *, struct mbuf *, int);
+ int (*nlp_cmpnetaddr) /* compares address in pcb */(void *, struct sockaddr *, int);
/* with sockaddr */
- void (*nlp_putsufx) /* puts transport suffixes in */
- __P((void *, caddr_t, int, int));
+ void (*nlp_putsufx) /* puts transport suffixes in */(void *, caddr_t, int, int);
/* nl pcb */
- void (*nlp_getsufx) /* gets transport suffixes */
- __P((void *, u_short *, caddr_t, int));
+ void (*nlp_getsufx) /* gets transport suffixes */(void *, u_short *, caddr_t, int);
/* from nl pcb */
- void (*nlp_recycle_suffix) /* clears suffix from nl pcb */
- __P((void *));
- int (*nlp_mtu) /* figures out mtu based on */
- __P((void *)); /* nl used */
- int (*nlp_pcbbind) /* bind to pcb for net level */
- __P((void *, struct mbuf *));
- int (*nlp_pcbconn) /* connect for net level */
- __P((void *, struct mbuf *));
- void (*nlp_pcbdisc) /* disconnect net level */
- __P((void *));
- void (*nlp_pcbdetach) /* detach net level pcb */
- __P((void *));
- int (*nlp_pcballoc) /* allocate a net level pcb */
- __P((struct socket *, void *));
- int (*nlp_output) /* prepare a packet to give */
- __P((struct mbuf *, ...)); /* to nl */
- int (*nlp_dgoutput) /* prepare a packet to give */
- __P((struct mbuf *, ...)); /*to nl*/
- int (*nlp_ctloutput) /* hook for network set/get */
- __P((int, int, caddr_t, struct mbuf *));
+ void (*nlp_recycle_suffix) /* clears suffix from nl pcb */(void *);
+ int (*nlp_mtu) /* figures out mtu based on */(void *); /* nl used */
+ int (*nlp_pcbbind) /* bind to pcb for net level */(void *, struct mbuf *);
+ int (*nlp_pcbconn) /* connect for net level */(void *, struct mbuf *);
+ void (*nlp_pcbdisc) /* disconnect net level */(void *);
+ void (*nlp_pcbdetach) /* detach net level pcb */(void *);
+ int (*nlp_pcballoc) /* allocate a net level pcb */(struct socket *, void *);
+ int (*nlp_output) /* prepare a packet to give */(struct mbuf *, ...); /* to nl */
+ int (*nlp_dgoutput) /* prepare a packet to give */(struct mbuf *, ...); /*to nl*/
+ int (*nlp_ctloutput) /* hook for network set/get */(int, int, caddr_t, struct mbuf *);
/* options */
caddr_t nlp_pcblist; /* list of xx_pcb's for connections */
};
diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c
index 87045d21b44..75cc0996256 100644
--- a/sys/netiso/tp_subr2.c
+++ b/sys/netiso/tp_subr2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_subr2.c,v 1.3 1996/04/21 22:29:59 deraadt Exp $ */
+/* $OpenBSD: tp_subr2.c,v 1.4 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_subr2.c,v 1.11 1996/03/26 22:27:01 christos Exp $ */
/*-
@@ -122,7 +122,7 @@ SOFTWARE.
#include <netccitt/pk_extern.h>
#if 0
-static void copyQOSparms __P((struct tp_conn_param *, struct tp_conn_param *));
+static void copyQOSparms(struct tp_conn_param *, struct tp_conn_param *);
#endif
/*
diff --git a/sys/netiso/tp_var.h b/sys/netiso/tp_var.h
index 82b7282403e..7db7d854597 100644
--- a/sys/netiso/tp_var.h
+++ b/sys/netiso/tp_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_var.h,v 1.1 1996/03/04 10:36:47 mickey Exp $ */
+/* $OpenBSD: tp_var.h,v 1.2 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tp_var.h,v 1.1 1996/02/13 22:12:29 christos Exp $ */
/*
@@ -48,147 +48,147 @@ struct in_addr;
/* tp_cons.c */
-int tpcons_pcbconnect __P((void *, struct mbuf *));
-void *tpcons_ctlinput __P((int, struct sockaddr *, void *));
-void tpcons_input __P((struct mbuf *, ...));
-int tpcons_output __P((struct mbuf *, ...));
-int tpcons_output_dg __P((struct mbuf *, ...));
+int tpcons_pcbconnect(void *, struct mbuf *);
+void *tpcons_ctlinput(int, struct sockaddr *, void *);
+void tpcons_input(struct mbuf *, ...);
+int tpcons_output(struct mbuf *, ...);
+int tpcons_output_dg(struct mbuf *, ...);
/* tp_driver.c */
-int tp_driver __P((struct tp_pcb *, struct tp_event *));
+int tp_driver(struct tp_pcb *, struct tp_event *);
/* tp_emit.c */
-int tp_emit __P((int, struct tp_pcb *, SeqNum, u_int, struct mbuf *));
+int tp_emit(int, struct tp_pcb *, SeqNum, u_int, struct mbuf *);
int tp_error_emit __P((int, u_long, struct sockaddr_iso *,
struct sockaddr_iso *, struct mbuf *, int,
struct tp_pcb *, caddr_t,
int (*) (struct mbuf *, ...)));
/* tp_inet.c */
-void in_getsufx __P((void *, u_short *, caddr_t, int));
-void in_putsufx __P((void *, caddr_t, int, int));
-void in_recycle_tsuffix __P((void *));
-void in_putnetaddr __P((void *, struct sockaddr *, int));
-int in_cmpnetaddr __P((void *, struct sockaddr *, int));
-void in_getnetaddr __P((void *, struct mbuf *, int));
-int tpip_mtu __P((void *));
-int tpip_output __P((struct mbuf *, ...));
-int tpip_output_dg __P((struct mbuf *, ...));
-void tpip_input __P((struct mbuf *, ...));
-void tpin_quench __P((struct inpcb *, int));
-void *tpip_ctlinput __P((int, struct sockaddr *, void *));
-void tpin_abort __P((struct inpcb *, int));
-void dump_inaddr __P((struct sockaddr_in *));
+void in_getsufx(void *, u_short *, caddr_t, int);
+void in_putsufx(void *, caddr_t, int, int);
+void in_recycle_tsuffix(void *);
+void in_putnetaddr(void *, struct sockaddr *, int);
+int in_cmpnetaddr(void *, struct sockaddr *, int);
+void in_getnetaddr(void *, struct mbuf *, int);
+int tpip_mtu(void *);
+int tpip_output(struct mbuf *, ...);
+int tpip_output_dg(struct mbuf *, ...);
+void tpip_input(struct mbuf *, ...);
+void tpin_quench(struct inpcb *, int);
+void *tpip_ctlinput(int, struct sockaddr *, void *);
+void tpin_abort(struct inpcb *, int);
+void dump_inaddr(struct sockaddr_in *);
/* tp_input.c */
-struct mbuf *tp_inputprep __P((struct mbuf *));
-void tp_input __P((struct mbuf *, ...));
-int tp_headersize __P((int, struct tp_pcb *));
+struct mbuf *tp_inputprep(struct mbuf *);
+void tp_input(struct mbuf *, ...);
+int tp_headersize(int, struct tp_pcb *);
/* tp_iso.c */
-void iso_getsufx __P((void *, u_short *, caddr_t, int));
-void iso_putsufx __P((void *, caddr_t, int, int));
-void iso_recycle_tsuffix __P((void *));
-void iso_putnetaddr __P((void *, struct sockaddr *, int));
-int iso_cmpnetaddr __P((void *, struct sockaddr *, int));
-void iso_getnetaddr __P((void *, struct mbuf *, int));
-int tpclnp_mtu __P((void *));
-int tpclnp_output __P((struct mbuf *, ...));
-int tpclnp_output_dg __P((struct mbuf *, ...));
-void tpclnp_input __P((struct mbuf *, ...));
-void iso_rtchange __P((struct isopcb *));
-void tpiso_decbit __P((struct isopcb *));
-void tpiso_quench __P((struct isopcb *));
-void *tpclnp_ctlinput __P((int, struct sockaddr *, void *));
-void tpclnp_ctlinput1 __P((int, struct iso_addr *));
-void tpiso_abort __P((struct isopcb *));
-void tpiso_reset __P((struct isopcb *));
+void iso_getsufx(void *, u_short *, caddr_t, int);
+void iso_putsufx(void *, caddr_t, int, int);
+void iso_recycle_tsuffix(void *);
+void iso_putnetaddr(void *, struct sockaddr *, int);
+int iso_cmpnetaddr(void *, struct sockaddr *, int);
+void iso_getnetaddr(void *, struct mbuf *, int);
+int tpclnp_mtu(void *);
+int tpclnp_output(struct mbuf *, ...);
+int tpclnp_output_dg(struct mbuf *, ...);
+void tpclnp_input(struct mbuf *, ...);
+void iso_rtchange(struct isopcb *);
+void tpiso_decbit(struct isopcb *);
+void tpiso_quench(struct isopcb *);
+void *tpclnp_ctlinput(int, struct sockaddr *, void *);
+void tpclnp_ctlinput1(int, struct iso_addr *);
+void tpiso_abort(struct isopcb *);
+void tpiso_reset(struct isopcb *);
/* tp_meas.c */
-void Tpmeas __P((u_int, u_int, struct timeval *, u_int, u_int, u_int));
+void Tpmeas(u_int, u_int, struct timeval *, u_int, u_int, u_int);
/* tp_output.c */
-int tp_consistency __P((struct tp_pcb *, u_int, struct tp_conn_param *));
-int tp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
+int tp_consistency(struct tp_pcb *, u_int, struct tp_conn_param *);
+int tp_ctloutput(int, struct socket *, int, int, struct mbuf **);
/* tp_pcb.c */
-void tp_init __P((void));
-void tp_soisdisconnecting __P((struct socket *));
-void tp_soisdisconnected __P((struct tp_pcb *));
-void tp_freeref __P((RefNum));
-u_long tp_getref __P((struct tp_pcb *));
-int tp_set_npcb __P((struct tp_pcb *));
-int tp_attach __P((struct socket *, long));
-void tp_detach __P((struct tp_pcb *));
-int tp_tselinuse __P((int, caddr_t, struct sockaddr_iso *, int));
-int tp_pcbbind __P((void *, struct mbuf *));
+void tp_init(void);
+void tp_soisdisconnecting(struct socket *);
+void tp_soisdisconnected(struct tp_pcb *);
+void tp_freeref(RefNum);
+u_long tp_getref(struct tp_pcb *);
+int tp_set_npcb(struct tp_pcb *);
+int tp_attach(struct socket *, long);
+void tp_detach(struct tp_pcb *);
+int tp_tselinuse(int, caddr_t, struct sockaddr_iso *, int);
+int tp_pcbbind(void *, struct mbuf *);
/* tp_subr.c */
-int tp_goodXack __P((struct tp_pcb *, SeqNum));
-void tp_rtt_rtv __P((struct tp_pcb *));
-int tp_goodack __P((struct tp_pcb *, u_int, SeqNum, u_int));
-int tp_sbdrop __P((struct tp_pcb *, SeqNum));
-void tp_send __P((struct tp_pcb *));
-int tp_packetize __P((struct tp_pcb *, struct mbuf *, int));
-int tp_stash __P((struct tp_pcb *, struct tp_event *));
-void tp_rsyflush __P((struct tp_pcb *));
-void tp_rsyset __P((struct tp_pcb *));
-void tpsbcheck __P((struct tp_pcb *, int));
+int tp_goodXack(struct tp_pcb *, SeqNum);
+void tp_rtt_rtv(struct tp_pcb *);
+int tp_goodack(struct tp_pcb *, u_int, SeqNum, u_int);
+int tp_sbdrop(struct tp_pcb *, SeqNum);
+void tp_send(struct tp_pcb *);
+int tp_packetize(struct tp_pcb *, struct mbuf *, int);
+int tp_stash(struct tp_pcb *, struct tp_event *);
+void tp_rsyflush(struct tp_pcb *);
+void tp_rsyset(struct tp_pcb *);
+void tpsbcheck(struct tp_pcb *, int);
/* tp_subr2.c */
-void tp_local_credit __P((struct tp_pcb *));
-int tp_protocol_error __P((struct tp_event *, struct tp_pcb *));
-void tp_drain __P((void));
-void tp_indicate __P((int, struct tp_pcb *, u_short));
-void tp_getoptions __P((struct tp_pcb *));
-void tp_recycle_tsuffix __P((void *));
-void tp_quench __P((struct inpcb *, int));
-void tp_netcmd __P((struct tp_pcb *, int));
-int tp_mask_to_num __P((u_char));
-void tp_mss __P((struct tp_pcb *, int));
-int tp_route_to __P((struct mbuf *, struct tp_pcb *, caddr_t));
-void tp0_stash __P((struct tp_pcb *, struct tp_event *));
-void tp0_openflow __P((struct tp_pcb *));
-int tp_setup_perf __P((struct tp_pcb *));
-void dump_addr __P((struct sockaddr *));
-void Dump_buf __P((caddr_t, int));
+void tp_local_credit(struct tp_pcb *);
+int tp_protocol_error(struct tp_event *, struct tp_pcb *);
+void tp_drain(void);
+void tp_indicate(int, struct tp_pcb *, u_short);
+void tp_getoptions(struct tp_pcb *);
+void tp_recycle_tsuffix(void *);
+void tp_quench(struct inpcb *, int);
+void tp_netcmd(struct tp_pcb *, int);
+int tp_mask_to_num(u_char);
+void tp_mss(struct tp_pcb *, int);
+int tp_route_to(struct mbuf *, struct tp_pcb *, caddr_t);
+void tp0_stash(struct tp_pcb *, struct tp_event *);
+void tp0_openflow(struct tp_pcb *);
+int tp_setup_perf(struct tp_pcb *);
+void dump_addr(struct sockaddr *);
+void Dump_buf(caddr_t, int);
/* tp_timer.c */
-void tp_timerinit __P((void));
-void tp_etimeout __P((struct tp_pcb *, int, int));
-void tp_euntimeout __P((struct tp_pcb *, int));
-void tp_slowtimo __P((void));
-void tp_data_retrans __P((struct tp_pcb *));
-void tp_fasttimo __P((void));
-void tp_ctimeout __P((struct tp_pcb *, int, int));
-void tp_ctimeout_MIN __P((struct tp_pcb *, int, int));
-void tp_cuntimeout __P((struct tp_pcb *, int));
+void tp_timerinit(void);
+void tp_etimeout(struct tp_pcb *, int, int);
+void tp_euntimeout(struct tp_pcb *, int);
+void tp_slowtimo(void);
+void tp_data_retrans(struct tp_pcb *);
+void tp_fasttimo(void);
+void tp_ctimeout(struct tp_pcb *, int, int);
+void tp_ctimeout_MIN(struct tp_pcb *, int, int);
+void tp_cuntimeout(struct tp_pcb *, int);
/* tp_trace.c */
-void tpTrace __P((struct tp_pcb *, u_int, u_int, u_int, u_int, u_int,
- u_int));
+void tpTrace(struct tp_pcb *, u_int, u_int, u_int, u_int, u_int,
+ u_int);
/* tp_usrreq.c */
-void dump_mbuf __P((struct mbuf *, char *));
-int tp_rcvoob __P((struct tp_pcb *, struct socket *, struct mbuf *,
- int *, int));
-int tp_sendoob __P((struct tp_pcb *, struct socket *, struct mbuf *, int *));
-int tp_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *));
-void tp_ltrace __P((struct socket *, struct uio *));
-int tp_confirm __P((struct tp_pcb *));
-int tp_snd_control __P((struct mbuf *, struct socket *, struct mbuf **));
+void dump_mbuf(struct mbuf *, char *);
+int tp_rcvoob(struct tp_pcb *, struct socket *, struct mbuf *,
+ int *, int);
+int tp_sendoob(struct tp_pcb *, struct socket *, struct mbuf *, int *);
+int tp_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *);
+void tp_ltrace(struct socket *, struct uio *);
+int tp_confirm(struct tp_pcb *);
+int tp_snd_control(struct mbuf *, struct socket *, struct mbuf **);
#ifdef TPCONS
/* if_cons.c */
-void nibble_copy __P((char *, unsigned, char *, unsigned, int));
-int nibble_match __P((char *, unsigned, char *, unsigned, int));
-void cons_init __P((void));
-int tp_incoming __P((struct mbuf *, void *));
-int cons_tpinput __P((struct mbuf *, void *));
-int cons_connect __P((struct isopcb *));
-void *cons_ctlinput __P((int, struct sockaddr *, void *));
-int find_error_reason __P((struct x25_packet *));
+void nibble_copy(char *, unsigned, char *, unsigned, int);
+int nibble_match(char *, unsigned, char *, unsigned, int);
+void cons_init(void);
+int tp_incoming(struct mbuf *, void *);
+int cons_tpinput(struct mbuf *, void *);
+int cons_connect(struct isopcb *);
+void *cons_ctlinput(int, struct sockaddr *, void *);
+int find_error_reason(struct x25_packet *);
#endif
#endif
diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c
index a70cdeab30b..caa444ef8c2 100644
--- a/sys/netiso/tuba_subr.c
+++ b/sys/netiso/tuba_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tuba_subr.c,v 1.9 2001/06/27 03:49:55 angelos Exp $ */
+/* $OpenBSD: tuba_subr.c,v 1.10 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tuba_subr.c,v 1.7 1996/02/13 22:12:32 christos Exp $ */
/*
@@ -92,8 +92,8 @@ struct addr_arg {
u_long sum;
};
-static void tuba_getaddr __P((struct addr_arg *, struct sockaddr_iso **,
- u_long));
+static void tuba_getaddr(struct addr_arg *, struct sockaddr_iso **,
+ u_long);
/*
* Tuba initialization
*/
diff --git a/sys/netiso/tuba_table.h b/sys/netiso/tuba_table.h
index 87a348a0ed1..dc4fe9e8b79 100644
--- a/sys/netiso/tuba_table.h
+++ b/sys/netiso/tuba_table.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tuba_table.h,v 1.2 1996/03/04 10:36:52 mickey Exp $ */
+/* $OpenBSD: tuba_table.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */
/* $NetBSD: tuba_table.h,v 1.4 1996/02/13 22:12:37 christos Exp $ */
/*-
@@ -68,23 +68,23 @@ struct sockaddr_iso;
struct socket;
/* tuba_subr.c */
-void tuba_init __P((void));
-int tuba_output __P((struct mbuf *, struct tcpcb *));
-void tuba_refcnt __P((struct isopcb *, int ));
-void tuba_pcbdetach __P((void *));
-int tuba_pcbconnect __P((void *, struct mbuf *));
-void tuba_tcpinput __P((struct mbuf *, ...));
-int tuba_pcbconnect __P((void *, struct mbuf *));
-void tuba_slowtimo __P((void));
-void tuba_fasttimo __P((void));
+void tuba_init(void);
+int tuba_output(struct mbuf *, struct tcpcb *);
+void tuba_refcnt(struct isopcb *, int );
+void tuba_pcbdetach(void *);
+int tuba_pcbconnect(void *, struct mbuf *);
+void tuba_tcpinput(struct mbuf *, ...);
+int tuba_pcbconnect(void *, struct mbuf *);
+void tuba_slowtimo(void);
+void tuba_fasttimo(void);
/* tuba_table.c */
-void tuba_timer __P((void *));
-void tuba_table_init __P((void));
-int tuba_lookup __P((struct sockaddr_iso *, int ));
+void tuba_timer(void *);
+void tuba_table_init(void);
+int tuba_lookup(struct sockaddr_iso *, int );
/* tuba_usrreq.c */
-int tuba_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *));
-int tuba_ctloutput __P((int, struct socket *, int, int , struct mbuf **));
+int tuba_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *);
+int tuba_ctloutput(int, struct socket *, int, int , struct mbuf **);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 16:58:20 +0000