Commit 9ea7c3bf authored by Matt Johnston's avatar Matt Johnston
Browse files

Oops, forgot to call the actual code.

--HG--
extra : convert_revision : 1394bf640a0721eb3851fdb9e534c5a65c8bc0f6
parent e1057cd4
......@@ -33,7 +33,7 @@ CLIOBJS=cli-algo.o cli-main.o cli-auth.o cli-authpasswd.o cli-kex.o \
CLISVROBJS=common-session.o packet.o common-algo.o common-kex.o \
common-channel.o common-chansession.o termcodes.o loginrec.o \
tcp-accept.o tcp-connect.o listener.o process-packet.o \
tcp-accept.o listener.o process-packet.o \
common-runopts.o
KEYOBJS=dropbearkey.o gendss.o genrsa.o
......
......@@ -179,8 +179,10 @@ static void cli_sessionloop() {
case USERAUTH_SUCCESS_RCVD:
#ifdef ENABLE_CLI_LOCALTCPFWD
TRACE(("recvd USERAUTH_SUCCESS_RCVD"));
setup_localtcp();
#endif
#ifdef ENABLE_CLI_REMOTETCPFWD
setup_remotetcp();
#endif
cli_send_chansess_request();
TRACE(("leave cli_sessionloop: cli_send_chansess_request"));
......
......@@ -306,6 +306,10 @@
#define ENABLE_CLI_ANYTCPFWD
#endif
#if defined(ENABLE_CLI_LOCALTCPFWD) || defined(ENABLE_SVR_REMOTETCPFWD)
#define DROPBEAR_TCP_ACCEPT
#endif
#if defined(ENABLE_REMOTETCPFWD) || defined(ENABLE_LOCALTCPFWD) || \
defined(ENABLE_AGENTFWD) || defined(ENABLE_X11FWD)
#define USING_LISTENERS
......
......@@ -8,8 +8,7 @@
#include "listener.h"
#include "runopts.h"
#ifndef DISABLE_TCP_ACCEPT
#ifdef DROPBEAR_TCP_ACCEPT
static void cleanup_tcp(struct Listener *listener) {
......@@ -94,4 +93,4 @@ int listen_tcpfwd(struct TCPListener* tcpinfo) {
return DROPBEAR_SUCCESS;
}
#endif /* DISABLE_REMOTETCPFWD */
#endif /* DROPBEAR_TCP_ACCEPT */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment