diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:23:52 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:50:05 +1000 |
commit | 2ae666a8fc20b3b871b2f1b90ad65cc027336ccd (patch) | |
tree | f13f1c949ae60c16160acebbfb680c3dc7b13fe5 /dispatch.c | |
parent | 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6 (diff) |
upstream commit
protocol handlers all get struct ssh passed; ok djm@
Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d
Diffstat (limited to 'dispatch.c')
-rw-r--r-- | dispatch.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dispatch.c b/dispatch.c index 7ef9a38c7..5b2fc41ca 100644 --- a/dispatch.c +++ b/dispatch.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dispatch.c,v 1.29 2017/04/30 23:28:42 djm Exp $ */ | 1 | /* $OpenBSD: dispatch.c,v 1.30 2017/05/30 14:23:52 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -38,9 +38,8 @@ | |||
38 | #include "ssherr.h" | 38 | #include "ssherr.h" |
39 | 39 | ||
40 | int | 40 | int |
41 | dispatch_protocol_error(int type, u_int32_t seq, void *ctx) | 41 | dispatch_protocol_error(int type, u_int32_t seq, struct ssh *ssh) |
42 | { | 42 | { |
43 | struct ssh *ssh = active_state; /* XXX */ | ||
44 | int r; | 43 | int r; |
45 | 44 | ||
46 | logit("dispatch_protocol_error: type %d seq %u", type, seq); | 45 | logit("dispatch_protocol_error: type %d seq %u", type, seq); |
@@ -53,7 +52,7 @@ dispatch_protocol_error(int type, u_int32_t seq, void *ctx) | |||
53 | } | 52 | } |
54 | 53 | ||
55 | int | 54 | int |
56 | dispatch_protocol_ignore(int type, u_int32_t seq, void *ssh) | 55 | dispatch_protocol_ignore(int type, u_int32_t seq, struct ssh *ssh) |
57 | { | 56 | { |
58 | logit("dispatch_protocol_ignore: type %d seq %u", type, seq); | 57 | logit("dispatch_protocol_ignore: type %d seq %u", type, seq); |
59 | return 0; | 58 | return 0; |