- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / dispatch.c

diff --git a/dispatch.c b/dispatch.c
index ce32bc22f21ecab4e5c4b94a6a91be8058321b15..64bb8094742706b164d577463365617110eee9e0 100644 (file)
--- a/dispatch.c
+++ b/dispatch.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dispatch.c,v 1.22 2008/10/31 15:05:34 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -21,8 +22,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "includes.h"
-RCSID("$OpenBSD: dispatch.c,v 1.15 2002/01/11 13:39:36 markus Exp $");
+
+#include <sys/types.h>
+
+#include <signal.h>
+#include <stdarg.h>
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -31,7 +37,6 @@ RCSID("$OpenBSD: dispatch.c,v 1.15 2002/01/11 13:39:36 markus Exp $");
 #include "packet.h"
 #include "compat.h"
 
-#define DISPATCH_MIN   0
 #define DISPATCH_MAX   255
 
 dispatch_fn *dispatch[DISPATCH_MAX];
@@ -39,7 +44,7 @@ dispatch_fn *dispatch[DISPATCH_MAX];
 void
 dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
 {
-       log("dispatch_protocol_error: type %d seq %u", type, seq);
+       logit("dispatch_protocol_error: type %d seq %u", type, seq);
        if (!compat20)
                fatal("protocol error");
        packet_start(SSH2_MSG_UNIMPLEMENTED);
@@ -50,7 +55,7 @@ dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
 void
 dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt)
 {
-       log("dispatch_protocol_ignore: type %d seq %u", type, seq);
+       logit("dispatch_protocol_ignore: type %d seq %u", type, seq);
 }
 void
 dispatch_init(dispatch_fn *dflt)
@@ -76,7 +81,7 @@ dispatch_set(int type, dispatch_fn *fn)
        dispatch[type] = fn;
 }
 void
-dispatch_run(int mode, int *done, void *ctxt)
+dispatch_run(int mode, volatile sig_atomic_t *done, void *ctxt)
 {
        for (;;) {
                int type;