diff options
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/channels.c b/channels.c index fd1b124ee..7c0997c5d 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.153 2001/12/28 14:50:54 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.154 2001/12/28 15:06:00 markus Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -1710,7 +1710,7 @@ channel_output_poll(void) | |||
1710 | /* -- protocol input */ | 1710 | /* -- protocol input */ |
1711 | 1711 | ||
1712 | void | 1712 | void |
1713 | channel_input_data(int type, int plen, u_int32_t seq, void *ctxt) | 1713 | channel_input_data(int type, u_int32_t seq, void *ctxt) |
1714 | { | 1714 | { |
1715 | int id; | 1715 | int id; |
1716 | char *data; | 1716 | char *data; |
@@ -1754,7 +1754,7 @@ channel_input_data(int type, int plen, u_int32_t seq, void *ctxt) | |||
1754 | } | 1754 | } |
1755 | 1755 | ||
1756 | void | 1756 | void |
1757 | channel_input_extended_data(int type, int plen, u_int32_t seq, void *ctxt) | 1757 | channel_input_extended_data(int type, u_int32_t seq, void *ctxt) |
1758 | { | 1758 | { |
1759 | int id; | 1759 | int id; |
1760 | int tcode; | 1760 | int tcode; |
@@ -1794,7 +1794,7 @@ channel_input_extended_data(int type, int plen, u_int32_t seq, void *ctxt) | |||
1794 | } | 1794 | } |
1795 | 1795 | ||
1796 | void | 1796 | void |
1797 | channel_input_ieof(int type, int plen, u_int32_t seq, void *ctxt) | 1797 | channel_input_ieof(int type, u_int32_t seq, void *ctxt) |
1798 | { | 1798 | { |
1799 | int id; | 1799 | int id; |
1800 | Channel *c; | 1800 | Channel *c; |
@@ -1815,7 +1815,7 @@ channel_input_ieof(int type, int plen, u_int32_t seq, void *ctxt) | |||
1815 | } | 1815 | } |
1816 | 1816 | ||
1817 | void | 1817 | void |
1818 | channel_input_close(int type, int plen, u_int32_t seq, void *ctxt) | 1818 | channel_input_close(int type, u_int32_t seq, void *ctxt) |
1819 | { | 1819 | { |
1820 | int id; | 1820 | int id; |
1821 | Channel *c; | 1821 | Channel *c; |
@@ -1853,7 +1853,7 @@ channel_input_close(int type, int plen, u_int32_t seq, void *ctxt) | |||
1853 | 1853 | ||
1854 | /* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */ | 1854 | /* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */ |
1855 | void | 1855 | void |
1856 | channel_input_oclose(int type, int plen, u_int32_t seq, void *ctxt) | 1856 | channel_input_oclose(int type, u_int32_t seq, void *ctxt) |
1857 | { | 1857 | { |
1858 | int id = packet_get_int(); | 1858 | int id = packet_get_int(); |
1859 | Channel *c = channel_lookup(id); | 1859 | Channel *c = channel_lookup(id); |
@@ -1865,7 +1865,7 @@ channel_input_oclose(int type, int plen, u_int32_t seq, void *ctxt) | |||
1865 | } | 1865 | } |
1866 | 1866 | ||
1867 | void | 1867 | void |
1868 | channel_input_close_confirmation(int type, int plen, u_int32_t seq, void *ctxt) | 1868 | channel_input_close_confirmation(int type, u_int32_t seq, void *ctxt) |
1869 | { | 1869 | { |
1870 | int id = packet_get_int(); | 1870 | int id = packet_get_int(); |
1871 | Channel *c = channel_lookup(id); | 1871 | Channel *c = channel_lookup(id); |
@@ -1881,7 +1881,7 @@ channel_input_close_confirmation(int type, int plen, u_int32_t seq, void *ctxt) | |||
1881 | } | 1881 | } |
1882 | 1882 | ||
1883 | void | 1883 | void |
1884 | channel_input_open_confirmation(int type, int plen, u_int32_t seq, void *ctxt) | 1884 | channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt) |
1885 | { | 1885 | { |
1886 | int id, remote_id; | 1886 | int id, remote_id; |
1887 | Channel *c; | 1887 | Channel *c; |
@@ -1928,7 +1928,7 @@ reason2txt(int reason) | |||
1928 | } | 1928 | } |
1929 | 1929 | ||
1930 | void | 1930 | void |
1931 | channel_input_open_failure(int type, int plen, u_int32_t seq, void *ctxt) | 1931 | channel_input_open_failure(int type, u_int32_t seq, void *ctxt) |
1932 | { | 1932 | { |
1933 | int id, reason; | 1933 | int id, reason; |
1934 | char *msg = NULL, *lang = NULL; | 1934 | char *msg = NULL, *lang = NULL; |
@@ -1959,7 +1959,7 @@ channel_input_open_failure(int type, int plen, u_int32_t seq, void *ctxt) | |||
1959 | } | 1959 | } |
1960 | 1960 | ||
1961 | void | 1961 | void |
1962 | channel_input_channel_request(int type, int plen, u_int32_t seq, void *ctxt) | 1962 | channel_input_channel_request(int type, u_int32_t seq, void *ctxt) |
1963 | { | 1963 | { |
1964 | int id; | 1964 | int id; |
1965 | Channel *c; | 1965 | Channel *c; |
@@ -1984,7 +1984,7 @@ channel_input_channel_request(int type, int plen, u_int32_t seq, void *ctxt) | |||
1984 | } | 1984 | } |
1985 | 1985 | ||
1986 | void | 1986 | void |
1987 | channel_input_window_adjust(int type, int plen, u_int32_t seq, void *ctxt) | 1987 | channel_input_window_adjust(int type, u_int32_t seq, void *ctxt) |
1988 | { | 1988 | { |
1989 | Channel *c; | 1989 | Channel *c; |
1990 | int id, adjust; | 1990 | int id, adjust; |
@@ -2008,7 +2008,7 @@ channel_input_window_adjust(int type, int plen, u_int32_t seq, void *ctxt) | |||
2008 | } | 2008 | } |
2009 | 2009 | ||
2010 | void | 2010 | void |
2011 | channel_input_port_open(int type, int plen, u_int32_t seq, void *ctxt) | 2011 | channel_input_port_open(int type, u_int32_t seq, void *ctxt) |
2012 | { | 2012 | { |
2013 | Channel *c = NULL; | 2013 | Channel *c = NULL; |
2014 | u_short host_port; | 2014 | u_short host_port; |
@@ -2615,7 +2615,7 @@ x11_connect_display(void) | |||
2615 | */ | 2615 | */ |
2616 | 2616 | ||
2617 | void | 2617 | void |
2618 | x11_input_open(int type, int plen, u_int32_t seq, void *ctxt) | 2618 | x11_input_open(int type, u_int32_t seq, void *ctxt) |
2619 | { | 2619 | { |
2620 | Channel *c = NULL; | 2620 | Channel *c = NULL; |
2621 | int remote_id, sock = 0; | 2621 | int remote_id, sock = 0; |
@@ -2662,7 +2662,7 @@ x11_input_open(int type, int plen, u_int32_t seq, void *ctxt) | |||
2662 | 2662 | ||
2663 | /* dummy protocol handler that denies SSH-1 requests (agent/x11) */ | 2663 | /* dummy protocol handler that denies SSH-1 requests (agent/x11) */ |
2664 | void | 2664 | void |
2665 | deny_input_open(int type, int plen, u_int32_t seq, void *ctxt) | 2665 | deny_input_open(int type, u_int32_t seq, void *ctxt) |
2666 | { | 2666 | { |
2667 | int rchan = packet_get_int(); | 2667 | int rchan = packet_get_int(); |
2668 | switch (type) { | 2668 | switch (type) { |
@@ -2673,7 +2673,7 @@ deny_input_open(int type, int plen, u_int32_t seq, void *ctxt) | |||
2673 | error("Warning: ssh server tried X11 forwarding."); | 2673 | error("Warning: ssh server tried X11 forwarding."); |
2674 | break; | 2674 | break; |
2675 | default: | 2675 | default: |
2676 | error("deny_input_open: type %d plen %d", type, plen); | 2676 | error("deny_input_open: type %d", type); |
2677 | break; | 2677 | break; |
2678 | } | 2678 | } |
2679 | error("Warning: this is probably a break in attempt by a malicious server."); | 2679 | error("Warning: this is probably a break in attempt by a malicious server."); |
@@ -2873,7 +2873,7 @@ auth_input_request_forwarding(struct passwd * pw) | |||
2873 | /* This is called to process an SSH_SMSG_AGENT_OPEN message. */ | 2873 | /* This is called to process an SSH_SMSG_AGENT_OPEN message. */ |
2874 | 2874 | ||
2875 | void | 2875 | void |
2876 | auth_input_open_request(int type, int plen, u_int32_t seq, void *ctxt) | 2876 | auth_input_open_request(int type, u_int32_t seq, void *ctxt) |
2877 | { | 2877 | { |
2878 | Channel *c = NULL; | 2878 | Channel *c = NULL; |
2879 | int remote_id, sock; | 2879 | int remote_id, sock; |