aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2010-08-28 23:31:07 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2010-08-28 23:31:07 +0200
commit1fa94095543c2b20fade817a5be412edf94dec06 (patch)
tree7efb7fe3f0f9992a23448e527273c0a021608ac1 /include
parentadcd2e38e9199d0a3c9d4ad1380851c7e3858d6a (diff)
downloadlibssh-1fa94095543c2b20fade817a5be412edf94dec06.tar.gz
libssh-1fa94095543c2b20fade817a5be412edf94dec06.tar.xz
libssh-1fa94095543c2b20fade817a5be412edf94dec06.zip
ssh_channel_forward_* -> ssh_forward_*
Fixes bug #108
Diffstat (limited to 'include')
-rw-r--r--include/libssh/libssh.h6
-rw-r--r--include/libssh/libsshpp.hpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index b2752ac7..ce2ea0b1 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -316,10 +316,7 @@ enum ssh_scp_request_types {
LIBSSH_API ssh_channel ssh_channel_accept_x11(ssh_channel channel, int timeout_ms);
LIBSSH_API int ssh_channel_change_pty_size(ssh_channel channel,int cols,int rows);
-LIBSSH_API ssh_channel ssh_channel_forward_accept(ssh_session session, int timeout_ms);
LIBSSH_API int ssh_channel_close(ssh_channel channel);
-LIBSSH_API int ssh_channel_forward_cancel(ssh_session session, const char *address, int port);
-LIBSSH_API int ssh_channel_forward_listen(ssh_session session, const char *address, int port, int *bound_port);
LIBSSH_API void ssh_channel_free(ssh_channel channel);
LIBSSH_API int ssh_channel_get_exit_status(ssh_channel channel);
LIBSSH_API ssh_session ssh_channel_get_session(ssh_channel channel);
@@ -362,6 +359,9 @@ LIBSSH_API const char *ssh_copyright(void);
LIBSSH_API void ssh_disconnect(ssh_session session);
LIBSSH_API char *ssh_dirname (const char *path);
LIBSSH_API int ssh_finalize(void);
+LIBSSH_API ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms);
+LIBSSH_API int ssh_forward_cancel(ssh_session session, const char *address, int port);
+LIBSSH_API int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port);
LIBSSH_API void ssh_free(ssh_session session);
LIBSSH_API const char *ssh_get_disconnect_message(ssh_session session);
LIBSSH_API const char *ssh_get_error(void *error);
diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp
index 34fd711a..b874ae9f 100644
--- a/include/libssh/libsshpp.hpp
+++ b/include/libssh/libsshpp.hpp
@@ -365,13 +365,13 @@ public:
/* acceptForward is implemented later in this file */
void_throwable cancelForward(const char *address, int port){
- int err=ssh_channel_forward_cancel(c_session, address, port);
+ int err=ssh_forward_cancel(c_session, address, port);
ssh_throw(err);
}
void_throwable listenForward(const char *address, int port,
int &boundport){
- int err=ssh_channel_forward_listen(c_session, address, port, &boundport);
+ int err=ssh_forward_listen(c_session, address, port, &boundport);
ssh_throw(err);
}
@@ -570,7 +570,7 @@ private:
/* This code cannot be put inline due to references to Channel */
Channel *Session::acceptForward(int timeout_ms){
- ssh_channel forward = ssh_channel_forward_accept(c_session,
+ ssh_channel forward = ssh_forward_accept(c_session,
timeout_ms);
ssh_throw_null(c_session,forward);
Channel *newchan = new Channel(*this,forward);