Merge from branch-2-1

[netatalk.git] / include / atalk / dsi.h

diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index 058b7d36329b2f182c0f568ab1de59eaeac51c1e..0616774da18da49e2afb74ccc971bd13d40b6d19 100644 (file)
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -16,6 +16,10 @@
 #include <atalk/server_child.h>
 #include <netatalk/endian.h>
 
+#ifdef __OpenBSD__
+#include <sys/socket.h>
+#endif
+
 /* What a DSI packet looks like:
  0                               32
  |-------------------------------|
@@ -56,7 +60,7 @@ struct dsi_block {
 typedef struct DSI {
   dsi_proto protocol;
   struct dsi_block header;
-  struct sockaddr_in server, client;
+  struct sockaddr_storage server, client;
   
   struct itimerval timer;
 
@@ -90,6 +94,10 @@ typedef struct DSI {
   char srvloc_url[512];
 #endif 
 
+#ifdef USE_ZEROCONF
+  int zeroconf_registered;
+#endif
+
   /* buffer for OSX deadlock */
   char *buffer;
   char *start;
@@ -144,7 +152,7 @@ typedef struct DSI {
 extern DSI *dsi_init (const dsi_proto /*protocol*/,
                          const char * /*program*/, 
                          const char * /*host*/, const char * /*address*/,
-                         const int /*port*/, const int /*proxy*/,
+                         const char * /*port*/, const int /*proxy*/,
                          const u_int32_t /* server quantum */);
 extern void dsi_setstatus (DSI *, char *, const size_t);