diff options
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r-- | usr.bin/ssh/channels.c | 27 | ||||
-rw-r--r-- | usr.bin/ssh/channels.h | 3 |
2 files changed, 2 insertions, 28 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 5747c8c9e56..126ba94c54b 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.163 2002/01/27 14:57:46 stevesk Exp $"); +RCSID("$OpenBSD: channels.c,v 1.164 2002/02/03 17:55:55 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1941,31 +1941,6 @@ channel_input_open_failure(int type, u_int32_t seq, void *ctxt) } void -channel_input_channel_request(int type, u_int32_t seq, void *ctxt) -{ - int id; - Channel *c; - - id = packet_get_int(); - c = channel_lookup(id); - - if (c == NULL || - (c->type != SSH_CHANNEL_OPEN && c->type != SSH_CHANNEL_LARVAL)) - packet_disconnect("Received request for " - "non-open channel %d.", id); - if (c->cb_fn != NULL && c->cb_event == type) { - debug2("callback start"); - c->cb_fn(c->self, c->cb_arg); - debug2("callback done"); - } else { - char *service = packet_get_string(NULL); - debug("channel %d: rcvd request for %s", c->self, service); - debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event); - xfree(service); - } -} - -void channel_input_window_adjust(int type, u_int32_t seq, void *ctxt) { Channel *c; diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h index 6c6008f91b8..fa43b8ea69d 100644 --- a/usr.bin/ssh/channels.h +++ b/usr.bin/ssh/channels.h @@ -32,7 +32,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: channels.h,v 1.60 2002/01/16 13:17:51 markus Exp $"); */ +/* RCSID("$OpenBSD: channels.h,v 1.61 2002/02/03 17:55:55 markus Exp $"); */ #ifndef CHANNEL_H #define CHANNEL_H @@ -157,7 +157,6 @@ int channel_close_fd(int *); /* protocol handler */ -void channel_input_channel_request(int, u_int32_t, void *); void channel_input_close(int, u_int32_t, void *); void channel_input_close_confirmation(int, u_int32_t, void *); void channel_input_data(int, u_int32_t, void *); |