- (stevesk) rijndael.c: cleanup missing declaration warnings.

[openssh.git] / serverloop.c

diff --git a/serverloop.c b/serverloop.c
index b08fcfd92d853a3cf1e3507882878feaea73277e..25320348b527237f322b7dae32c39d60187cf079 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -2,12 +2,36 @@
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * Created: Sun Sep 10 00:30:37 1995 ylo
  * Server main loop for handling the interactive session.
- */
-/*
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ *
  * SSH2 support by Markus Friedl.
  * Copyright (c) 2000 Markus Friedl. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
@@ -23,6 +47,7 @@
 #include "ssh2.h"
 #include "session.h"
 #include "dispatch.h"
+#include "auth-options.h"
 
 static Buffer stdin_buffer;    /* Buffer for stdin data. */
 static Buffer stdout_buffer;   /* Buffer for stdout data. */
@@ -363,7 +388,7 @@ drain_output()
 void
 process_buffered_input_packets()
 {
-       dispatch_run(DISPATCH_NONBLOCK, NULL);
+       dispatch_run(DISPATCH_NONBLOCK, NULL, NULL);
 }
 
 /*
@@ -392,6 +417,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
        child_terminated = 0;
        child_has_selected = 0;
        signal(SIGCHLD, sigchld_handler);
+       signal(SIGPIPE, SIG_IGN);
 
        /* Initialize our global variables. */
        fdin = fdin_arg;
@@ -625,6 +651,7 @@ server_loop2(void)
        debug("Entering interactive session for SSH2.");
 
        signal(SIGCHLD, sigchld_handler2);
+       signal(SIGPIPE, SIG_IGN);
        child_terminated = 0;
        connection_in = packet_get_connection_in();
        connection_out = packet_get_connection_out();
@@ -661,7 +688,7 @@ server_loop2(void)
 }
 
 void
-server_input_stdin_data(int type, int plen)
+server_input_stdin_data(int type, int plen, void *ctxt)
 {
        char *data;
        unsigned int data_len;
@@ -678,7 +705,7 @@ server_input_stdin_data(int type, int plen)
 }
 
 void
-server_input_eof(int type, int plen)
+server_input_eof(int type, int plen, void *ctxt)
 {
        /*
         * Eof from the client.  The stdin descriptor to the
@@ -691,7 +718,7 @@ server_input_eof(int type, int plen)
 }
 
 void
-server_input_window_size(int type, int plen)
+server_input_window_size(int type, int plen, void *ctxt)
 {
        int row = packet_get_int();
        int col = packet_get_int();
@@ -719,18 +746,25 @@ input_direct_tcpip(void)
 
        debug("open direct-tcpip: from %s port %d to %s port %d",
           originator, originator_port, target, target_port);
+
        /* XXX check permission */
+       if (no_port_forwarding_flag) {
+               xfree(target);
+               xfree(originator);
+               return -1;
+       }
        sock = channel_connect_to(target, target_port);
        xfree(target);
        xfree(originator);
        if (sock < 0)
                return -1;
        return channel_new("direct-tcpip", SSH_CHANNEL_OPEN,
-           sock, sock, -1, 4*1024, 32*1024, 0, xstrdup("direct-tcpip"));
+           sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT,
+           CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip"));
 }
 
 void
-server_input_channel_open(int type, int plen)
+server_input_channel_open(int type, int plen, void *ctxt)
 {
        Channel *c = NULL;
        char *ctype;
@@ -745,7 +779,7 @@ server_input_channel_open(int type, int plen)
        rwindow = packet_get_int();
        rmaxpack = packet_get_int();
 
-       debug("channel_input_open: ctype %s rchan %d win %d max %d",
+       debug("server_input_channel_open: ctype %s rchan %d win %d max %d",
            ctype, rchan, rwindow, rmaxpack);
 
        if (strcmp(ctype, "session") == 0) {
@@ -759,7 +793,8 @@ server_input_channel_open(int type, int plen)
                 * CHANNEL_REQUEST messages is registered.
                 */
                id = channel_new(ctype, SSH_CHANNEL_LARVAL,
-                   -1, -1, -1, 0, 32*1024, 0, xstrdup("server-session"));
+                   -1, -1, -1, 0, CHAN_SES_PACKET_DEFAULT,
+                   0, xstrdup("server-session"));
                if (session_open(id) == 1) {
                        channel_register_callback(id, SSH2_MSG_CHANNEL_REQUEST,
                            session_input_channel_req, (void *)0);