1
1

added ssh_message_callback support.

Not fully working yet. User can set his ssh_message_callback, and the function ssh_execute_message_callbacks will call them when appropriate. Messages are correctly stacked (in packet_parse) but no call to ssh_execute_callbacks exists yet.
Этот коммит содержится в:
Aris Adamantiadis 2009-06-18 23:48:55 +02:00
родитель 3af55a4f49
Коммит 1bea53375b
5 изменённых файлов: 63 добавлений и 14 удалений

Просмотреть файл

@ -324,6 +324,8 @@ struct keys_struct {
const char *publickey; const char *publickey;
}; };
struct ssh_message;
struct ssh_session { struct ssh_session {
struct error_struct error; struct error_struct error;
struct socket *socket; struct socket *socket;
@ -386,7 +388,8 @@ struct ssh_session {
/* auths accepted by server */ /* auths accepted by server */
int auth_methods; int auth_methods;
int hostkeys; /* contains type of host key wanted by client, in server impl */ int hostkeys; /* contains type of host key wanted by client, in server impl */
struct ssh_message *ssh_message; /* ssh message */ struct ssh_list *ssh_message_list; /* list of delayed SSH messages */
int (*ssh_message_callback)( struct ssh_session *session,struct ssh_message *msg);
int log_verbosity; /*cached copy of the option structure */ int log_verbosity; /*cached copy of the option structure */
int log_indent; /* indentation level in enter_function logs */ int log_indent; /* indentation level in enter_function logs */
}; };
@ -737,7 +740,7 @@ const void *_ssh_list_get_head(struct ssh_list *list);
* @return the first element of the list * @return the first element of the list
*/ */
#define ssh_list_get_head(type, ssh_list)\ #define ssh_list_get_head(type, ssh_list)\
((type)_ssh_list_head(ssh_list)) ((type)_ssh_list_get_head(ssh_list))
/* channels1.c */ /* channels1.c */
@ -760,6 +763,7 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
/* messages.c */ /* messages.c */
void message_handle(SSH_SESSION *session, u32 type); void message_handle(SSH_SESSION *session, u32 type);
int ssh_execute_message_callbacks(SSH_SESSION *session);
/* log.c */ /* log.c */

Просмотреть файл

@ -173,7 +173,8 @@ int ssh_message_channel_request_reply_success(SSH_MESSAGE *msg);
int ssh_message_service_reply_success(SSH_MESSAGE *msg); int ssh_message_service_reply_success(SSH_MESSAGE *msg);
char *ssh_message_service_service(SSH_MESSAGE *msg); char *ssh_message_service_service(SSH_MESSAGE *msg);
void ssh_set_message_callback(SSH_SESSION *session,
int(*ssh_message_callback)(struct ssh_session *session, struct ssh_message *msg));
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

Просмотреть файл

@ -3,7 +3,7 @@
* *
* This file is part of the SSH Library * This file is part of the SSH Library
* *
* Copyright (c) 2003-2005 by Aris Adamantiadis * Copyright (c) 2003-2009 by Aris Adamantiadis
* *
* The SSH Library is free software; you can redistribute it and/or modify * The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
@ -46,18 +46,13 @@
static SSH_MESSAGE *message_new(SSH_SESSION *session){ static SSH_MESSAGE *message_new(SSH_SESSION *session){
SSH_MESSAGE *msg = session->ssh_message; SSH_MESSAGE *msg = malloc(sizeof(SSH_MESSAGE));
if (msg == NULL) { if (msg == NULL) {
msg = malloc(sizeof(SSH_MESSAGE)); return NULL;
if (msg == NULL) {
return NULL;
}
session->ssh_message = msg;
} }
memset(msg, 0, sizeof(*msg)); memset(msg, 0, sizeof(*msg));
msg->session = session; msg->session = session;
return msg; return msg;
} }
@ -815,9 +810,48 @@ void ssh_message_free(SSH_MESSAGE *msg){
void message_handle(SSH_SESSION *session, u32 type){ void message_handle(SSH_SESSION *session, u32 type){
SSH_MESSAGE *msg=ssh_message_retrieve(session,type); SSH_MESSAGE *msg=ssh_message_retrieve(session,type);
if(msg){ if(msg){
/* TODO store msg somewhere */ if(!session->ssh_message_list){
session->ssh_message_list=ssh_list_new();
}
ssh_list_add(session->ssh_message_list,msg);
} }
} }
/** @brief defines the SSH_MESSAGE callback
* @param session the current ssh session
* @param ssh_message_callback a function pointer to a callback taking the
* current ssh session and received message as parameters. the function returns
* 0 if the message has been parsed and treated sucessfuly, 1 otherwise (libssh
* must take care of the response).
*/
void ssh_set_message_callback(SSH_SESSION *session,
int(*ssh_message_callback)(struct ssh_session *session, struct ssh_message *msg)){
session->ssh_message_callback=ssh_message_callback;
}
int ssh_execute_message_callbacks(SSH_SESSION *session){
SSH_MESSAGE *msg=NULL;
int ret;
if(!session->ssh_message_list)
return SSH_OK;
if(session->ssh_message_callback){
while((msg=ssh_list_get_head(SSH_MESSAGE *, session->ssh_message_list)) != NULL){
ret=session->ssh_message_callback(session,msg);
if(ret==1){
ret = ssh_message_reply_default(msg);
if(ret != SSH_OK)
return ret;
}
}
} else {
while((msg=ssh_list_get_head(SSH_MESSAGE *, session->ssh_message_list)) != NULL){
ret = ssh_message_reply_default(msg);
if(ret != SSH_OK)
return ret;
}
}
return SSH_OK;
}
/** /**
* @} * @}
*/ */

Просмотреть файл

@ -753,6 +753,9 @@ static int packet_wait2(SSH_SESSION *session, int type, int blocking) {
case SSH2_MSG_CHANNEL_REQUEST: case SSH2_MSG_CHANNEL_REQUEST:
case SSH2_MSG_CHANNEL_EOF: case SSH2_MSG_CHANNEL_EOF:
case SSH2_MSG_CHANNEL_CLOSE: case SSH2_MSG_CHANNEL_CLOSE:
case SSH2_MSG_SERVICE_REQUEST:
case SSH2_MSG_USERAUTH_REQUEST:
case SSH2_MSG_CHANNEL_OPEN:
packet_parse(session); packet_parse(session);
break; break;
case SSH2_MSG_IGNORE: case SSH2_MSG_IGNORE:

Просмотреть файл

@ -125,7 +125,14 @@ void ssh_cleanup(SSH_SESSION *session) {
privatekey_free(session->dsa_key); privatekey_free(session->dsa_key);
privatekey_free(session->rsa_key); privatekey_free(session->rsa_key);
ssh_message_free(session->ssh_message); if(session->ssh_message_list){
SSH_MESSAGE *msg;
while((msg=ssh_list_get_head(SSH_MESSAGE *,session->ssh_message_list))
!= NULL){
ssh_message_free(msg);
}
ssh_list_free(session->ssh_message_list);
}
ssh_options_free(session->options); ssh_options_free(session->options);
/* burn connection, it could hang sensitive datas */ /* burn connection, it could hang sensitive datas */