aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2009-09-23 22:13:19 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2009-09-23 22:13:19 +0200
commit0e8e124d2023736c973ce8e06f4776efd1edb096 (patch)
treea713a4cdee7a21b4c4dceaa0e34b71fa67edbfb4 /include
parent9a8d4cd0fdd18127065cacbc11296933669ea9ca (diff)
downloadlibssh-0e8e124d2023736c973ce8e06f4776efd1edb096.tar.gz
libssh-0e8e124d2023736c973ce8e06f4776efd1edb096.tar.xz
libssh-0e8e124d2023736c973ce8e06f4776efd1edb096.zip
get rid of SSH_OPTIONS
Diffstat (limited to 'include')
-rw-r--r--include/libssh/callback.h6
-rw-r--r--include/libssh/libssh.h46
-rw-r--r--include/libssh/priv.h10
-rw-r--r--include/libssh/server.h2
4 files changed, 32 insertions, 32 deletions
diff --git a/include/libssh/callback.h b/include/libssh/callback.h
index fd60bc1..00a41d3 100644
--- a/include/libssh/callback.h
+++ b/include/libssh/callback.h
@@ -60,10 +60,10 @@ typedef struct ssh_callbacks_struct * ssh_callbacks;
p->size=sizeof(*p); \
} while(0);
-LIBSSH_API int ssh_options_set_auth_callback(SSH_OPTIONS *opt, ssh_auth_callback cb,
+LIBSSH_API int ssh_options_set_auth_callback(ssh_options opt, ssh_auth_callback cb,
void *userdata);
-LIBSSH_API int ssh_options_set_log_function(SSH_OPTIONS *opt,
+LIBSSH_API int ssh_options_set_log_function(ssh_options opt,
ssh_log_callback cb, void *userdata);
-LIBSSH_API int ssh_options_set_status_callback(SSH_OPTIONS *opt, void (*callback)
+LIBSSH_API int ssh_options_set_status_callback(ssh_options opt, void (*callback)
(void *arg, float status), void *arg);
#endif /*_SSH_CALLBACK_H */
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 21dfb26..d87f70c 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -370,30 +370,30 @@ LIBSSH_API int ssh_message_subtype(SSH_MESSAGE *msg);
LIBSSH_API int ssh_message_type(SSH_MESSAGE *msg);
LIBSSH_API int ssh_mkdir (const char *pathname, mode_t mode);
LIBSSH_API ssh_session ssh_new(void);
-LIBSSH_API SSH_OPTIONS *ssh_options_copy(SSH_OPTIONS *opt);
-LIBSSH_API void ssh_options_free(SSH_OPTIONS *opt);
-LIBSSH_API SSH_OPTIONS *ssh_options_new(void);
-
-LIBSSH_API int ssh_options_allow_ssh1(SSH_OPTIONS *opt, int allow);
-LIBSSH_API int ssh_options_allow_ssh2(SSH_OPTIONS *opt, int allow);
-LIBSSH_API int ssh_options_getopt(SSH_OPTIONS *options, int *argcptr, char **argv);
-LIBSSH_API int ssh_options_parse_config(SSH_OPTIONS *opt, const char *filename);
+LIBSSH_API ssh_options ssh_options_copy(ssh_options opt);
+LIBSSH_API void ssh_options_free(ssh_options opt);
+LIBSSH_API ssh_options ssh_options_new(void);
+
+LIBSSH_API int ssh_options_allow_ssh1(ssh_options opt, int allow);
+LIBSSH_API int ssh_options_allow_ssh2(ssh_options opt, int allow);
+LIBSSH_API int ssh_options_getopt(ssh_options options, int *argcptr, char **argv);
+LIBSSH_API int ssh_options_parse_config(ssh_options opt, const char *filename);
LIBSSH_API int ssh_options_set(ssh_options opt, enum ssh_options_e type,
const void *value);
-LIBSSH_API int ssh_options_set_banner(SSH_OPTIONS *opt, const char *banner);
-LIBSSH_API int ssh_options_set_bind(SSH_OPTIONS *opt, const char *bindaddr, int port);
-LIBSSH_API int ssh_options_set_dsa_server_key(SSH_OPTIONS *opt, const char *dsakey);
-LIBSSH_API int ssh_options_set_fd(SSH_OPTIONS *opt, socket_t fd);
-LIBSSH_API int ssh_options_set_host(SSH_OPTIONS *opt, const char *host);
-LIBSSH_API int ssh_options_set_identity(SSH_OPTIONS *opt, const char *identity);
-LIBSSH_API int ssh_options_set_log_verbosity(SSH_OPTIONS *opt, int verbosity);
-LIBSSH_API int ssh_options_set_known_hosts_file(SSH_OPTIONS *opt, const char *dir);
-LIBSSH_API int ssh_options_set_port(SSH_OPTIONS *opt, unsigned int port);
-LIBSSH_API int ssh_options_set_rsa_server_key(SSH_OPTIONS *opt, const char *rsakey);
-LIBSSH_API int ssh_options_set_ssh_dir(SSH_OPTIONS *opt, const char *dir);
-LIBSSH_API int ssh_options_set_timeout(SSH_OPTIONS *opt, long seconds, long usec);
-LIBSSH_API int ssh_options_set_username(SSH_OPTIONS *opt, const char *username);
-LIBSSH_API int ssh_options_set_wanted_algos(SSH_OPTIONS *opt, int algo, const char *list);
+LIBSSH_API int ssh_options_set_banner(ssh_options opt, const char *banner);
+LIBSSH_API int ssh_options_set_bind(ssh_options opt, const char *bindaddr, int port);
+LIBSSH_API int ssh_options_set_dsa_server_key(ssh_options opt, const char *dsakey);
+LIBSSH_API int ssh_options_set_fd(ssh_options opt, socket_t fd);
+LIBSSH_API int ssh_options_set_host(ssh_options opt, const char *host);
+LIBSSH_API int ssh_options_set_identity(ssh_options opt, const char *identity);
+LIBSSH_API int ssh_options_set_log_verbosity(ssh_options opt, int verbosity);
+LIBSSH_API int ssh_options_set_known_hosts_file(ssh_options opt, const char *dir);
+LIBSSH_API int ssh_options_set_port(ssh_options opt, unsigned int port);
+LIBSSH_API int ssh_options_set_rsa_server_key(ssh_options opt, const char *rsakey);
+LIBSSH_API int ssh_options_set_ssh_dir(ssh_options opt, const char *dir);
+LIBSSH_API int ssh_options_set_timeout(ssh_options opt, long seconds, long usec);
+LIBSSH_API int ssh_options_set_username(ssh_options opt, const char *username);
+LIBSSH_API int ssh_options_set_wanted_algos(ssh_options opt, int algo, const char *list);
LIBSSH_API void ssh_print_hexa(const char *descr, const unsigned char *what, size_t len);
LIBSSH_API int ssh_scp_accept_request(ssh_scp scp);
LIBSSH_API int ssh_scp_close(ssh_scp scp);
@@ -418,7 +418,7 @@ LIBSSH_API void ssh_set_blocking(ssh_session session, int blocking);
LIBSSH_API void ssh_set_fd_except(ssh_session session);
LIBSSH_API void ssh_set_fd_toread(ssh_session session);
LIBSSH_API void ssh_set_fd_towrite(ssh_session session);
-LIBSSH_API void ssh_set_options(ssh_session session, SSH_OPTIONS *options);
+LIBSSH_API void ssh_set_options(ssh_session session, ssh_options options);
LIBSSH_API void ssh_silent_disconnect(ssh_session session);
#ifndef _WIN32
LIBSSH_API int ssh_userauth_agent_pubkey(ssh_session session, const char *username,
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 83e4473..3fe5fa3 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -383,7 +383,7 @@ struct ssh_message_struct;
struct ssh_session_struct {
struct error_struct error;
struct socket *socket;
- SSH_OPTIONS *options;
+ ssh_options options;
char *serverbanner;
char *clientbanner;
int protoversion;
@@ -463,7 +463,7 @@ struct ssh_kbdint_struct {
struct ssh_bind_struct {
struct error_struct error;
socket_t bindfd;
- SSH_OPTIONS *options;
+ ssh_options options;
int blocking;
int toaccept;
};
@@ -747,9 +747,9 @@ int channel_write_common(ssh_channel channel, const void *data,
/* options.c */
/* this function must be called when no specific username has been asked. it has to guess it */
-int ssh_options_default_username(SSH_OPTIONS *opt);
-int ssh_options_default_ssh_dir(SSH_OPTIONS *opt);
-int ssh_options_default_known_hosts_file(SSH_OPTIONS *opt);
+int ssh_options_default_username(ssh_options opt);
+int ssh_options_default_ssh_dir(ssh_options opt);
+int ssh_options_default_known_hosts_file(ssh_options opt);
/* buffer.c */
int buffer_add_ssh_string(ssh_buffer buffer, ssh_string string);
diff --git a/include/libssh/server.h b/include/libssh/server.h
index fefee1b..afe3f49 100644
--- a/include/libssh/server.h
+++ b/include/libssh/server.h
@@ -51,7 +51,7 @@ LIBSSH_API SSH_BIND *ssh_bind_new(void);
*
* @param options The option structure to set.
*/
-LIBSSH_API void ssh_bind_set_options(SSH_BIND *ssh_bind, SSH_OPTIONS *options);
+LIBSSH_API void ssh_bind_set_options(SSH_BIND *ssh_bind, ssh_options options);
/**
* @brief Start listening to the socket.