lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-17 06:18:58 +03:00
Code Activity

Added option to set log_verbosity in the server.

Browse Source
This commit is contained in:
Andreas Schneider
2009-10-15 17:17:36 +02:00
parent 2523ed0779
commit 7b7280e728
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libssh/priv.h
View File

@@ -107,6 +107,7 @@ struct ssh_bind_struct {
char *bindaddr; char *bindaddr;
socket_t bindfd; socket_t bindfd;
unsigned int bindport; unsigned int bindport;
unsigned int log_verbosity;
int blocking; int blocking;
int toaccept; int toaccept;

4
include/libssh/server.h
View File

@@ -43,7 +43,9 @@ enum ssh_bind_options_e {
SSH_BIND_OPTIONS_HOSTKEY, SSH_BIND_OPTIONS_HOSTKEY,
SSH_BIND_OPTIONS_DSAKEY, SSH_BIND_OPTIONS_DSAKEY,
SSH_BIND_OPTIONS_RSAKEY, SSH_BIND_OPTIONS_RSAKEY,
SSH_BIND_OPTIONS_BANNER SSH_BIND_OPTIONS_BANNER,
SSH_BIND_OPTIONS_LOG_VERBOSITY,
SSH_BIND_OPTIONS_LOG_VERBOSITY_STR
}; };
//typedef struct ssh_bind_struct SSH_BIND; //typedef struct ssh_bind_struct SSH_BIND;

27
libssh/options.c
View File

@@ -677,6 +677,33 @@ int ssh_bind_options_set(ssh_bind sshbind, enum ssh_bind_options_e type,
sshbind->bindport = i & 0xffff; sshbind->bindport = i & 0xffff;
} }
break; break;
case SSH_BIND_OPTIONS_LOG_VERBOSITY:
if (value == NULL) {
ssh_set_error_invalid(sshbind, __FUNCTION__);
return -1;
} else {
int *x = (int *) value;
sshbind->log_verbosity = *x & 0xffff;
}
break;
case SSH_BIND_OPTIONS_LOG_VERBOSITY_STR:
if (value == NULL) {
sshbind->log_verbosity = 0;
} else {
q = strdup(value);
if (q == NULL) {
ssh_set_error_oom(sshbind);
return -1;
}
i = strtol(q, &p, 10);
if (q == p) {
SAFE_FREE(q);
}
SAFE_FREE(q);
sshbind->log_verbosity = i & 0xffff;
}
break;
case SSH_BIND_OPTIONS_DSAKEY: case SSH_BIND_OPTIONS_DSAKEY:
if (value == NULL) { if (value == NULL) {
ssh_set_error_invalid(sshbind, __FUNCTION__); ssh_set_error_invalid(sshbind, __FUNCTION__);

12
libssh/server.c
View File

@@ -131,6 +131,8 @@ ssh_bind ssh_bind_new(void) {
ZERO_STRUCTP(ptr); ZERO_STRUCTP(ptr);
ptr->bindfd = -1; ptr->bindfd = -1;
ptr->bindport= 22; ptr->bindport= 22;
ptr->log_verbosity = 0;
return ptr; return ptr;
} }
@@ -229,10 +231,6 @@ int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
session->server = 1; session->server = 1;
session->version = 2; session->version = 2;
/* TODO: is wanted methods enough? */
#if 0
session->options = ssh_options_copy(sshbind->options);
#endif
/* copy options */ /* copy options */
for (i = 0; i < 10; ++i) { for (i = 0; i < 10; ++i) {
if (sshbind->wanted_methods[i]) { if (sshbind->wanted_methods[i]) {
@@ -255,9 +253,9 @@ int ssh_bind_accept(ssh_bind sshbind, ssh_session session) {
return SSH_ERROR; return SSH_ERROR;
} }
} }
/* TODO FIXME this doesn't work
session->log_verbosity = session->options->log_verbosity; session->log_verbosity = sshbind->log_verbosity;
*/
ssh_socket_free(session->socket); ssh_socket_free(session->socket);
session->socket = ssh_socket_new(session); session->socket = ssh_socket_new(session);
if (session->socket == NULL) { if (session->socket == NULL) {