# HG changeset patch # User Matt Johnston # Date 1643267369 -28800 # Node ID 5001e9c5641fb7268fbbee88d95815285202cb68 # Parent 1d86a58fb52da37a29fcf33a815f001c5da636f2# Parent ed3326f218883822090560aebca9a22573eb1297 Merge netio changes diff -r ed3326f21888 -r 5001e9c5641f channel.h --- a/channel.h Tue Jan 25 17:57:05 2022 +0800 +++ b/channel.h Thu Jan 27 15:09:29 2022 +0800 @@ -28,6 +28,7 @@ #include "includes.h" #include "buffer.h" #include "circbuffer.h" +#include "netio.h" #define SSH_OPEN_ADMINISTRATIVELY_PROHIBITED 1 #define SSH_OPEN_CONNECT_FAILED 2 @@ -41,13 +42,6 @@ struct ChanType; -enum dropbear_channel_prio { - DROPBEAR_CHANNEL_PRIO_INTERACTIVE, /* pty shell, x11 */ - DROPBEAR_CHANNEL_PRIO_UNKNOWABLE, /* tcp - can't know what's being forwarded */ - DROPBEAR_CHANNEL_PRIO_BULK, /* the rest - probably scp, rsync, git, or something */ - DROPBEAR_CHANNEL_PRIO_EARLY, /* channel is still being set up */ -}; - struct Channel { unsigned int index; /* the local channel index */ @@ -88,7 +82,7 @@ const struct ChanType* type; - enum dropbear_channel_prio prio; + enum dropbear_prio prio; }; struct ChanType { diff -r ed3326f21888 -r 5001e9c5641f cli-chansession.c --- a/cli-chansession.c Tue Jan 25 17:57:05 2022 +0800 +++ b/cli-chansession.c Thu Jan 27 15:09:29 2022 +0800 @@ -348,7 +348,6 @@ } static int cli_init_netcat(struct Channel *channel) { - channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE; return cli_init_stdpipe_sess(channel); } @@ -361,12 +360,9 @@ cli_setup_agent(channel); } #endif - if (cli_opts.wantpty) { send_chansess_pty_req(channel); - channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE; - } else { - channel->prio = DROPBEAR_CHANNEL_PRIO_BULK; + channel->prio = DROPBEAR_PRIO_LOWDELAY; } send_chansess_shell_req(channel); @@ -375,7 +371,7 @@ cli_tty_setup(); channel->read_mangler = cli_escape_handler; cli_ses.last_char = '\r'; - } + } return 0; /* Success */ } diff -r ed3326f21888 -r 5001e9c5641f cli-main.c --- a/cli-main.c Tue Jan 25 17:57:05 2022 +0800 +++ b/cli-main.c Thu Jan 27 15:09:29 2022 +0800 @@ -84,8 +84,9 @@ } else #endif { - progress = connect_remote(cli_opts.remotehost, cli_opts.remoteport, - cli_connected, &ses, cli_opts.bind_address, cli_opts.bind_port); + progress = connect_remote(cli_opts.remotehost, cli_opts.remoteport, + cli_connected, &ses, cli_opts.bind_address, cli_opts.bind_port, + DROPBEAR_PRIO_LOWDELAY); sock_in = sock_out = -1; } diff -r ed3326f21888 -r 5001e9c5641f cli-session.c --- a/cli-session.c Tue Jan 25 17:57:05 2022 +0800 +++ b/cli-session.c Thu Jan 27 15:09:29 2022 +0800 @@ -102,6 +102,9 @@ dropbear_exit("Connect failed: %s", errstring); } myses->sock_in = myses->sock_out = sock; + TRACE(("cli_connected")) + ses.socket_prio = DROPBEAR_PRIO_NORMAL; + /* switches to lowdelay */ update_channel_prio(); } diff -r ed3326f21888 -r 5001e9c5641f cli-tcpfwd.c --- a/cli-tcpfwd.c Tue Jan 25 17:57:05 2022 +0800 +++ b/cli-tcpfwd.c Thu Jan 27 15:09:29 2022 +0800 @@ -51,7 +51,7 @@ unsigned int remoteport); static const struct ChanType cli_chan_tcplocal = { "direct-tcpip", - tcp_prio_inithandler, + NULL, NULL, NULL, NULL, @@ -272,10 +272,9 @@ goto out; } - channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE; - snprintf(portstring, sizeof(portstring), "%u", fwd->connectport); - channel->conn_pending = connect_remote(fwd->connectaddr, portstring, channel_connect_done, channel, NULL, NULL); + channel->conn_pending = connect_remote(fwd->connectaddr, portstring, channel_connect_done, + channel, NULL, NULL, DROPBEAR_PRIO_NORMAL); err = SSH_OPEN_IN_PROGRESS; diff -r ed3326f21888 -r 5001e9c5641f common-channel.c --- a/common-channel.c Tue Jan 25 17:57:05 2022 +0800 +++ b/common-channel.c Thu Jan 27 15:09:29 2022 +0800 @@ -162,7 +162,7 @@ newchan->recvdonelen = 0; newchan->recvmaxpacket = RECV_MAX_CHANNEL_DATA_LEN; - newchan->prio = DROPBEAR_CHANNEL_PRIO_EARLY; /* inithandler sets it */ + newchan->prio = DROPBEAR_PRIO_NORMAL; ses.channels[i] = newchan; ses.chancount++; @@ -955,9 +955,7 @@ } } - if (channel->prio == DROPBEAR_CHANNEL_PRIO_EARLY) { - channel->prio = DROPBEAR_CHANNEL_PRIO_BULK; - } + update_channel_prio(); /* success */ send_msg_channel_open_confirmation(channel, channel->recvwindow, @@ -970,8 +968,6 @@ cleanup: m_free(type); - - update_channel_prio(); TRACE(("leave recv_msg_channel_open")) } @@ -1166,11 +1162,8 @@ } } - if (channel->prio == DROPBEAR_CHANNEL_PRIO_EARLY) { - channel->prio = DROPBEAR_CHANNEL_PRIO_BULK; - } update_channel_prio(); - + TRACE(("leave recv_msg_channel_open_confirmation")) } diff -r ed3326f21888 -r 5001e9c5641f common-session.c --- a/common-session.c Tue Jan 25 17:57:05 2022 +0800 +++ b/common-session.c Thu Jan 27 15:09:29 2022 +0800 @@ -64,7 +64,7 @@ setnonblocking(sock_out); } - ses.socket_prio = DROPBEAR_PRIO_DEFAULT; + ses.socket_prio = DROPBEAR_PRIO_NORMAL; /* Sets it to lowdelay */ update_channel_prio(); @@ -667,26 +667,16 @@ return; } - new_prio = DROPBEAR_PRIO_BULK; + new_prio = DROPBEAR_PRIO_NORMAL; for (i = 0; i < ses.chansize; i++) { struct Channel *channel = ses.channels[i]; - if (!channel || channel->prio == DROPBEAR_CHANNEL_PRIO_EARLY) { - if (channel && channel->prio == DROPBEAR_CHANNEL_PRIO_EARLY) { - TRACE(("update_channel_prio: early %d", channel->index)) - } + if (!channel) { continue; } any = 1; - if (channel->prio == DROPBEAR_CHANNEL_PRIO_INTERACTIVE) - { - TRACE(("update_channel_prio: lowdelay %d", channel->index)) + if (channel->prio == DROPBEAR_PRIO_LOWDELAY) { new_prio = DROPBEAR_PRIO_LOWDELAY; break; - } else if (channel->prio == DROPBEAR_CHANNEL_PRIO_UNKNOWABLE - && new_prio == DROPBEAR_PRIO_BULK) - { - TRACE(("update_channel_prio: unknowable %d", channel->index)) - new_prio = DROPBEAR_PRIO_DEFAULT; } } diff -r ed3326f21888 -r 5001e9c5641f netio.c --- a/netio.c Tue Jan 25 17:57:05 2022 +0800 +++ b/netio.c Thu Jan 27 15:09:29 2022 +0800 @@ -20,6 +20,7 @@ char* errstring; char *bind_address, *bind_port; + enum dropbear_prio prio; }; /* Deallocate a progress connection. Removes from the pending list if iter!=NULL. @@ -110,6 +111,7 @@ ses.maxfd = MAX(ses.maxfd, c->sock); set_sock_nodelay(c->sock); + set_sock_priority(c->sock, c->prio); setnonblocking(c->sock); #if DROPBEAR_CLIENT_TCP_FAST_OPEN @@ -172,8 +174,8 @@ /* Connect via TCP to a host. */ struct dropbear_progress_connection *connect_remote(const char* remotehost, const char* remoteport, - connect_callback cb, void* cb_data, - const char* bind_address, const char* bind_port) + connect_callback cb, void* cb_data, + const char* bind_address, const char* bind_port, enum dropbear_prio prio) { struct dropbear_progress_connection *c = NULL; int err; @@ -185,6 +187,7 @@ c->sock = -1; c->cb = cb; c->cb_data = cb_data; + c->prio = prio; list_append(&ses.conn_pending, c); @@ -378,10 +381,8 @@ /* Set the DSCP field for outbound IP packet priority. rfc4594 has some guidance to meanings. - We set AF21 as "Low-Latency" class for interactive (tty session). - Set AF11 "High-Throughput" for bulk data (which includes things - such as git over ssh). We usually want higher priority than - CS1/LE least effort. + We set AF21 as "Low-Latency" class for interactive (tty session, + also handshake/setup packets). Other traffic is left at the default. OpenSSH at present uses AF21/CS1, rationale https://cvsweb.openbsd.org/src/usr.bin/ssh/readconf.c#rev1.284 @@ -394,8 +395,6 @@ */ if (prio == DROPBEAR_PRIO_LOWDELAY) { val = 0x48; /* IPTOS_DSCP_AF21 */ - } else if (prio == DROPBEAR_PRIO_BULK) { - val = 0x28; /* IPTOS_DSCP_AF11; */ } else { val = 0; /* default */ } @@ -415,8 +414,6 @@ /* Set scheduling priority within the local Linux network stack */ if (prio == DROPBEAR_PRIO_LOWDELAY) { val = TC_PRIO_INTERACTIVE; - } else if (prio == DROPBEAR_PRIO_BULK) { - val = TC_PRIO_BULK; } else { val = 0; } diff -r ed3326f21888 -r 5001e9c5641f netio.h --- a/netio.h Tue Jan 25 17:57:05 2022 +0800 +++ b/netio.h Thu Jan 27 15:09:29 2022 +0800 @@ -6,9 +6,8 @@ #include "queue.h" enum dropbear_prio { - DROPBEAR_PRIO_DEFAULT = 10, - DROPBEAR_PRIO_LOWDELAY = 11, - DROPBEAR_PRIO_BULK = 12, + DROPBEAR_PRIO_NORMAL = 0, /* the rest - tcp-fwd, scp, rsync, git, etc */ + DROPBEAR_PRIO_LOWDELAY, /* pty shell, x11 */ }; void set_sock_nodelay(int sock); @@ -30,7 +29,8 @@ /* Always returns a progress connection, if it fails it will call the callback at a later point */ struct dropbear_progress_connection * connect_remote (const char* remotehost, const char* remoteport, - connect_callback cb, void *cb_data, const char* bind_address, const char* bind_port); + connect_callback cb, void *cb_data, const char* bind_address, const char* bind_port, + enum dropbear_prio prio); /* Sets up for select() */ void set_connect_fds(fd_set *writefd); diff -r ed3326f21888 -r 5001e9c5641f svr-chansession.c --- a/svr-chansession.c Tue Jan 25 17:57:05 2022 +0800 +++ b/svr-chansession.c Thu Jan 27 15:09:29 2022 +0800 @@ -277,7 +277,8 @@ chansess->agentdir = NULL; #endif - channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE; + /* Will drop to DROPBEAR_PRIO_NORMAL if a non-tty command starts */ + channel->prio = DROPBEAR_PRIO_LOWDELAY; return 0; @@ -734,7 +735,7 @@ /* no pty */ ret = noptycommand(channel, chansess); if (ret == DROPBEAR_SUCCESS) { - channel->prio = DROPBEAR_CHANNEL_PRIO_BULK; + channel->prio = DROPBEAR_PRIO_NORMAL; update_channel_prio(); } } else { diff -r ed3326f21888 -r 5001e9c5641f svr-tcpfwd.c --- a/svr-tcpfwd.c Tue Jan 25 17:57:05 2022 +0800 +++ b/svr-tcpfwd.c Thu Jan 27 15:09:29 2022 +0800 @@ -60,7 +60,7 @@ #if DROPBEAR_SVR_REMOTETCPFWD static const struct ChanType svr_chan_tcpremote = { "forwarded-tcpip", - tcp_prio_inithandler, + NULL, NULL, NULL, NULL, @@ -289,11 +289,10 @@ goto out; } - channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE; + snprintf(portstring, sizeof(portstring), "%u", destport); + channel->conn_pending = connect_remote(desthost, portstring, channel_connect_done, + channel, NULL, NULL, DROPBEAR_PRIO_NORMAL); - snprintf(portstring, sizeof(portstring), "%u", destport); - channel->conn_pending = connect_remote(desthost, portstring, channel_connect_done, channel, NULL, NULL); - err = SSH_OPEN_IN_PROGRESS; out: diff -r ed3326f21888 -r 5001e9c5641f tcp-accept.c --- a/tcp-accept.c Tue Jan 25 17:57:05 2022 +0800 +++ b/tcp-accept.c Thu Jan 27 15:09:29 2022 +0800 @@ -45,13 +45,6 @@ m_free(tcpinfo); } -int tcp_prio_inithandler(struct Channel* channel) -{ - TRACE(("tcp_prio_inithandler channel %d", channel->index)) - channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE; - return 0; -} - static void tcp_acceptor(const struct Listener *listener, int sock) { int fd; diff -r ed3326f21888 -r 5001e9c5641f tcpfwd.h --- a/tcpfwd.h Tue Jan 25 17:57:05 2022 +0800 +++ b/tcpfwd.h Thu Jan 27 15:09:29 2022 +0800 @@ -71,7 +71,6 @@ /* Common */ int listen_tcpfwd(struct TCPListener* tcpinfo, struct Listener **ret_listener); -int tcp_prio_inithandler(struct Channel* chan); /* A random identifier */ #define CHANNEL_ID_TCPFORWARDED 0x43612c67