lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-28 01:41:48 +03:00
Code Activity

small changes in doxyfile.

Browse Source 
cosmetic changes in buffer.c
added debugging enter_functions() in sftp.c


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@185 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Aris Adamantiadis
2008-11-01 22:28:39 +00:00
parent 3b25cbf134
commit 0e8cf3b082
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = libssh
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 0.2-svn PROJECT_NUMBER = 0.2.1-svn
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

14
libssh/buffer.c
View File

@ -37,7 +37,7 @@ BUFFER *buffer_new(){
BUFFER *buffer=malloc(sizeof(BUFFER)); BUFFER *buffer=malloc(sizeof(BUFFER));
memset(buffer,0,sizeof(BUFFER)); memset(buffer,0,sizeof(BUFFER));
return buffer; return buffer;
} }
/** \brief desallocate a buffer /** \brief desallocate a buffer
* \param buffer buffer to free * \param buffer buffer to free
@ -47,10 +47,10 @@ void buffer_free(BUFFER *buffer){
if(buffer->data){ if(buffer->data){
memset(buffer->data,0,buffer->allocated); /* burn the data */ memset(buffer->data,0,buffer->allocated); /* burn the data */
free(buffer->data); free(buffer->data);
} }
memset(buffer,'x',sizeof (*buffer)); memset(buffer,'x',sizeof (*buffer));
free(buffer); free(buffer);
} }
static void realloc_buffer(BUFFER *buffer,int needed){ static void realloc_buffer(BUFFER *buffer,int needed){
int smallest=1; int smallest=1;
@ -88,12 +88,12 @@ void buffer_add_data(BUFFER *buffer,const void *data,int len){
realloc_buffer(buffer,buffer->used+len); realloc_buffer(buffer,buffer->used+len);
memcpy(buffer->data+buffer->used,data,len); memcpy(buffer->data+buffer->used,data,len);
buffer->used+=len; buffer->used+=len;
} }
void buffer_add_ssh_string(BUFFER *buffer,STRING *string){ void buffer_add_ssh_string(BUFFER *buffer,STRING *string){
u32 len=ntohl(string->size); u32 len=ntohl(string->size);
buffer_add_data(buffer,string,len+sizeof(u32)); buffer_add_data(buffer,string,len+sizeof(u32));
} }
void buffer_add_u32(BUFFER *buffer,u32 data){ void buffer_add_u32(BUFFER *buffer,u32 data){
buffer_add_data(buffer,&data,sizeof(data)); buffer_add_data(buffer,&data,sizeof(data));
@ -172,7 +172,7 @@ int buffer_get_rest_len(BUFFER *buffer){
} }
/** \internal /** \internal
* has effect to "eat" bytes at head of the buffer * has effect to "eat" bytes at head of the buffer
* \brief advance the position in the buffer * \brief advance the position in the buffer
* \param buffer buffer * \param buffer buffer
* \param len number of bytes to eat * \param len number of bytes to eat
@ -209,7 +209,7 @@ int buffer_get_data(BUFFER *buffer, void *data, int len){
memcpy(data,buffer->data+buffer->pos,len); memcpy(data,buffer->data+buffer->pos,len);
buffer->pos+=len; buffer->pos+=len;
return len; /* no yet support for partial reads (is it really needed ?? ) */ return len; /* no yet support for partial reads (is it really needed ?? ) */
} }
int buffer_get_u8(BUFFER *buffer, u8 *data){ int buffer_get_u8(BUFFER *buffer, u8 *data){
return buffer_get_data(buffer,data,sizeof(u8)); return buffer_get_data(buffer,data,sizeof(u8));

29
libssh/sftp.c
View File

@ -179,21 +179,29 @@ SFTP_PACKET *sftp_packet_read(SFTP_SESSION *sftp){
return packet; return packet;
} }
static SFTP_MESSAGE *sftp_message_new(){ static SFTP_MESSAGE *sftp_message_new(SFTP_SESSION *sftp){
sftp_enter_function();
SFTP_MESSAGE *msg=malloc(sizeof(SFTP_MESSAGE)); SFTP_MESSAGE *msg=malloc(sizeof(SFTP_MESSAGE));
memset(msg,0,sizeof(*msg)); memset(msg,0,sizeof(*msg));
msg->payload=buffer_new(); msg->payload=buffer_new();
msg->sftp=sftp;
sftp_leave_function();
return msg; return msg;
} }
static void sftp_message_free(SFTP_MESSAGE *msg){ static void sftp_message_free(SFTP_MESSAGE *msg){
SFTP_SESSION *sftp=msg->sftp;
sftp_enter_function();
if(msg->payload) if(msg->payload)
buffer_free(msg->payload); buffer_free(msg->payload);
free(msg); free(msg);
sftp_leave_function();
} }
SFTP_MESSAGE *sftp_get_message(SFTP_PACKET *packet){ SFTP_MESSAGE *sftp_get_message(SFTP_PACKET *packet){
SFTP_MESSAGE *msg=sftp_message_new(); SFTP_SESSION *sftp=packet->sftp;
SFTP_MESSAGE *msg=sftp_message_new(sftp);
sftp_enter_function();
msg->sftp=packet->sftp; msg->sftp=packet->sftp;
msg->packet_type=packet->type; msg->packet_type=packet->type;
if((packet->type!=SSH_FXP_STATUS)&&(packet->type!=SSH_FXP_HANDLE) && if((packet->type!=SSH_FXP_STATUS)&&(packet->type!=SSH_FXP_HANDLE) &&
@ -201,15 +209,18 @@ SFTP_MESSAGE *sftp_get_message(SFTP_PACKET *packet){
&& (packet->type != SSH_FXP_NAME)){ && (packet->type != SSH_FXP_NAME)){
ssh_set_error(packet->sftp->session,SSH_FATAL,"get_message : unknown packet type %d\n",packet->type); ssh_set_error(packet->sftp->session,SSH_FATAL,"get_message : unknown packet type %d\n",packet->type);
sftp_message_free(msg); sftp_message_free(msg);
sftp_leave_function();
return NULL; return NULL;
} }
if(buffer_get_u32(packet->payload,&msg->id)!=sizeof(u32)){ if(buffer_get_u32(packet->payload,&msg->id)!=sizeof(u32)){
ssh_set_error(packet->sftp->session,SSH_FATAL,"invalid packet %d : no ID",packet->type); ssh_set_error(packet->sftp->session,SSH_FATAL,"invalid packet %d : no ID",packet->type);
sftp_message_free(msg); sftp_message_free(msg);
sftp_leave_function();
return NULL; return NULL;
} }
ssh_say(2,"packet with id %d type %d\n",msg->id,msg->packet_type); ssh_say(2,"packet with id %d type %d\n",msg->id,msg->packet_type);
buffer_add_data(msg->payload,buffer_get_rest(packet->payload),buffer_get_rest_len(packet->payload)); buffer_add_data(msg->payload,buffer_get_rest(packet->payload),buffer_get_rest_len(packet->payload));
sftp_leave_function();
return msg; return msg;
} }
@ -674,7 +685,7 @@ void buffer_add_attributes(BUFFER *buffer, SFTP_ATTRIBUTES *attr){
} }
} }
SFTP_ATTRIBUTES *sftp_parse_attr(SFTP_SESSION *session, BUFFER *buf,int expectname){ SFTP_ATTRIBUTES *sftp_parse_attr(SFTP_SESSION *session, BUFFER *buf,int expectname){
switch(session->version){ switch(session->version){
case 4: case 4:
@ -888,7 +899,7 @@ SFTP_FILE *sftp_open(SFTP_SESSION *sftp, char *file, int access, SFTP_ATTRIBUTES
ssh_set_error(sftp->session,SSH_FATAL,"Received message %d during open!",msg->packet_type); ssh_set_error(sftp->session,SSH_FATAL,"Received message %d during open!",msg->packet_type);
sftp_message_free(msg); sftp_message_free(msg);
} }
return NULL; return NULL;
} }
void sftp_file_set_nonblocking(SFTP_FILE *handle){ void sftp_file_set_nonblocking(SFTP_FILE *handle){
@ -907,7 +918,7 @@ int sftp_read(SFTP_FILE *handle, void *data, int len){
int err=0; int err=0;
BUFFER *buffer; BUFFER *buffer;
if(handle->eof) if(handle->eof)
return 0; return 0;
buffer=buffer_new(); buffer=buffer_new();
id=sftp_get_new_id(handle->sftp); id=sftp_get_new_id(handle->sftp);
buffer_add_u32(buffer,id); buffer_add_u32(buffer,id);
@ -1054,7 +1065,7 @@ int sftp_async_read(SFTP_FILE *file, void *data, int len, int *id){
return -1; return -1;
} }
len=string_len(datastring); len=string_len(datastring);
//handle->offset+=len; //handle->offset+=len;
/* We already have set the offset previously. All we can do is warn that the expected len /* We already have set the offset previously. All we can do is warn that the expected len
* and effective lengths are different */ * and effective lengths are different */
memcpy(data,datastring->string,len); memcpy(data,datastring->string,len);
@ -1066,7 +1077,7 @@ int sftp_async_read(SFTP_FILE *file, void *data, int len, int *id){
return -1; return -1;
} }
} }
} }
int sftp_write(SFTP_FILE *file, void *data, int len){ int sftp_write(SFTP_FILE *file, void *data, int len){
SFTP_MESSAGE *msg=NULL; SFTP_MESSAGE *msg=NULL;
@ -1148,7 +1159,7 @@ int sftp_rm(SFTP_SESSION *sftp, char *file) {
msg = sftp_dequeue(sftp, id); msg = sftp_dequeue(sftp, id);
} }
if (msg->packet_type == SSH_FXP_STATUS) { if (msg->packet_type == SSH_FXP_STATUS) {
/* by specification, this command's only supposed to return SSH_FXP_STATUS */ /* by specification, this command's only supposed to return SSH_FXP_STATUS */
status = parse_status_msg(msg); status = parse_status_msg(msg);
sftp_message_free(msg); sftp_message_free(msg);
if (!status) if (!status)
@ -1347,7 +1358,7 @@ char *sftp_canonicalize_path(SFTP_SESSION *sftp, char *path)
STATUS_MESSAGE *status = NULL; STATUS_MESSAGE *status = NULL;
char *cname; char *cname;
u32 ignored; u32 ignored;
buffer_add_u32(buffer, id); buffer_add_u32(buffer, id);
buffer_add_ssh_string(buffer, pathstr); buffer_add_ssh_string(buffer, pathstr);
free(pathstr); free(pathstr);