aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-05-03 18:25:13 +0000
committerAndreas Schneider <mail@cynapses.org>2009-05-03 18:25:13 +0000
commit095775ef1be7ebd4d76045b4c7481148f7fe05e6 (patch)
tree1418629a9f6cc288c1bafa6248be09fb701903b4
parentc98fce85963d1dc2c2c250af8e400081805fe951 (diff)
downloadlibssh-095775ef1be7ebd4d76045b4c7481148f7fe05e6.tar.gz
libssh-095775ef1be7ebd4d76045b4c7481148f7fe05e6.tar.xz
libssh-095775ef1be7ebd4d76045b4c7481148f7fe05e6.zip
Improve channel_open().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@684 7dcaeef0-15fb-0310-b436-a5af3365683c
-rw-r--r--libssh/channels.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/libssh/channels.c b/libssh/channels.c
index fd7ef0f7..c61aa4aa 100644
--- a/libssh/channels.c
+++ b/libssh/channels.c
@@ -624,25 +624,27 @@ int channel_default_bufferize(CHANNEL *channel, void *data, int len,
return 0;
}
-/** \brief open a session channel (suited for a shell. Not tcp Forwarding)
- * \param channel an allocated channel (see channel_new())
- * \return SSH_OK on success\n
- * SSH_ERROR on error
- * \see channel_open_forward()
- * \see channel_request_env()
- * \see channel_request_shell()
- * \see channel_request_exec()
- * \warning API changed from 0.11
+/**
+ * @brief Open a session channel (suited for a shell, not TCP forwarding).
+ *
+ * @param channel An allocated channel.
+ *
+ * @return SSH_OK on success\n
+ * SSH_ERROR on error.
+ *
+ * @see channel_open_forward()
+ * @see channel_request_env()
+ * @see channel_request_shell()
+ * @see channel_request_exec()
*/
-int channel_open_session(CHANNEL *channel){
-#ifdef HAVE_SSH1
- if(channel->session->version==2)
-#endif
- return channel_open(channel,"session",64000,32000,NULL);
+int channel_open_session(CHANNEL *channel) {
#ifdef HAVE_SSH1
- else
- return channel_open_session1(channel);
+ if (channel->session->version == 1) {
+ return channel_open_session1(channel);
+ }
#endif
+
+ return channel_open(channel,"session",64000,32000,NULL);
}
/** \brief open a TCP/IP forwarding channel.