diff options
Diffstat (limited to 'include/libssh')
| -rw-r--r-- | include/libssh/callbacks.h | 64 | ||||
| -rw-r--r-- | include/libssh/messages.h | 2 | ||||
| -rw-r--r-- | include/libssh/priv.h | 22 | ||||
| -rw-r--r-- | include/libssh/session.h | 5 |
4 files changed, 89 insertions, 4 deletions
diff --git a/include/libssh/callbacks.h b/include/libssh/callbacks.h index 83ac5eea..fdd20a5b 100644 --- a/include/libssh/callbacks.h +++ b/include/libssh/callbacks.h @@ -32,7 +32,21 @@ #ifdef __cplusplus extern "C" { #endif +typedef void (*ssh_callback_int) (void *user, int code); +/** @internal + * @brief callback for data received messages. + * @param user user-supplied pointer sent along with all callback messages + * @param data data retrieved from the socket or stream + * @param len number of bytes available from this stream + * @returns number of bytes processed by the callee. The remaining bytes will + * be sent in the next callback message, when more data is available. + */ +typedef int (*ssh_callback_data) (void *user, const void *data, size_t len); +typedef void (*ssh_callback_int_int) (void *user, int code, int errno_code); +typedef int (*ssh_message_callback) (ssh_session, void *user, ssh_message message); +typedef int (*ssh_channel_callback_int) (ssh_channel channel, void *user, int code); +typedef int (*ssh_channel_callback_data) (ssh_channel channel, void *user, int code, void *data, size_t len); /** * @brief SSH authentication callback. * @@ -68,9 +82,36 @@ struct ssh_callbacks_struct { * of connection steps completed. */ void (*connect_status_function)(void *userdata, float status); +/* To be cleaned up */ + ssh_callback_int connection_progress; + void *connection_progress_user; + ssh_channel_callback_int channel_write_confirm; + void *channel_write_confirm_user; + ssh_channel_callback_data channel_read_available; + void *channel_read_available_user; +}; +typedef struct ssh_callbacks_struct *ssh_callbacks; + +/* This are the callbacks exported by the socket structure + * They are called by the socket module when a socket event appears + */ +struct ssh_socket_callbacks_struct { + ssh_callback_data data; + ssh_callback_int controlflow; + ssh_callback_int_int exception; + ssh_callback_int_int connected; + void *user; }; +typedef struct ssh_socket_callbacks_struct *ssh_socket_callbacks; -typedef struct ssh_callbacks_struct * ssh_callbacks; +#define SSH_SOCKET_FLOW_WRITEWILLBLOCK (1<<0) +#define SSH_SOCKET_FLOW_WRITEWONTBLOCK (1<<1) +#define SSH_SOCKET_EXCEPTION_EOF (1<<0) +#define SSH_SOCKET_EXCEPTION_ERROR (1<<1) + +#define SSH_SOCKET_CONNECTED_OK (1<<0) +#define SSH_SOCKET_CONNECTED_ERROR (1<<1) +#define SSH_SOCKET_CONNECTED_TIMEOUT (1<<2) /** Initializes an ssh_callbacks_struct * A call to this macro is mandatory when you have set a new @@ -82,6 +123,21 @@ typedef struct ssh_callbacks_struct * ssh_callbacks; (p)->size=sizeof(*(p)); \ } while(0); +/* These are the callback exported by the packet layer + * and are called each time a packet shows up + * */ +typedef int (*ssh_packet_callback) (ssh_session, void *user, uint8_t code, ssh_buffer packet); + +struct ssh_packet_callbacks_struct { + /** Index of the first packet type being handled */ + u_int8_t start; + /** Number of packets being handled by this callback struct */ + u_int8_t n_callbacks; + /** A pointer to n_callbacks packet callbacks */ + ssh_packet_callback *callbacks; + void *user; +}; +typedef struct ssh_packet_callbacks_struct *ssh_packet_callbacks; /** * @brief Set the callback functions. * @@ -106,6 +162,12 @@ typedef struct ssh_callbacks_struct * ssh_callbacks; */ LIBSSH_API int ssh_set_callbacks(ssh_session session, ssh_callbacks cb); +/** return values for a ssh_packet_callback */ +/** Packet was used and should not be parsed by another callback */ +#define SSH_PACKET_USED 1 +/** Packet was not used and should be passed to any other callback + * available */ +#define SSH_PACKET_NOT_USED 2 #ifdef __cplusplus } #endif diff --git a/include/libssh/messages.h b/include/libssh/messages.h index 0eb7b64f..e002aa4a 100644 --- a/include/libssh/messages.h +++ b/include/libssh/messages.h @@ -78,7 +78,7 @@ struct ssh_message_struct { }; -void message_handle(ssh_session session, uint32_t type); +//void message_handle(ssh_session session, uint32_t type); int ssh_execute_message_callbacks(ssh_session session); #endif /* MESSAGES_H_ */ diff --git a/include/libssh/priv.h b/include/libssh/priv.h index c8bfee35..8bce949e 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -48,6 +48,7 @@ #include "libssh/libssh.h" #include "libssh/callbacks.h" #include "libssh/crypto.h" + /* some constants */ #define MAX_PACKET_LEN 262144 #define ERROR_BUFFERLEN 1024 @@ -90,7 +91,7 @@ struct ssh_keys_struct { }; struct ssh_message_struct; - +struct ssh_poll_handle_struct; /* server data */ @@ -113,6 +114,14 @@ struct ssh_bind_struct { int toaccept; }; +struct socket; +struct ssh_poll; +void ssh_socket_set_callbacks(struct socket *s, ssh_socket_callbacks callbacks); +int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, int fd, int revents, void *s); +void ssh_socket_register_pollcallback(struct socket *s, struct ssh_poll_handle_struct *p); + +int ssh_packet_disconnect_callback(ssh_session session, void *user, u_int8_t type, ssh_buffer packet); +int ssh_packet_ignore_callback(ssh_session session, void *user, u_int8_t type, ssh_buffer packet); /* client.c */ @@ -134,6 +143,11 @@ unsigned char *packet_encrypt(ssh_session session,void *packet,unsigned int len) /* it returns the hmac buffer if exists*/ int packet_hmac_verify(ssh_session session,ssh_buffer buffer,unsigned char *mac); +int ssh_packet_socket_callback(void *user, const void *data, size_t len); +void ssh_packet_register_socket_callback(ssh_session session, struct socket *s); +void ssh_packet_set_callbacks(ssh_session session, ssh_packet_callbacks callbacks); +void ssh_packet_set_default_callbacks(ssh_session session); +void ssh_packet_process(ssh_session session, u_int8_t type); /* connect.c */ int ssh_regex_init(void); void ssh_regex_finalize(void); @@ -152,6 +166,11 @@ char **space_tokenize(const char *chain); int ssh_get_kex1(ssh_session session); char *ssh_find_matching(const char *in_d, const char *what_d); +int channel_rcv_change_window(ssh_session session, void *user, uint8_t type, ssh_buffer packet); +int channel_rcv_eof(ssh_session session, void *user, uint8_t type, ssh_buffer packet); +int channel_rcv_close(ssh_session session, void *user, uint8_t type, ssh_buffer packet); +int channel_rcv_request(ssh_session session, void *user, uint8_t type, ssh_buffer packet); +int channel_rcv_data(ssh_session session, void *user, uint8_t type, ssh_buffer packet); /* in base64.c */ ssh_buffer base64_to_bin(const char *source); unsigned char *bin_to_base64(const unsigned char *source, int len); @@ -183,6 +202,7 @@ int channel_write1(ssh_channel channel, const void *data, int len); /* match.c */ int match_hostname(const char *host, const char *pattern, unsigned int len); +int message_handle(ssh_session session, void *user, uint8_t type, ssh_buffer packet); /* log.c */ #ifndef __FUNCTION__ diff --git a/include/libssh/session.h b/include/libssh/session.h index f490b1e4..0a5ad851 100644 --- a/include/libssh/session.h +++ b/include/libssh/session.h @@ -95,7 +95,9 @@ struct ssh_session_struct { int log_indent; /* indentation level in enter_function logs */ ssh_callbacks callbacks; /* Callbacks to user functions */ - + struct ssh_packet_callbacks_struct default_packet_callbacks; + struct ssh_list *packet_callbacks; + struct ssh_socket_callbacks_struct socket_callbacks; /* options */ #ifdef WITH_PCAP ssh_pcap_context pcap_ctx; /* pcap debugging context */ @@ -114,6 +116,7 @@ struct ssh_session_struct { socket_t fd; int ssh2; int ssh1; + }; int ssh_handle_packets(ssh_session session); |