Update NEWS

[netatalk.git] / libatalk / netddp / netddp_open.c

diff --git a/libatalk/netddp/netddp_open.c b/libatalk/netddp/netddp_open.c
index 999a243406473ff2b8ce6bf92a2a27f45e401a17..20ab8efc3b8c98433d7d10bceb47d771f57bfcf9 100644 (file)
--- a/libatalk/netddp/netddp_open.c
+++ b/libatalk/netddp/netddp_open.c
@@ -1,4 +1,6 @@
 /* 
+ * $Id: netddp_open.c,v 1.9 2005-04-28 20:50:02 bfernhomberg Exp $
+ *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -7,7 +9,9 @@
  * various address info if requested as well.
  */
 
-static int _netddp_open_dummy;
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <string.h>
@@ -15,15 +19,20 @@ static int _netddp_open_dummy;
 #include <sys/socket.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
-#endif
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
+#endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>
 #include <atalk/netddp.h>
 
 int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
 {
+
+#ifdef NO_DDP
+    return -1;
+#else /* !NO_DDP */
+
     int s;
 
 #ifdef MACOSX_SERVER
@@ -49,8 +58,8 @@ int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
       bridge->sat_addr.s_node = baddress.node;
       bridge->sat_port = baddress.socket;
     }
-#else
-    int len;
+#else /* MACOSX_SERVER */
+    socklen_t len;
 
     if ((s = socket( AF_APPLETALK, SOCK_DGRAM, 0 )) < 0) 
        return -1;
@@ -71,7 +80,8 @@ int netddp_open(struct sockaddr_at *addr, struct sockaddr_at *bridge)
         close(s);
        return -1;
     }
-#endif
+#endif /* MACOSX_SERVER */
 
     return s;
+#endif /* NO_DDP */
 }