- djm@cvs.openbsd.org 2001/12/21 10:06:43

[openssh.git] / dispatch.c

diff --git a/dispatch.c b/dispatch.c
index 8df08b173973cccf7c46b8329c9cd2a12a834371..036c0aaa5b32ee16d45395fbfbf19d0093050994 100644 (file)
--- a/dispatch.c
+++ b/dispatch.c
@@ -9,11 +9,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
@@ -27,10 +22,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: dispatch.c,v 1.3 2000/06/20 01:39:41 markus Exp $");
-#include "ssh.h"
+RCSID("$OpenBSD: dispatch.c,v 1.12 2001/12/20 22:50:24 djm Exp $");
+
+#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
@@ -38,9 +37,10 @@ RCSID("$OpenBSD: dispatch.c,v 1.3 2000/06/20 01:39:41 markus Exp $");
 dispatch_fn *dispatch[DISPATCH_MAX];
 
 void
-dispatch_protocol_error(int type, int plen)
+dispatch_protocol_error(int type, int plen, u_int32_t seq, void *ctxt)
 {
-       error("Hm, dispatch protocol error: type %d plen %d", type, plen);
+       fatal("dispatch_protocol_error: type %d seq %u plen %d", type, 
+           seq, plen);
 }
 void
 dispatch_init(dispatch_fn *dflt)
@@ -55,23 +55,24 @@ dispatch_set(int type, dispatch_fn *fn)
        dispatch[type] = fn;
 }
 void
-dispatch_run(int mode, int *done)
+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(&plen, &seqnr);
                } else {
-                       type = packet_read_poll(&plen);
+                       type = packet_read_poll_seqnr(&plen, &seqnr);
                        if (type == SSH_MSG_NONE)
                                return;
                }
                if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL)
-                       (*dispatch[type])(type, plen);
+                       (*dispatch[type])(type, plen, seqnr, ctxt);
                else
-                       packet_disconnect("protocol error: rcvd type %d", type);        
+                       packet_disconnect("protocol error: rcvd type %d", type);
                if (done != NULL && *done)
                        return;
        }