summaryrefslogtreecommitdiff
path: root/dispatch.c
diff options
context:
space:
mode:
Diffstat (limited to 'dispatch.c')
-rw-r--r--dispatch.c118
1 files changed, 86 insertions, 32 deletions
diff --git a/dispatch.c b/dispatch.c
index 64bb80947..afe618221 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dispatch.c,v 1.22 2008/10/31 15:05:34 stevesk Exp $ */ 1/* $OpenBSD: dispatch.c,v 1.26 2015/02/12 20:34:19 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -36,69 +36,123 @@
36#include "dispatch.h" 36#include "dispatch.h"
37#include "packet.h" 37#include "packet.h"
38#include "compat.h" 38#include "compat.h"
39#include "ssherr.h"
39 40
40#define DISPATCH_MAX 255 41int
41 42dispatch_protocol_error(int type, u_int32_t seq, void *ctx)
42dispatch_fn *dispatch[DISPATCH_MAX];
43
44void
45dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
46{ 43{
44 struct ssh *ssh = active_state; /* XXX */
45 int r;
46
47 logit("dispatch_protocol_error: type %d seq %u", type, seq); 47 logit("dispatch_protocol_error: type %d seq %u", type, seq);
48 if (!compat20) 48 if (!compat20)
49 fatal("protocol error"); 49 fatal("protocol error");
50 packet_start(SSH2_MSG_UNIMPLEMENTED); 50 if ((r = sshpkt_start(ssh, SSH2_MSG_UNIMPLEMENTED)) != 0 ||
51 packet_put_int(seq); 51 (r = sshpkt_put_u32(ssh, seq)) != 0 ||
52 packet_send(); 52 (r = sshpkt_send(ssh)) != 0 ||
53 packet_write_wait(); 53 (r = ssh_packet_write_wait(ssh)) != 0)
54 sshpkt_fatal(ssh, __func__, r);
55 return 0;
54} 56}
55void 57
56dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt) 58int
59dispatch_protocol_ignore(int type, u_int32_t seq, void *ssh)
57{ 60{
58 logit("dispatch_protocol_ignore: type %d seq %u", type, seq); 61 logit("dispatch_protocol_ignore: type %d seq %u", type, seq);
62 return 0;
59} 63}
64
60void 65void
61dispatch_init(dispatch_fn *dflt) 66ssh_dispatch_init(struct ssh *ssh, dispatch_fn *dflt)
62{ 67{
63 u_int i; 68 u_int i;
64 for (i = 0; i < DISPATCH_MAX; i++) 69 for (i = 0; i < DISPATCH_MAX; i++)
65 dispatch[i] = dflt; 70 ssh->dispatch[i] = dflt;
66} 71}
72
67void 73void
68dispatch_range(u_int from, u_int to, dispatch_fn *fn) 74ssh_dispatch_range(struct ssh *ssh, u_int from, u_int to, dispatch_fn *fn)
69{ 75{
70 u_int i; 76 u_int i;
71 77
72 for (i = from; i <= to; i++) { 78 for (i = from; i <= to; i++) {
73 if (i >= DISPATCH_MAX) 79 if (i >= DISPATCH_MAX)
74 break; 80 break;
75 dispatch[i] = fn; 81 ssh->dispatch[i] = fn;
76 } 82 }
77} 83}
84
78void 85void
79dispatch_set(int type, dispatch_fn *fn) 86ssh_dispatch_set(struct ssh *ssh, int type, dispatch_fn *fn)
80{ 87{
81 dispatch[type] = fn; 88 ssh->dispatch[type] = fn;
82} 89}
83void 90
84dispatch_run(int mode, volatile sig_atomic_t *done, void *ctxt) 91int
92ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done,
93 void *ctxt)
85{ 94{
86 for (;;) { 95 int r;
87 int type; 96 u_char type;
88 u_int32_t seqnr; 97 u_int32_t seqnr;
89 98
99 for (;;) {
90 if (mode == DISPATCH_BLOCK) { 100 if (mode == DISPATCH_BLOCK) {
91 type = packet_read_seqnr(&seqnr); 101 r = ssh_packet_read_seqnr(ssh, &type, &seqnr);
102 if (r != 0)
103 return r;
92 } else { 104 } else {
93 type = packet_read_poll_seqnr(&seqnr); 105 r = ssh_packet_read_poll_seqnr(ssh, &type, &seqnr);
106 if (r != 0)
107 return r;
94 if (type == SSH_MSG_NONE) 108 if (type == SSH_MSG_NONE)
95 return; 109 return 0;
110 }
111 if (type > 0 && type < DISPATCH_MAX &&
112 ssh->dispatch[type] != NULL) {
113 if (ssh->dispatch_skip_packets) {
114 debug2("skipped packet (type %u)", type);
115 ssh->dispatch_skip_packets--;
116 continue;
117 }
118 /* XXX 'ssh' will replace 'ctxt' later */
119 r = (*ssh->dispatch[type])(type, seqnr, ctxt);
120 if (r != 0)
121 return r;
122 } else {
123 r = sshpkt_disconnect(ssh,
124 "protocol error: rcvd type %d", type);
125 if (r != 0)
126 return r;
127 return SSH_ERR_DISCONNECTED;
96 } 128 }
97 if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL)
98 (*dispatch[type])(type, seqnr, ctxt);
99 else
100 packet_disconnect("protocol error: rcvd type %d", type);
101 if (done != NULL && *done) 129 if (done != NULL && *done)
102 return; 130 return 0;
131 }
132}
133
134void
135ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done,
136 void *ctxt)
137{
138 int r;
139
140 if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) {
141 switch (r) {
142 case SSH_ERR_CONN_CLOSED:
143 logit("Connection closed by %.200s",
144 ssh_remote_ipaddr(ssh));
145 cleanup_exit(255);
146 case SSH_ERR_CONN_TIMEOUT:
147 logit("Connection to %.200s timed out while "
148 "waiting to read", ssh_remote_ipaddr(ssh));
149 cleanup_exit(255);
150 case SSH_ERR_DISCONNECTED:
151 logit("Disconnected from %.200s",
152 ssh_remote_ipaddr(ssh));
153 cleanup_exit(255);
154 default:
155 fatal("%s: %s", __func__, ssh_err(r));
156 }
103 } 157 }
104} 158}