diff options
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.h | 20 | ||||
| -rw-r--r-- | sys/net/if_pppvar.h | 6 | ||||
| -rw-r--r-- | sys/net/radix.h | 34 |
3 files changed, 39 insertions, 21 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index e4ba487fcbc..93bfabff279 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.33 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: if.h,v 1.34 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -159,12 +159,17 @@ struct ifnet { /* and the entries */ int if_capabilities; /* interface capabilities */ /* procedure handles */ - int (*if_output) /* output routine (enqueue) */(struct ifnet *, struct mbuf *, struct sockaddr *, + /* output routine (enqueue) */ + int (*if_output)(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); - void (*if_start) /* initiate output routine */(struct ifnet *); - int (*if_ioctl) /* ioctl routine */(struct ifnet *, u_long, caddr_t); - int (*if_reset) /* XXX bus reset routine */(struct ifnet *); - void (*if_watchdog) /* timer routine */(struct ifnet *); + /* initiate output routine */ + void (*if_start)(struct ifnet *); + /* ioctl routine */ + int (*if_ioctl)(struct ifnet *, u_long, caddr_t); + /* XXX bus reset routine */ + int (*if_reset)(struct ifnet *); + /* timer routine */ + void (*if_watchdog)(struct ifnet *); struct ifaltq if_snd; /* output queue (includes altq) */ struct ifprefix *if_prefixlist; /* linked list of prefixes per if */ }; @@ -290,7 +295,8 @@ struct ifaddr { struct sockaddr *ifa_netmask; /* used to determine subnet */ struct ifnet *ifa_ifp; /* back-pointer to interface */ TAILQ_ENTRY(ifaddr) ifa_list; /* list of addresses for interface */ - void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */(int, struct rtentry *, struct rt_addrinfo *); + /* check or clean routes (+ or -)'d */ + void (*ifa_rtrequest)(int, struct rtentry *, struct rt_addrinfo *); u_int ifa_flags; /* mostly rt_flags for cloning */ u_int ifa_refcnt; /* count of references */ int ifa_metric; /* cost of going out this interface */ diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h index 167142bbf5e..3aa09c4e719 100644 --- a/sys/net/if_pppvar.h +++ b/sys/net/if_pppvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppvar.h,v 1.10 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: if_pppvar.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $ */ /* * if_pppvar.h - private structures and declarations for PPP. @@ -61,7 +61,7 @@ struct ppp_softc { int sc_unit; /* XXX unit number */ u_int sc_flags; /* control/status bits; see if_ppp.h */ void *sc_devp; /* pointer to device-dep structure */ - void (*sc_start)(struct ppp_softc *); /* start output proc */ + void (*sc_start)(struct ppp_softc *); /* start output proc */ void (*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */ void (*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */ u_int16_t sc_mru; /* max receive unit */ @@ -81,7 +81,7 @@ struct ppp_softc { void *sc_rc_state; /* receive decompressor state */ time_t sc_last_sent; /* time (secs) last NP pkt sent */ time_t sc_last_recv; /* time (secs) last NP pkt rcvd */ - struct bpf_program sc_pass_filt; /* filter for packets to pass */ + struct bpf_program sc_pass_filt; /* filter for packets to pass */ struct bpf_program sc_active_filt; /* filter for "non-idle" packets */ #ifdef VJC struct slcompress *sc_comp; /* vjc control buffer */ diff --git a/sys/net/radix.h b/sys/net/radix.h index 0aa628df683..403d7093a5c 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: radix.h,v 1.7 2002/03/14 03:16:10 millert Exp $ */ +/* $OpenBSD: radix.h,v 1.8 2002/03/15 01:20:04 millert Exp $ */ /* $NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $ */ /* @@ -111,19 +111,31 @@ struct radix_node_head { struct radix_node *rnh_treetop; int rnh_addrsize; /* permit, but not require fixed keys */ int rnh_pktsize; /* permit, but not require fixed keys */ - struct radix_node *(*rnh_addaddr) /* add based on sockaddr */(void *v, void *mask, + /* add based on sockaddr */ + struct radix_node *(*rnh_addaddr)(void *v, void *mask, struct radix_node_head *head, struct radix_node nodes[]); - struct radix_node *(*rnh_addpkt) /* add based on packet hdr */(void *v, void *mask, + /* add based on packet hdr */ + struct radix_node *(*rnh_addpkt)(void *v, void *mask, struct radix_node_head *head, struct radix_node nodes[]); - struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */(void *v, void *mask, struct radix_node_head *head); - struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */(void *v, void *mask, struct radix_node_head *head); - struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */(void *v, struct radix_node_head *head); - struct radix_node *(*rnh_lookup) /* locate based on sockaddr */(void *v, void *mask, struct radix_node_head *head); - struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */(void *v, struct radix_node_head *head); - int (*rnh_walktree) /* traverse tree */ - (struct radix_node_head *, + /* remove based on sockaddr */ + struct radix_node *(*rnh_deladdr)(void *v, void *mask, + struct radix_node_head *head); + /* remove based on packet hdr */ + struct radix_node *(*rnh_delpkt)(void *v, void *mask, + struct radix_node_head *head); + /* locate based on sockaddr */ + struct radix_node *(*rnh_matchaddr)(void *v, + struct radix_node_head *head); + /* locate based on sockaddr */ + struct radix_node *(*rnh_lookup)(void *v, void *mask, + struct radix_node_head *head); + /* locate based on packet hdr */ + struct radix_node *(*rnh_matchpkt)(void *v, + struct radix_node_head *head); + /* traverse tree */ + int (*rnh_walktree)(struct radix_node_head *, int (*)(struct radix_node *, void *), void *); - struct radix_node rnh_nodes[3]; /* empty tree for common case */ + struct radix_node rnh_nodes[3];/* empty tree for common case */ }; |