Import of OpenSSH 3.1p1

[gssapi-openssh.git] / openssh / dispatch.c

diff --git a/openssh/dispatch.c b/openssh/dispatch.c
index 64873d53a1d01d81f1741e76c688769c18700f29..ce32bc22f21ecab4e5c4b94a6a91be8058321b15 100644 (file)
--- a/openssh/dispatch.c
+++ b/openssh/dispatch.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: dispatch.c,v 1.11 2001/06/10 11:29:20 markus Exp $");
+RCSID("$OpenBSD: dispatch.c,v 1.15 2002/01/11 13:39:36 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -37,18 +37,40 @@ RCSID("$OpenBSD: dispatch.c,v 1.11 2001/06/10 11:29:20 markus Exp $");
 dispatch_fn *dispatch[DISPATCH_MAX];
 
 void
-dispatch_protocol_error(int type, int plen, void *ctxt)
+dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
 {
-       fatal("dispatch_protocol_error: type %d plen %d", type, plen);
+       log("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)
+{
+       log("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;
@@ -57,18 +79,18 @@ void
 dispatch_run(int mode, int *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, ctxt);
+                       (*dispatch[type])(type, seqnr, ctxt);
                else
                        packet_disconnect("protocol error: rcvd type %d", type);
                if (done != NULL && *done)