aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2008-11-01 22:28:39 +0000
committerAris Adamantiadis <aris@0xbadc0de.be>2008-11-01 22:28:39 +0000
commit0e8cf3b0828c88aa7467192b39e7ab9276d054b3 (patch)
tree1b2ee339f14b202c2bb43a1154add3beb6364abc
parent3b25cbf13406cb2f775a8298d2224b187de16275 (diff)
downloadlibssh-0e8cf3b0828c88aa7467192b39e7ab9276d054b3.tar.gz
libssh-0e8cf3b0828c88aa7467192b39e7ab9276d054b3.tar.xz
libssh-0e8cf3b0828c88aa7467192b39e7ab9276d054b3.zip
small changes in doxyfile.
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
-rw-r--r--Doxyfile2
-rw-r--r--libssh/buffer.c14
-rw-r--r--libssh/sftp.c29
3 files changed, 28 insertions, 17 deletions
diff --git a/Doxyfile b/Doxyfile
index a3bf901a..f4b5f832 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = libssh
# This could be handy for archiving the generated documentation or
# 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)
# base path where the generated documentation will be put.
diff --git a/libssh/buffer.c b/libssh/buffer.c
index 12d43c78..d51a826a 100644
--- a/libssh/buffer.c
+++ b/libssh/buffer.c
@@ -37,7 +37,7 @@ BUFFER *buffer_new(){
BUFFER *buffer=malloc(sizeof(BUFFER));
memset(buffer,0,sizeof(BUFFER));
return buffer;
- }
+}
/** \brief desallocate a buffer
* \param buffer buffer to free
@@ -47,10 +47,10 @@ void buffer_free(BUFFER *buffer){
if(buffer->data){
memset(buffer->data,0,buffer->allocated); /* burn the data */
free(buffer->data);
- }
+ }
memset(buffer,'x',sizeof (*buffer));
free(buffer);
- }
+}
static void realloc_buffer(BUFFER *buffer,int needed){
int smallest=1;
@@ -88,12 +88,12 @@ void buffer_add_data(BUFFER *buffer,const void *data,int len){
realloc_buffer(buffer,buffer->used+len);
memcpy(buffer->data+buffer->used,data,len);
buffer->used+=len;
- }
+}
void buffer_add_ssh_string(BUFFER *buffer,STRING *string){
u32 len=ntohl(string->size);
buffer_add_data(buffer,string,len+sizeof(u32));
- }
+}
void buffer_add_u32(BUFFER *buffer,u32 data){
buffer_add_data(buffer,&data,sizeof(data));
@@ -172,7 +172,7 @@ int buffer_get_rest_len(BUFFER *buffer){
}
/** \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
* \param buffer buffer
* \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);
buffer->pos+=len;
return len; /* no yet support for partial reads (is it really needed ?? ) */
-}
+}
int buffer_get_u8(BUFFER *buffer, u8 *data){
return buffer_get_data(buffer,data,sizeof(u8));
diff --git a/libssh/sftp.c b/libssh/sftp.c
index bdb966d9..48d2c6ee 100644
--- a/libssh/sftp.c
+++ b/libssh/sftp.c
@@ -179,21 +179,29 @@ SFTP_PACKET *sftp_packet_read(SFTP_SESSION *sftp){
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));
memset(msg,0,sizeof(*msg));
msg->payload=buffer_new();
+ msg->sftp=sftp;
+ sftp_leave_function();
return msg;
}
static void sftp_message_free(SFTP_MESSAGE *msg){
+ SFTP_SESSION *sftp=msg->sftp;
+ sftp_enter_function();
if(msg->payload)
buffer_free(msg->payload);
free(msg);
+ sftp_leave_function();
}
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->packet_type=packet->type;
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)){
ssh_set_error(packet->sftp->session,SSH_FATAL,"get_message : unknown packet type %d\n",packet->type);
sftp_message_free(msg);
+ sftp_leave_function();
return NULL;
}
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);
sftp_message_free(msg);
+ sftp_leave_function();
return NULL;
}
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));
+ sftp_leave_function();
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){
switch(session->version){
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);
sftp_message_free(msg);
}
- return NULL;
+ return NULL;
}
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;
BUFFER *buffer;
if(handle->eof)
- return 0;
+ return 0;
buffer=buffer_new();
id=sftp_get_new_id(handle->sftp);
buffer_add_u32(buffer,id);
@@ -1054,7 +1065,7 @@ int sftp_async_read(SFTP_FILE *file, void *data, int len, int *id){
return -1;
}
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
* and effective lengths are different */
memcpy(data,datastring->string,len);
@@ -1066,7 +1077,7 @@ int sftp_async_read(SFTP_FILE *file, void *data, int len, int *id){
return -1;
}
}
-
+
}
int sftp_write(SFTP_FILE *file, void *data, int len){
SFTP_MESSAGE *msg=NULL;
@@ -1148,7 +1159,7 @@ int sftp_rm(SFTP_SESSION *sftp, char *file) {
msg = sftp_dequeue(sftp, id);
}
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);
sftp_message_free(msg);
if (!status)
@@ -1347,7 +1358,7 @@ char *sftp_canonicalize_path(SFTP_SESSION *sftp, char *path)
STATUS_MESSAGE *status = NULL;
char *cname;
u32 ignored;
-
+
buffer_add_u32(buffer, id);
buffer_add_ssh_string(buffer, pathstr);
free(pathstr);