summaryrefslogtreecommitdiffhomepage
path: root/common-channel.c
diff options
context:
space:
mode:
Diffstat (limited to 'common-channel.c')
-rw-r--r--common-channel.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/common-channel.c b/common-channel.c
index 40353c2..7383f47 100644
--- a/common-channel.c
+++ b/common-channel.c
@@ -32,7 +32,6 @@
#include "circbuffer.h"
#include "dbutil.h"
#include "channel.h"
-#include "ssh.h"
#include "listener.h"
#include "runopts.h"
#include "netio.h"
@@ -78,7 +77,7 @@ void chaninitialise(const struct ChanType *chantypes[]) {
ses.chantypes = chantypes;
-#ifdef USING_LISTENERS
+#if DROPBEAR_LISTENERS
listeners_initialise();
#endif
@@ -255,7 +254,7 @@ void channelio(fd_set *readfds, fd_set *writefds) {
}
}
-#ifdef USING_LISTENERS
+#if DROPBEAR_LISTENERS
handle_listeners(readfds);
#endif
}
@@ -595,7 +594,7 @@ void setchannelfds(fd_set *readfds, fd_set *writefds, int allow_reads) {
} /* foreach channel */
-#ifdef USING_LISTENERS
+#if DROPBEAR_LISTENERS
set_listener_fds(readfds);
#endif
@@ -1114,7 +1113,7 @@ static void close_chan_fd(struct Channel *channel, int fd, int how) {
}
-#if defined(USING_LISTENERS) || defined(DROPBEAR_CLIENT)
+#if (DROPBEAR_LISTENERS) || (DROPBEAR_CLIENT)
/* Create a new channel, and start the open request. This is intended
* for X11, agent, tcp forwarding, and should be filled with channel-specific
* options, with the calling function calling encrypt_packet() after
@@ -1210,7 +1209,7 @@ void recv_msg_channel_open_failure() {
remove_channel(channel);
}
-#endif /* USING_LISTENERS */
+#endif /* DROPBEAR_LISTENERS */
void send_msg_request_success() {
CHECKCLEARTOWRITE();