upstream commit

refactor channels.c

Move static state to a "struct ssh_channels" that is allocated at
runtime and tracked as a member of struct ssh.

Explicitly pass "struct ssh" to all channels functions.

Replace use of the legacy packet APIs in channels.c.

Rework sshd_config PermitOpen handling: previously the configuration
parser would call directly into the channels layer. After the refactor
this is not possible, as the channels structures are allocated at
connection time and aren't available when the configuration is parsed.
The server config parser now tracks PermitOpen itself and explicitly
configures the channels code later.

ok markus@

Upstream-ID: 11828f161656b965cc306576422613614bea2d8f

1 files changed, 6 insertions, 2 deletions

diff --git a/packet.h b/packet.h
index 6ce6dd560..40837e9db 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.81 2017/05/31 08:09:45 markus Exp $ */
+/* $OpenBSD: packet.h,v 1.82 2017/09/12 06:32:07 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -80,6 +80,9 @@ struct ssh {
         /* Client/Server authentication context */
         void *authctxt;
 
+        /* Channels context */
+        struct ssh_channels *chanctxt;
+
         /* APP data */
         void *app_data;
 };
@@ -143,7 +146,6 @@ int      ssh_packet_not_very_much_data_to_write(struct ssh *);
 
 int      ssh_packet_connection_is_on_socket(struct ssh *);
 int      ssh_packet_remaining(struct ssh *);
-void     ssh_packet_send_ignore(struct ssh *, int);
 
 void     tty_make_modes(int, struct termios *);
 void     tty_parse_modes(int, int *);
@@ -174,6 +176,7 @@ int     sshpkt_disconnect(struct ssh *, const char *fmt, ...)
             __attribute__((format(printf, 2, 3)));
 int     sshpkt_add_padding(struct ssh *, u_char);
 void    sshpkt_fatal(struct ssh *ssh, const char *tag, int r);
+int     sshpkt_msg_ignore(struct ssh *, u_int);
 
 int     sshpkt_put(struct ssh *ssh, const void *v, size_t len);
 int     sshpkt_putb(struct ssh *ssh, const struct sshbuf *b);
@@ -192,6 +195,7 @@ int	sshpkt_get_u32(struct ssh *ssh, u_int32_t *valp);
 int     sshpkt_get_u64(struct ssh *ssh, u_int64_t *valp);
 int     sshpkt_get_string(struct ssh *ssh, u_char **valp, size_t *lenp);
 int     sshpkt_get_string_direct(struct ssh *ssh, const u_char **valp, size_t *lenp);
+int     sshpkt_peek_string_direct(struct ssh *ssh, const u_char **valp, size_t *lenp);
 int     sshpkt_get_cstring(struct ssh *ssh, char **valp, size_t *lenp);
 int     sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g);
 int     sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v);