Merge remote branch 'sf/develop' into develop

[netatalk.git] / libatalk / dsi / dsi_close.c

diff --git a/libatalk/dsi/dsi_close.c b/libatalk/dsi/dsi_close.c
index 0f0d951dfe39a6d7b96b9bdceb149afb91aa6138..80bee3fe702a79cfbd18bd7a7ac4bd8539295aaf 100644 (file)
--- a/libatalk/dsi/dsi_close.c
+++ b/libatalk/dsi/dsi_close.c
@@ -1,27 +1,31 @@
 /*
+ * $Id: dsi_close.c,v 1.4 2003-03-12 15:07:06 didg Exp $
+ *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <arpa/inet.h>
+
 #include <atalk/dsi.h>
-#include <netatalk/endian.h>
 
 void dsi_close(DSI *dsi)
 {
   /* server generated. need to set all the fields. */
-  dsi->header.dsi_flags = DSIFL_REQUEST;
-  dsi->header.dsi_command = DSIFUNC_CLOSE;
-  dsi->header.dsi_requestID = htons(dsi_serverID(dsi));
-  dsi->header.dsi_code = dsi->header.dsi_reserved = htonl(0);
-  dsi->cmdlen = 0; 
-
-  dsi_send(dsi);
-  dsi->proto_close(dsi);
+  if (!(dsi->flags & DSI_SLEEPING) && !(dsi->flags & DSI_DISCONNECTED)) {
+      dsi->header.dsi_flags = DSIFL_REQUEST;
+      dsi->header.dsi_command = DSIFUNC_CLOSE;
+      dsi->header.dsi_requestID = htons(dsi_serverID(dsi));
+      dsi->header.dsi_code = dsi->header.dsi_reserved = htonl(0);
+      dsi->cmdlen = 0; 
+      dsi_send(dsi);
+      dsi->proto_close(dsi);
+  }
   free(dsi);
 }