diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-08-28 23:31:07 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-08-28 23:31:07 +0200 |
| commit | 1fa94095543c2b20fade817a5be412edf94dec06 (patch) | |
| tree | 7efb7fe3f0f9992a23448e527273c0a021608ac1 /libssh | |
| parent | adcd2e38e9199d0a3c9d4ad1380851c7e3858d6a (diff) | |
| download | libssh-1fa94095543c2b20fade817a5be412edf94dec06.tar.gz libssh-1fa94095543c2b20fade817a5be412edf94dec06.tar.xz libssh-1fa94095543c2b20fade817a5be412edf94dec06.zip | |
ssh_channel_forward_* -> ssh_forward_*
Fixes bug #108
Diffstat (limited to 'libssh')
| -rw-r--r-- | libssh/channels.c | 12 | ||||
| -rw-r--r-- | libssh/legacy.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libssh/channels.c b/libssh/channels.c index 324112ea..c99cfb45 100644 --- a/libssh/channels.c +++ b/libssh/channels.c @@ -1479,7 +1479,7 @@ error: return rc; } -static ssh_channel channel_accept(ssh_session session, int channeltype, +static ssh_channel ssh_channel_accept(ssh_session session, int channeltype, int timeout_ms) { #ifndef _WIN32 static const struct timespec ts = { @@ -1531,7 +1531,7 @@ static ssh_channel channel_accept(ssh_session session, int channeltype, * the server. */ ssh_channel ssh_channel_accept_x11(ssh_channel channel, int timeout_ms) { - return channel_accept(channel->session, SSH_CHANNEL_X11, timeout_ms); + return ssh_channel_accept(channel->session, SSH_CHANNEL_X11, timeout_ms); } /** @@ -1698,7 +1698,7 @@ error: * * @return SSH_OK on success, SSH_ERROR if an error occured. */ -int ssh_channel_forward_listen(ssh_session session, const char *address, int port, int *bound_port) { +int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) { ssh_buffer buffer = NULL; ssh_string addr = NULL; int rc = SSH_ERROR; @@ -1742,8 +1742,8 @@ error: * @return Newly created channel, or NULL if no incoming channel request from * the server */ -ssh_channel ssh_channel_forward_accept(ssh_session session, int timeout_ms) { - return channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms); +ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) { + return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms); } /** @@ -1758,7 +1758,7 @@ ssh_channel ssh_channel_forward_accept(ssh_session session, int timeout_ms) { * * @return SSH_OK on success, SSH_ERROR if an error occured. */ -int ssh_channel_forward_cancel(ssh_session session, const char *address, int port) { +int ssh_forward_cancel(ssh_session session, const char *address, int port) { ssh_buffer buffer = NULL; ssh_string addr = NULL; int rc = SSH_ERROR; diff --git a/libssh/legacy.c b/libssh/legacy.c index 83fb97a9..ea97a31f 100644 --- a/libssh/legacy.c +++ b/libssh/legacy.c @@ -50,7 +50,7 @@ int channel_change_pty_size(ssh_channel channel,int cols,int rows){ } ssh_channel channel_forward_accept(ssh_session session, int timeout_ms){ - return ssh_channel_forward_accept(session,timeout_ms); + return ssh_forward_accept(session,timeout_ms); } int channel_close(ssh_channel channel){ @@ -58,12 +58,12 @@ int channel_close(ssh_channel channel){ } int channel_forward_cancel(ssh_session session, const char *address, int port){ - return ssh_channel_forward_cancel(session, address, port); + return ssh_forward_cancel(session, address, port); } int channel_forward_listen(ssh_session session, const char *address, int port, int *bound_port){ - return ssh_channel_forward_listen(session, address, port, bound_port); + return ssh_forward_listen(session, address, port, bound_port); } void channel_free(ssh_channel channel){ |