Cleaunup and refactor ad_open

[netatalk.git] / sys / netatalk / at.h

diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 541dcb18d492c2d0f0c6d5192f9be4abf80e09ad..ddb2ab50bbd37181d57e3d11be57f4e48cc87967 100644 (file)
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -1,5 +1,5 @@
 /*
- * $Id: at.h,v 1.2 2001-06-29 14:14:47 rufustfirefly Exp $
+ * $Id: at.h,v 1.6 2008-12-18 17:31:31 morgana Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  *
@@ -9,15 +9,25 @@
 #ifndef __AT_HEADER__
 #define __AT_HEADER__
 
-#ifdef linux /* pull in the linux header */
+#if defined(linux) /* pull in the linux header */
 #include <sys/socket.h>
 #include <asm/types.h>
 #include <linux/atalk.h>
+
+#ifdef HAVE_ATALK_ADDR
+#define at_addr atalk_addr
+#define netrange atalk_netrange
+#endif /* HAVE_ATALK_ADDR */
+
 #else /* linux */
 
 #include <sys/types.h>
 #include <netinet/in.h> /* so that we can deal with sun's s_net #define */
 
+#if defined(MACOSX_SERVER) && (!defined(NO_DDP))
+#include <netat/appletalk.h>
+#endif /* MACOSX_SERVER */
+
 /*
  * Supported protocols
  */
@@ -32,8 +42,12 @@
  * These should really be in some global header file, but we can't
  * count on them being there, and it's annoying to patch system files.
  */
+#ifndef ETHERTYPE_AT
 #define ETHERTYPE_AT   0x809B          /* AppleTalk protocol */
+#endif
+#ifndef ETHERTYPE_AARP
 #define ETHERTYPE_AARP 0x80F3          /* AppleTalk ARP */
+#endif
 
 #define DDP_MAXSZ      587
 
@@ -51,6 +65,7 @@
 /*
  * AppleTalk address.
  */
+#ifndef MACOSX_SERVER
 struct at_addr {
 #ifdef s_net
 #undef s_net
@@ -58,6 +73,7 @@ struct at_addr {
     u_short    s_net;
     u_char     s_node;
 };
+#endif /* MACOSX_SERVER */
 
 #define ATADDR_ANYNET  (u_short)0x0000
 #define ATADDR_ANYNODE (u_char)0x00
@@ -71,6 +87,7 @@ struct at_addr {
  * interface.  IFACE may be filled in by the client, and is filled in
  * by the kernel.
  */
+#ifndef MACOSX_SERVER
 struct sockaddr_at {
 #ifdef BSD4_4
     u_char             sat_len;
@@ -99,6 +116,7 @@ struct sockaddr_at {
     char               sat_zero[ 8 ];
 #endif /* notdef */
 };
+#endif /* MACOSX_SERVER */
 
 struct netrange {
     u_char             nr_phase;
@@ -113,3 +131,4 @@ extern struct protosw       atalksw[];
 
 #endif /* linux */
 #endif /* __AT_HEADER__ */
+