summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2010-05-10 22:32:52 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2010-05-10 22:32:52 +0200
commitbae409071522ae65c02bc36fccb87ee2a7179edf (patch)
tree0481d1b62e6281b8de5b15ea78dd76ce0a681c9b /include
parent403ded1e978f716769ade6d099b2419e4fceaff7 (diff)
downloadlibssh-bae409071522ae65c02bc36fccb87ee2a7179edf.tar.gz
libssh-bae409071522ae65c02bc36fccb87ee2a7179edf.tar.xz
libssh-bae409071522ae65c02bc36fccb87ee2a7179edf.zip
Backport of the proxycommand feature
Diffstat (limited to 'include')
-rw-r--r--include/libssh/libssh.h3
-rw-r--r--include/libssh/session.h1
-rw-r--r--include/libssh/socket.h6
3 files changed, 9 insertions, 1 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 75e7da0e..c25f8e67 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -264,7 +264,8 @@ enum ssh_options_e {
SSH_OPTIONS_CIPHERS_C_S,
SSH_OPTIONS_CIPHERS_S_C,
SSH_OPTIONS_COMPRESSION_C_S,
- SSH_OPTIONS_COMPRESSION_S_C
+ SSH_OPTIONS_COMPRESSION_S_C,
+ SSH_OPTIONS_PROXYCOMMAND
};
enum {
diff --git a/include/libssh/session.h b/include/libssh/session.h
index 9bd97315..e95e2351 100644
--- a/include/libssh/session.h
+++ b/include/libssh/session.h
@@ -114,6 +114,7 @@ struct ssh_session_struct {
socket_t fd;
int ssh2;
int ssh1;
+ char *ProxyCommand;
};
int ssh_handle_packets(ssh_session session);
diff --git a/include/libssh/socket.h b/include/libssh/socket.h
index bb54c7ea..ade755d7 100644
--- a/include/libssh/socket.h
+++ b/include/libssh/socket.h
@@ -52,4 +52,10 @@ int ssh_socket_get_status(struct socket *s);
int ssh_socket_data_available(struct socket *s);
int ssh_socket_data_writable(struct socket *s);
+#ifndef _WIN32
+void ssh_execute_command(const char *command, socket_t in, socket_t out);
+socket_t ssh_socket_connect_proxycommand(ssh_session session,
+ const char *command);
+#endif
+
#endif /* SOCKET_H_ */