diff options
author | bde <bde@FreeBSD.org> | 1994-11-14 14:06:06 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1994-11-14 14:06:06 +0000 |
commit | 37abb2da7af11246870f24a1971e13cf70bb3933 (patch) | |
tree | fda40d1f598070183f083d8edac780048ef1b733 /sys/net | |
parent | bb89e3d6c307a1a79e897baa85f1c0883f53316c (diff) | |
download | FreeBSD-src-37abb2da7af11246870f24a1971e13cf70bb3933.zip FreeBSD-src-37abb2da7af11246870f24a1971e13cf70bb3933.tar.gz |
if.h:
Declare a complete prototype for the function pointer *ifa_rtrequest.
radix.h:
Declare a complete prototype for the function pointer *rnh_walktree
and for the function rn_walktree.
Uniformize idempotency ifdef.
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if.h | 5 | ||||
-rw-r--r-- | sys/net/radix.h | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index 42cd7bd..006a6b6 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $Id: if.h,v 1.6 1994/08/21 05:11:40 paul Exp $ + * $Id: if.h,v 1.7 1994/10/01 19:44:38 wollman Exp $ */ #ifndef _NET_IF_H_ @@ -233,7 +233,8 @@ struct ifaddr { struct sockaddr *ifa_netmask; /* used to determine subnet */ struct ifnet *ifa_ifp; /* back-pointer to interface */ struct ifaddr *ifa_next; /* next address for interface */ - void (*ifa_rtrequest)(); /* check or clean routes (+ or -)'d */ + void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */ + __P((int, struct rtentry *, struct sockaddr *)); u_short ifa_flags; /* mostly rt_flags for cloning */ short ifa_refcnt; /* extra to malloc for link info */ int ifa_metric; /* cost of going out this interface */ diff --git a/sys/net/radix.h b/sys/net/radix.h index 89895d0..b389596 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)radix.h 8.1 (Berkeley) 6/10/93 - * $Id: radix.h,v 1.3 1994/08/21 05:11:45 paul Exp $ + * $Id: radix.h,v 1.4 1994/11/02 04:41:23 wollman Exp $ */ #ifndef _NET_RADIX_H_ @@ -98,6 +98,8 @@ extern struct radix_mask { #define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);} +typedef int walktree_f_t __P((struct radix_node *, /*struct walkarg*/ void *)); + struct radix_node_head { struct radix_node *rnh_treetop; int rnh_addrsize; /* permit, but not require fixed keys */ @@ -117,7 +119,7 @@ struct radix_node_head { struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */ __P((void *v, struct radix_node_head *head)); int (*rnh_walktree) /* traverse tree */ - __P((struct radix_node_head *head, int (*f)(), void *w)); + __P((struct radix_node_head *head, walktree_f_t *f, void *w)); void (*rnh_close) /* do something when the last ref drops */ __P((struct radix_node *rn, struct radix_node_head *head)); struct radix_node rnh_nodes[3]; /* empty tree for common case */ @@ -139,7 +141,7 @@ struct radix_node_head { void rn_init __P((void)); int rn_inithead __P((void **, int)); int rn_refines __P((void *, void *)); -int rn_walktree __P((struct radix_node_head *, int (*)(), void *)); +int rn_walktree __P((struct radix_node_head *, walktree_f_t *, void *)); struct radix_node *rn_addmask __P((void *, int, int)), *rn_addroute __P((void *, void *, struct radix_node_head *, @@ -153,4 +155,5 @@ struct radix_node *rn_search_m __P((void *, struct radix_node *, void *)); #endif /*KERNEL*/ -#endif /* _RADIX_H_ */ + +#endif /* !_NET_RADIX_H_ */ |