aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2014-04-09 12:49:06 +0200
committerAndreas Schneider <asn@cryptomilk.org>2014-04-09 12:49:06 +0200
commitad1313c2e5cf273aec7bf5415876d389ea8d8ae7 (patch)
tree3eb815692ffbf29092156d304d23c7880ef5e6b3 /include
parent0cb9f792b8d2285949c5108371bf070b2475c55d (diff)
downloadlibssh-ad1313c2e5cf273aec7bf5415876d389ea8d8ae7.tar.gz
libssh-ad1313c2e5cf273aec7bf5415876d389ea8d8ae7.tar.xz
libssh-ad1313c2e5cf273aec7bf5415876d389ea8d8ae7.zip
Revert "direct-tcpip and forwarded-tcpip callbacks"
This reverts commit efe785e711e1fe8c66dc120b741d1e560ef556db. We need a Signed-off version. I didn't have the Certificate of Origin yet.
Diffstat (limited to 'include')
-rw-r--r--include/libssh/callbacks.h34
1 files changed, 2 insertions, 32 deletions
diff --git a/include/libssh/callbacks.h b/include/libssh/callbacks.h
index a4f603c1..6bd8c573 100644
--- a/include/libssh/callbacks.h
+++ b/include/libssh/callbacks.h
@@ -124,7 +124,6 @@ typedef void (*ssh_global_request_callback) (ssh_session session,
typedef ssh_channel (*ssh_channel_open_request_x11_callback) (ssh_session session,
const char * originator_address, int originator_port, void *userdata);
-
/**
* The structure to replace libssh functions with appropriate callbacks.
*/
@@ -240,21 +239,6 @@ typedef int (*ssh_service_request_callback) (ssh_session session, const char *se
typedef ssh_channel (*ssh_channel_open_request_session_callback) (ssh_session session, void *userdata);
/*
- * @brief Handles an SSH new channel open direct TCPIP request
- */
-typedef ssh_channel (*ssh_channel_open_request_direct_tcpip_callback) (ssh_session session,
- const char *destination, uint16_t destination_port, const char *originator,
- uint16_t originator_port, void *userdata);
-
-/*
- * @brief Handles an SSH new channel open forwarded TCPIP request
- */
-
-typedef ssh_channel (*ssh_channel_open_request_forwarded_tcpip_callback) (ssh_session session,
- const char *destination, uint16_t destination_port, const char *originator,
- uint16_t originator_port, void *userdata);
-
-/*
* @brief handle the beginning of a GSSAPI authentication, server side.
* @param session current session handler
* @param user the username of the client
@@ -329,34 +313,20 @@ struct ssh_server_callbacks_struct {
*/
ssh_auth_pubkey_callback auth_pubkey_function;
- /** This function gets called when a service request is issued by the
+ /** This functions gets called when a service request is issued by the
* client
*/
ssh_service_request_callback service_request_function;
-
- /** This function gets called when a new channel request is issued by
+ /** This functions gets called when a new channel request is issued by
* the client
*/
ssh_channel_open_request_session_callback channel_open_request_session_function;
-
- /** This function gets called when a new direct tcpip channel request is issued by
- * the client
- */
- ssh_channel_open_request_direct_tcpip_callback channel_open_request_direct_tcpip_function;
-
- /** This function gets called when a new forwarded tcpip channel request is issued by
- * the client
- */
- ssh_channel_open_request_forwarded_tcpip_callback channel_open_request_forwarded_tcpip_function;
-
/** This function will be called when a new gssapi authentication is attempted.
*/
ssh_gssapi_select_oid_callback gssapi_select_oid_function;
-
/** This function will be called when a gssapi token comes in.
*/
ssh_gssapi_accept_sec_ctx_callback gssapi_accept_sec_ctx_function;
-
/* This function will be called when a MIC needs to be verified.
*/
ssh_gssapi_verify_mic_callback gssapi_verify_mic_function;