1) try a better workaround for deadlocks when both the server and the client are...

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

diff --git a/libatalk/dsi/dsi_init.c b/libatalk/dsi/dsi_init.c
index 4d0e3026fb3967746f0f1940e3f9f9278008bca6..5ac8dec74f7ba1048744125f2d7f033882553cb2 100644 (file)
--- a/libatalk/dsi/dsi_init.c
+++ b/libatalk/dsi/dsi_init.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_init.c,v 1.4 2005-04-28 20:50:02 bfernhomberg Exp $
+ * $Id: dsi_init.c,v 1.9 2009-10-25 06:13:11 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -28,15 +28,6 @@ DSI *dsi_init(const dsi_proto protocol, const char *program,
     dsi->server_quantum = quantum; /* default server quantum */
     dsi->program = program;
 
-    /* signals to block. we actually disable timers for "known" 
-     * large transfers (i.e., dsi_read/write). */
-    sigemptyset(&dsi->sigblockset);
-    sigaddset(&dsi->sigblockset, SIGTERM);
-    sigaddset(&dsi->sigblockset, SIGHUP);
-    sigaddset(&dsi->sigblockset, SIGALRM);
-    sigaddset(&dsi->sigblockset, SIGUSR1);
-    /* always block SIGUSR2 even if SERVERTEXT is not defined */
-    sigaddset(&dsi->sigblockset, SIGUSR2);
     switch (protocol) {
       /* currently the only transport protocol that exists for dsi */
     case DSI_TCPIP: 
@@ -55,7 +46,7 @@ DSI *dsi_init(const dsi_proto protocol, const char *program,
     return dsi;
 }
 
-void dsi_setstatus(DSI *dsi, u_int8_t *status, const int slen)
+void dsi_setstatus(DSI *dsi, char *status, const size_t slen)
 {
     dsi->status = status;
     dsi->statuslen = slen;