diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:16:32 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:16:32 +1100 |
commit | dff5099f13e2e679b93d3cfe7073c9cd92b19b06 (patch) | |
tree | f80cf1916ad026e5550e61da139e52899fa04629 /dispatch.c | |
parent | 76e1e368b561cabeb55c21dc205c3f6805179ad5 (diff) |
- markus@cvs.openbsd.org 2001/12/28 14:50:54
[auth1.c auth-rsa.c channels.c dispatch.c kex.c kexdh.c kexgex.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshconnect2.c sshd.c]
packet_read* no longer return the packet length, since it's not used.
Diffstat (limited to 'dispatch.c')
-rw-r--r-- | dispatch.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dispatch.c b/dispatch.c index 036c0aaa5..871fa24d2 100644 --- a/dispatch.c +++ b/dispatch.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: dispatch.c,v 1.12 2001/12/20 22:50:24 djm Exp $"); | 25 | RCSID("$OpenBSD: dispatch.c,v 1.13 2001/12/28 14:50:54 markus Exp $"); |
26 | 26 | ||
27 | #include "ssh1.h" | 27 | #include "ssh1.h" |
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
@@ -58,19 +58,18 @@ void | |||
58 | dispatch_run(int mode, int *done, void *ctxt) | 58 | dispatch_run(int mode, int *done, void *ctxt) |
59 | { | 59 | { |
60 | for (;;) { | 60 | for (;;) { |
61 | int plen; | ||
62 | int type; | 61 | int type; |
63 | u_int32_t seqnr; | 62 | u_int32_t seqnr; |
64 | 63 | ||
65 | if (mode == DISPATCH_BLOCK) { | 64 | if (mode == DISPATCH_BLOCK) { |
66 | type = packet_read_seqnr(&plen, &seqnr); | 65 | type = packet_read_seqnr(&seqnr); |
67 | } else { | 66 | } else { |
68 | type = packet_read_poll_seqnr(&plen, &seqnr); | 67 | type = packet_read_poll_seqnr(&seqnr); |
69 | if (type == SSH_MSG_NONE) | 68 | if (type == SSH_MSG_NONE) |
70 | return; | 69 | return; |
71 | } | 70 | } |
72 | if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL) | 71 | if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL) |
73 | (*dispatch[type])(type, plen, seqnr, ctxt); | 72 | (*dispatch[type])(type, 1234, seqnr, ctxt); |
74 | else | 73 | else |
75 | packet_disconnect("protocol error: rcvd type %d", type); | 74 | packet_disconnect("protocol error: rcvd type %d", type); |
76 | if (done != NULL && *done) | 75 | if (done != NULL && *done) |