Re-style aarp with style(9): normal plethora of white space, brace,
etc, changes. Remove a small amount of #if !defined(__FreeBSD__) code. Add missing include guard for _NETATALK_AARP_H_. Remove unneeded (and conflicting) extern prototype for aarptfree().
This commit is contained in:
parent
80ffc9b73b
commit
8b0df576d2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=165971
File diff suppressed because it is too large
Load Diff
@ -27,6 +27,8 @@
|
||||
*/
|
||||
|
||||
#ifndef _NETATALK_AARP_H_
|
||||
#define _NETATALK_AARP_H_
|
||||
|
||||
/*
|
||||
* This structure is used for both phase 1 and 2. Under phase 1
|
||||
* the net is not filled in. It is in phase 2. In both cases, the
|
||||
@ -35,46 +37,46 @@
|
||||
* would be 1 and 3 respectively for phase 1 and 2.
|
||||
*/
|
||||
union aapa {
|
||||
u_char ap_pa[4];
|
||||
struct ap_node {
|
||||
u_char an_zero;
|
||||
u_char an_net[2];
|
||||
u_char an_node;
|
||||
} ap_node;
|
||||
u_char ap_pa[4];
|
||||
struct ap_node {
|
||||
u_char an_zero;
|
||||
u_char an_net[2];
|
||||
u_char an_node;
|
||||
} ap_node;
|
||||
};
|
||||
|
||||
struct ether_aarp {
|
||||
struct arphdr eaa_hdr;
|
||||
u_char aarp_sha[6];
|
||||
union aapa aarp_spu;
|
||||
u_char aarp_tha[6];
|
||||
union aapa aarp_tpu;
|
||||
struct arphdr eaa_hdr;
|
||||
u_char aarp_sha[6];
|
||||
union aapa aarp_spu;
|
||||
u_char aarp_tha[6];
|
||||
union aapa aarp_tpu;
|
||||
};
|
||||
#define aarp_hrd eaa_hdr.ar_hrd
|
||||
#define aarp_pro eaa_hdr.ar_pro
|
||||
#define aarp_hln eaa_hdr.ar_hln
|
||||
#define aarp_pln eaa_hdr.ar_pln
|
||||
#define aarp_op eaa_hdr.ar_op
|
||||
#define aarp_spa aarp_spu.ap_node.an_node
|
||||
#define aarp_tpa aarp_tpu.ap_node.an_node
|
||||
#define aarp_spnet aarp_spu.ap_node.an_net
|
||||
#define aarp_tpnet aarp_tpu.ap_node.an_net
|
||||
#define aarp_spnode aarp_spu.ap_node.an_node
|
||||
#define aarp_tpnode aarp_tpu.ap_node.an_node
|
||||
#define aarp_hrd eaa_hdr.ar_hrd
|
||||
#define aarp_pro eaa_hdr.ar_pro
|
||||
#define aarp_hln eaa_hdr.ar_hln
|
||||
#define aarp_pln eaa_hdr.ar_pln
|
||||
#define aarp_op eaa_hdr.ar_op
|
||||
#define aarp_spa aarp_spu.ap_node.an_node
|
||||
#define aarp_tpa aarp_tpu.ap_node.an_node
|
||||
#define aarp_spnet aarp_spu.ap_node.an_net
|
||||
#define aarp_tpnet aarp_tpu.ap_node.an_net
|
||||
#define aarp_spnode aarp_spu.ap_node.an_node
|
||||
#define aarp_tpnode aarp_tpu.ap_node.an_node
|
||||
|
||||
struct aarptab {
|
||||
struct at_addr aat_ataddr;
|
||||
u_char aat_enaddr[ 6 ];
|
||||
u_char aat_timer;
|
||||
u_char aat_flags;
|
||||
struct mbuf *aat_hold;
|
||||
struct at_addr aat_ataddr;
|
||||
u_char aat_enaddr[6];
|
||||
u_char aat_timer;
|
||||
u_char aat_flags;
|
||||
struct mbuf *aat_hold;
|
||||
};
|
||||
|
||||
#define AARPHRD_ETHER 0x0001
|
||||
#define AARPHRD_ETHER 0x0001
|
||||
|
||||
#define AARPOP_REQUEST 0x01
|
||||
#define AARPOP_RESPONSE 0x02
|
||||
#define AARPOP_PROBE 0x03
|
||||
#define AARPOP_REQUEST 0x01
|
||||
#define AARPOP_RESPONSE 0x02
|
||||
#define AARPOP_PROBE 0x03
|
||||
|
||||
#ifdef _KERNEL
|
||||
struct aarptab *aarptnew(struct at_addr *);
|
||||
|
@ -44,10 +44,6 @@ extern struct mtx aarptab_mtx;
|
||||
#define AARPTAB_UNLOCK_ASSERT() mtx_assert(&aarptab_mtx, MA_NOTOWNED)
|
||||
#endif
|
||||
|
||||
#ifdef _NETATALK_AARP_H_
|
||||
extern void aarptfree (struct aarptab *);
|
||||
#endif
|
||||
|
||||
struct ifnet;
|
||||
struct thread;
|
||||
struct socket;
|
||||
|
Loading…
Reference in New Issue
Block a user