- (djm) [Makefile.in]

[openssh.git] / dispatch.c

diff --git a/dispatch.c b/dispatch.c
index ce32bc22f21ecab4e5c4b94a6a91be8058321b15..c1d98a78e69f268491754729501ec4c9952fefcd 100644 (file)
--- a/dispatch.c
+++ b/dispatch.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dispatch.c,v 1.20 2006/07/23 01:11:05 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -22,7 +23,8 @@
  * 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 <signal.h>
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -39,7 +41,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 +52,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 +78,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;