From ab5b4c7cfe668ee4103de146c2a739532abfc416 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 2 Oct 2009 14:06:41 +0200 Subject: Get rid of the options structure. --- include/libssh/priv.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'include/libssh/priv.h') diff --git a/include/libssh/priv.h b/include/libssh/priv.h index a9da5a5..8dbf9a3 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -95,11 +95,21 @@ struct ssh_message_struct; /* server data */ struct ssh_bind_struct { - struct error_struct error; - socket_t bindfd; - ssh_options options; - int blocking; - int toaccept; + struct error_struct error; + + ssh_callbacks callbacks; /* Callbacks to user functions */ + + /* options */ + char *wanted_methods[10]; + char *banner; + char *dsakey; + char *rsakey; + char *bindaddr; + socket_t bindfd; + unsigned int bindport; + + int blocking; + int toaccept; }; -- cgit From d54e9550da59465d9a795c885e18199122b57ba5 Mon Sep 17 00:00:00 2001 From: "Bernhard R. Link" Date: Sun, 4 Oct 2009 13:59:03 +0200 Subject: proper prototype of ssh_session_new Signed-off-by: Andreas Schneider --- include/libssh/priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/libssh/priv.h') diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 8dbf9a3..5dc3889 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -134,7 +134,7 @@ int packet_hmac_verify(ssh_session session,ssh_buffer buffer,unsigned char *mac) /* connect.c */ int ssh_regex_init(void); void ssh_regex_finalize(void); -ssh_session ssh_session_new(); +ssh_session ssh_session_new(void); socket_t ssh_connect_host(ssh_session session, const char *host,const char *bind_addr, int port, long timeout, long usec); -- cgit From 7c759b961521ecae451b113eaa7531f9c77b0079 Mon Sep 17 00:00:00 2001 From: "Bernhard R. Link" Date: Sun, 4 Oct 2009 14:03:25 +0200 Subject: add ssh_set_error_oom and ssh_set_error_invalid Signed-off-by: Andreas Schneider --- include/libssh/priv.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/libssh/priv.h') diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 5dc3889..bea4c34 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -123,6 +123,8 @@ int ssh_config_parse_file(ssh_options opt, const char *filename); /* errors.c */ void ssh_set_error(void *error, int code, const char *descr, ...) PRINTF_ATTRIBUTE(3, 4); +void ssh_set_error_oom(void *); +void ssh_set_error_invalid(void *, const char *); /* in crypt.c */ uint32_t packet_decrypt_len(ssh_session session,char *crypted); -- cgit