diff options
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/serverloop.c b/serverloop.c index 8c17c0d56..c2b2d0222 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -2,12 +2,36 @@ | |||
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
5 | * Created: Sun Sep 10 00:30:37 1995 ylo | ||
6 | * Server main loop for handling the interactive session. | 5 | * Server main loop for handling the interactive session. |
7 | */ | 6 | * |
8 | /* | 7 | * As far as I am concerned, the code I have written for this software |
8 | * can be used freely for any purpose. Any derived versions of this | ||
9 | * software must be clearly marked as such, and if the derived work is | ||
10 | * incompatible with the protocol description in the RFC file, it must be | ||
11 | * called by a name other than "ssh" or "Secure Shell". | ||
12 | * | ||
9 | * SSH2 support by Markus Friedl. | 13 | * SSH2 support by Markus Friedl. |
10 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 14 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
15 | * | ||
16 | * Redistribution and use in source and binary forms, with or without | ||
17 | * modification, are permitted provided that the following conditions | ||
18 | * are met: | ||
19 | * 1. Redistributions of source code must retain the above copyright | ||
20 | * notice, this list of conditions and the following disclaimer. | ||
21 | * 2. Redistributions in binary form must reproduce the above copyright | ||
22 | * notice, this list of conditions and the following disclaimer in the | ||
23 | * documentation and/or other materials provided with the distribution. | ||
24 | * | ||
25 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
26 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
27 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
28 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
29 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
30 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
31 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
32 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
33 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
34 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
11 | */ | 35 | */ |
12 | 36 | ||
13 | #include "includes.h" | 37 | #include "includes.h" |
@@ -736,7 +760,8 @@ input_direct_tcpip(void) | |||
736 | if (sock < 0) | 760 | if (sock < 0) |
737 | return -1; | 761 | return -1; |
738 | return channel_new("direct-tcpip", SSH_CHANNEL_OPEN, | 762 | return channel_new("direct-tcpip", SSH_CHANNEL_OPEN, |
739 | sock, sock, -1, 4*1024, 32*1024, 0, xstrdup("direct-tcpip")); | 763 | sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, |
764 | CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip")); | ||
740 | } | 765 | } |
741 | 766 | ||
742 | void | 767 | void |
@@ -769,7 +794,8 @@ server_input_channel_open(int type, int plen) | |||
769 | * CHANNEL_REQUEST messages is registered. | 794 | * CHANNEL_REQUEST messages is registered. |
770 | */ | 795 | */ |
771 | id = channel_new(ctype, SSH_CHANNEL_LARVAL, | 796 | id = channel_new(ctype, SSH_CHANNEL_LARVAL, |
772 | -1, -1, -1, 0, 32*1024, 0, xstrdup("server-session")); | 797 | -1, -1, -1, 0, CHAN_SES_PACKET_DEFAULT, |
798 | 0, xstrdup("server-session")); | ||
773 | if (session_open(id) == 1) { | 799 | if (session_open(id) == 1) { |
774 | channel_register_callback(id, SSH2_MSG_CHANNEL_REQUEST, | 800 | channel_register_callback(id, SSH2_MSG_CHANNEL_REQUEST, |
775 | session_input_channel_req, (void *)0); | 801 | session_input_channel_req, (void *)0); |