diff options
author | rwatson <rwatson@FreeBSD.org> | 2007-01-12 13:18:08 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2007-01-12 13:18:08 +0000 |
commit | 751716e05082eecdf3a7767ec11dabf0062f9776 (patch) | |
tree | d0a01290f16dfbc5c03f21f3e84d7836d7de5066 /sys/netatalk/at_var.h | |
parent | ccc086813d94233b2bd97bad22ddd8017def360d (diff) | |
download | FreeBSD-src-751716e05082eecdf3a7767ec11dabf0062f9776.zip FreeBSD-src-751716e05082eecdf3a7767ec11dabf0062f9776.tar.gz |
Cleanup of netatalk atalk layer includes, protocol definitions, and
routing:
- style(9) cleanup -- white space, braces, etc.
- Make include guards consistent with our more general naming
convention.
- Rearrange and complete forward structure declarations in at_extern.h,
remove testing of guards of various other include files to protect
function declarations.
This leaves an ifdef _KERNEL in at_var.h, but from inspection it seems
likely that this file is not actually safe for inclusion in user space
still. However, since it's not included from within src/ so this does
not appear to be an issue (ifconfig, etc, have migrated to the generic
cross-protocol ioctls for address operations).
Diffstat (limited to 'sys/netatalk/at_var.h')
-rw-r--r-- | sys/netatalk/at_var.h | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/sys/netatalk/at_var.h b/sys/netatalk/at_var.h index fa4e69d..0ad1334 100644 --- a/sys/netatalk/at_var.h +++ b/sys/netatalk/at_var.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1990,1991 Regents of The University of Michigan. + * Copyright (c) 1990, 1991 Regents of The University of Michigan. * All Rights Reserved. * * Permission to use, copy, modify, and distribute this software and @@ -24,40 +24,41 @@ */ #ifndef _NETATALK_AT_VAR_H_ -#define _NETATALK_AT_VAR_H_ 1 +#define _NETATALK_AT_VAR_H_ + /* - * For phase2, we need to keep not only our address on an interface, - * but also the legal networks on the interface. + * For phase2, we need to keep not only our address on an interface, but also + * the legal networks on the interface. */ struct at_ifaddr { - struct ifaddr aa_ifa; -# define aa_ifp aa_ifa.ifa_ifp - struct sockaddr_at aa_addr; - struct sockaddr_at aa_broadaddr; -# define aa_dstaddr aa_broadaddr; - struct sockaddr_at aa_netmask; - int aa_flags; - u_short aa_firstnet, aa_lastnet; - int aa_probcnt; - struct callout aa_callout; - struct at_ifaddr *aa_next; + struct ifaddr aa_ifa; + struct sockaddr_at aa_addr; + struct sockaddr_at aa_broadaddr; + struct sockaddr_at aa_netmask; + int aa_flags; + u_short aa_firstnet; + u_short aa_lastnet; + int aa_probcnt; + struct callout aa_callout; + struct at_ifaddr *aa_next; }; +#define aa_ifp aa_ifa.ifa_ifp +#define aa_dstaddr aa_broadaddr; struct at_aliasreq { - char ifra_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - struct sockaddr_at ifra_addr; - struct sockaddr_at ifra_broadaddr; -#define ifra_dstaddr ifra_broadaddr - struct sockaddr_at ifra_mask; + char ifra_name[IFNAMSIZ]; + struct sockaddr_at ifra_addr; + struct sockaddr_at ifra_broadaddr; + struct sockaddr_at ifra_mask; }; +#define ifra_dstaddr ifra_broadaddr -#define AA_SAT(aa) \ - (&(aa->aa_addr)) -#define satosat(sa) ((struct sockaddr_at *)(sa)) +#define AA_SAT(aa) (&(aa->aa_addr)) +#define satosat(sa) ((struct sockaddr_at *)(sa)) -#define AFA_ROUTE 0x0001 -#define AFA_PROBING 0x0002 -#define AFA_PHASE2 0x0004 +#define AFA_ROUTE 0x0001 +#define AFA_PROBING 0x0002 +#define AFA_PHASE2 0x0004 #ifdef _KERNEL extern struct at_ifaddr *at_ifaddr_list; |