Merge master

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

diff --git a/libatalk/dsi/dsi_cmdreply.c b/libatalk/dsi/dsi_cmdreply.c
index f2223fff8f7400795ff27f92501f9ad21c711448..5b0d627de2c788e7356ffeb50219163d6007cb3c 100644 (file)
--- a/libatalk/dsi/dsi_cmdreply.c
+++ b/libatalk/dsi/dsi_cmdreply.c
@@ -1,6 +1,4 @@
 /*
- * $Id: dsi_cmdreply.c,v 1.4 2005-04-28 20:50:02 bfernhomberg Exp $
- *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  */
@@ -10,24 +8,29 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
+#include <arpa/inet.h>
+
 #include <atalk/dsi.h>
-#include <netatalk/endian.h>
+#include <atalk/logger.h>
 
 /* this assumes that the reply follows right after the command, saving
  * on a couple assignments. specifically, command, requestID, and
  * reserved field are assumed to already be set. */ 
 int dsi_cmdreply(DSI *dsi, const int err)
 {
-int ret;
-  dsi->header.dsi_flags = DSIFL_REPLY;
-  /*dsi->header.dsi_command = DSIFUNC_CMD;*/
-  dsi->header.dsi_len = htonl(dsi->datalen);
-  dsi->header.dsi_code = htonl(err);
-
-  ret = dsi_stream_send(dsi, dsi->data, dsi->datalen);
-  if (dsi->sigblocked)  {
-      sigprocmask(SIG_SETMASK, &dsi->oldset, NULL);
-      dsi->sigblocked = 0;
-  }
-  return ret;
+    int ret;
+
+    LOG(log_debug, logtype_dsi, "dsi_cmdreply(DSI ID: %u, len: %zd): START",
+        dsi->clientID, dsi->datalen);
+
+    dsi->header.dsi_flags = DSIFL_REPLY;
+    dsi->header.dsi_len = htonl(dsi->datalen);
+    dsi->header.dsi_code = htonl(err);
+
+    ret = dsi_stream_send(dsi, dsi->data, dsi->datalen);
+
+    LOG(log_debug, logtype_dsi, "dsi_cmdreply(DSI ID: %u, len: %zd): END",
+        dsi->clientID, dsi->datalen);
+
+    return ret;
 }