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

[openssh.git] / dispatch.c

diff --git a/dispatch.c b/dispatch.c
index b1e34608991f83e9f5a8fb5c1f8249e3ff3470d1..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.
  *
@@ -9,11 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Markus Friedl.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -26,52 +22,82 @@
  * (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("$Id$");
-#include "ssh.h"
+
+#include <sys/types.h>
+
+#include <signal.h>
+#include <stdarg.h>
+
+#include "ssh1.h"
+#include "ssh2.h"
+#include "log.h"
 #include "dispatch.h"
 #include "packet.h"
+#include "compat.h"
 
-#define DISPATCH_MIN   0
 #define DISPATCH_MAX   255
 
 dispatch_fn *dispatch[DISPATCH_MAX];
 
 void
-dispatch_protocol_error(int type, int plen)
+dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
+{
+       logit("dispatch_protocol_error: type %d seq %u", type, seq);
+       if (!compat20)
+               fatal("protocol error");
+       packet_start(SSH2_MSG_UNIMPLEMENTED);
+       packet_put_int(seq);
+       packet_send();
+       packet_write_wait();
+}
+void
+dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt)
 {
-       error("Hm, dispatch protocol error: type %d plen %d", type, plen);
+       logit("dispatch_protocol_ignore: type %d seq %u", type, seq);
 }
 void
 dispatch_init(dispatch_fn *dflt)
 {
-       int i;
+       u_int i;
        for (i = 0; i < DISPATCH_MAX; i++)
                dispatch[i] = dflt;
 }
 void
+dispatch_range(u_int from, u_int to, dispatch_fn *fn)
+{
+       u_int i;
+
+       for (i = from; i <= to; i++) {
+               if (i >= DISPATCH_MAX)
+                       break;
+               dispatch[i] = fn;
+       }
+}
+void
 dispatch_set(int type, dispatch_fn *fn)
 {
        dispatch[type] = fn;
 }
 void
-dispatch_run(int mode, int *done)
+dispatch_run(int mode, volatile sig_atomic_t *done, void *ctxt)
 {
        for (;;) {
-               int plen;
                int type;
+               u_int32_t seqnr;
 
                if (mode == DISPATCH_BLOCK) {
-                       type = packet_read(&plen);
+                       type = packet_read_seqnr(&seqnr);
                } else {
-                       type = packet_read_poll(&plen);
+                       type = packet_read_poll_seqnr(&seqnr);
                        if (type == SSH_MSG_NONE)
                                return;
                }
                if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL)
-                       (*dispatch[type])(type, plen);
+                       (*dispatch[type])(type, seqnr, ctxt);
                else
-                       packet_disconnect("protocol error: rcvd type %d", type);        
+                       packet_disconnect("protocol error: rcvd type %d", type);
                if (done != NULL && *done)
                        return;
        }