X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcsftp%2Fsftp_client.c;h=59f7dfb61a29ce9ad9d9d8df216d3a45c31967df;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=a4b671e46fa36b43b55fa782f9b21d2d06b979b1;hpb=a818c5b5411bbc4436d1c5f011236985c96bb787;p=silc.git diff --git a/lib/silcsftp/sftp_client.c b/lib/silcsftp/sftp_client.c index a4b671e4..59f7dfb6 100644 --- a/lib/silcsftp/sftp_client.c +++ b/lib/silcsftp/sftp_client.c @@ -1,10 +1,10 @@ /* - sftp_client.c + sftp_client.c Author: Pekka Riikonen - Copyright (C) 2001 Pekka Riikonen + Copyright (C) 2001 - 2007 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,15 +18,14 @@ */ /* $Id$ */ -#include "silcincludes.h" +#include "silc.h" #include "silcsftp.h" #include "sftp_util.h" /* Request context. Every request will allocate this context and set the correct callback function according the `type' field. */ typedef struct SilcSFTPRequestStruct { - SilcUInt32 id; - SilcSFTPPacket type; + struct SilcSFTPRequestStruct *next; SilcSFTPStatusCallback status; SilcSFTPHandleCallback handle; SilcSFTPDataCallback data; @@ -34,19 +33,20 @@ typedef struct SilcSFTPRequestStruct { SilcSFTPAttrCallback attr; SilcSFTPExtendedCallback extended; void *context; - struct SilcSFTPRequestStruct *next; + SilcUInt32 id; + SilcSFTPPacket type; } *SilcSFTPRequest; /* SFTP client context */ typedef struct { - SilcSocketConnection sock; - SilcSFTPSendPacketCallback send_packet; - void *send_context; + SilcStream stream; + SilcSchedule schedule; SilcSFTPVersionCallback version; - void *version_context; - SilcUInt32 id; + SilcSFTPErrorCallback error; + void *context; SilcList requests; SilcBuffer packet; + SilcUInt32 id; } *SilcSFTPClient; /* File handle */ @@ -55,6 +55,9 @@ struct SilcSFTPHandleStruct { SilcUInt32 data_len; }; +static void silc_sftp_client_receive_process(SilcSFTP context, + SilcBuffer buffer); + /* Creates SilcSFTPHandle and returns pointer to it. The caller must free the context. */ @@ -64,7 +67,11 @@ static SilcSFTPHandle silc_sftp_handle_create(unsigned char *data, SilcSFTPHandle handle; handle = silc_calloc(1, sizeof(*handle)); + if (!handle) + return NULL; handle->data = silc_calloc(data_len, sizeof(*handle->data)); + if (!handle->data) + return NULL; memcpy(handle->data, data, data_len); handle->data_len = data_len; @@ -81,7 +88,7 @@ static void silc_sftp_handle_delete(SilcSFTPHandle handle) /* Returns the handle data of the `handle' to the `data' pointer. */ -static void silc_sftp_handle_get(SilcSFTPHandle handle, +static void silc_sftp_handle_get(SilcSFTPHandle handle, const unsigned char **data, SilcUInt32 *data_len) { @@ -89,14 +96,15 @@ static void silc_sftp_handle_get(SilcSFTPHandle handle, *data_len = handle->data_len; } -/* General routine to send SFTP packet to the SFTP server. */ +/* Generic routine to send SFTP packet to the SFTP server. */ static void silc_sftp_send_packet(SilcSFTPClient sftp, - SilcSFTPPacket type, + SilcSFTPPacket type, SilcUInt32 len, ...) { SilcBuffer tmp; va_list vp; + int ret; va_start(vp, len); tmp = silc_sftp_packet_encode_vp(type, sftp->packet, len, vp); @@ -105,20 +113,39 @@ static void silc_sftp_send_packet(SilcSFTPClient sftp, return; sftp->packet = tmp; - SILC_LOG_HEXDUMP(("SFTP packet to server"), sftp->packet->data, - sftp->packet->len); + SILC_LOG_HEXDUMP(("SFTP packet to server"), sftp->packet->data, + silc_buffer_len(sftp->packet)); /* Send the packet */ - (*sftp->send_packet)(sftp->sock, sftp->packet, sftp->send_context); + while (silc_buffer_len(sftp->packet) > 0) { + ret = silc_stream_write(sftp->stream, silc_buffer_data(sftp->packet), + silc_buffer_len(sftp->packet)); + if (ret == -2) { + SILC_LOG_ERROR(("Error sending SFTP packet type %d", type)); + sftp->error((SilcSFTP)sftp, SILC_SFTP_STATUS_NO_CONNECTION, + sftp->context); + silc_buffer_reset(sftp->packet); + return; + } + if (ret == 0) { + sftp->error((SilcSFTP)sftp, SILC_SFTP_STATUS_EOF, sftp->context); + silc_buffer_reset(sftp->packet); + return; + } + if (ret == -1) + return; + + silc_buffer_pull(sftp->packet, ret); + } /* Clear packet */ - sftp->packet->data = sftp->packet->tail = sftp->packet->head; - sftp->packet->len = 0; + silc_buffer_reset(sftp->packet); } /* Finds request by request ID. */ -static SilcSFTPRequest silc_sftp_find_request(SilcSFTPClient sftp, SilcUInt32 id) +static SilcSFTPRequest silc_sftp_find_request(SilcSFTPClient sftp, + SilcUInt32 id) { SilcSFTPRequest req; @@ -130,7 +157,7 @@ static SilcSFTPRequest silc_sftp_find_request(SilcSFTPClient sftp, SilcUInt32 id return req; } - SILC_LOG_DEBUG(("Unknown request ID")); + SILC_LOG_DEBUG(("Unknown request ID %d", id)); return NULL; } @@ -140,8 +167,8 @@ static SilcSFTPRequest silc_sftp_find_request(SilcSFTPClient sftp, SilcUInt32 id operation. The variable argument list includes the status and req->type specific data. */ -static void silc_sftp_call_request(SilcSFTPClient sftp, - SilcSFTPRequest req, +static void silc_sftp_call_request(SilcSFTPClient sftp, + SilcSFTPRequest req, SilcSFTPPacket type, SilcSFTPStatus status, ...) { @@ -168,9 +195,9 @@ static void silc_sftp_call_request(SilcSFTPClient sftp, data_len = (SilcUInt32)va_arg(vp, SilcUInt32); if (req->data) - (*req->data)((SilcSFTP)sftp, status, (const unsigned char *)data, + (*req->data)((SilcSFTP)sftp, status, (const unsigned char *)data, data_len, req->context); - } + } break; case SILC_SFTP_OPEN: @@ -190,6 +217,11 @@ static void silc_sftp_call_request(SilcSFTPClient sftp, hdata = (unsigned char *)va_arg(vp, unsigned char *); hdata_len = (SilcUInt32)va_arg(vp, SilcUInt32); handle = silc_sftp_handle_create(hdata, hdata_len); + if (!handle) { + if (req->handle) + (*req->handle)((SilcSFTP)sftp, status, NULL, req->context); + break; + } if (req->handle) (*req->handle)((SilcSFTP)sftp, status, handle, req->context); @@ -213,7 +245,7 @@ static void silc_sftp_call_request(SilcSFTPClient sftp, language_tag = (char *)va_arg(vp, char *); if (req->status) - (*req->status)((SilcSFTP)sftp, status, (const char *)message, + (*req->status)((SilcSFTP)sftp, status, (const char *)message, (const char *)language_tag, req->context); } break; @@ -234,7 +266,7 @@ static void silc_sftp_call_request(SilcSFTPClient sftp, attr = (SilcSFTPAttributes)va_arg(vp, SilcSFTPAttributes); if (req->attr) - (*req->attr)((SilcSFTP)sftp, status, (const SilcSFTPAttributes)attr, + (*req->attr)((SilcSFTP)sftp, status, (const SilcSFTPAttributes)attr, req->context); } break; @@ -275,12 +307,13 @@ static void silc_sftp_call_request(SilcSFTPClient sftp, data_len = (SilcUInt32)va_arg(vp, SilcUInt32); if (req->extended) - (*req->extended)((SilcSFTP)sftp, status, (const unsigned char *)data, + (*req->extended)((SilcSFTP)sftp, status, (const unsigned char *)data, data_len, req->context); } break; default: + SILC_LOG_DEBUG(("Unknown request type %d", req->type)); break; } @@ -291,34 +324,103 @@ static void silc_sftp_call_request(SilcSFTPClient sftp, va_end(vp); } -/* Starts SFTP client by associating the socket connection `sock' to the - created SFTP client context. The version callback indicated by the - `callback' will be called after the SFTP session has been started - and server has returned the version of the protocol. The SFTP client - context is returned in the callback too. This returns the allocated - SFTP client context or NULL on error. */ - -SilcSFTP silc_sftp_client_start(SilcSocketConnection sock, - SilcSFTPSendPacketCallback send_packet, - void *send_context, - SilcSFTPVersionCallback callback, +/* Handles stream I/O */ + +static void silc_sftp_client_io(SilcStream stream, SilcStreamStatus status, + void *context) +{ + SilcSFTPClient sftp = context; + unsigned char inbuf[65536]; + SilcBufferStruct packet; + int ret; + + switch (status) { + case SILC_STREAM_CAN_READ: + SILC_LOG_DEBUG(("Reading data from stream")); + + /* Read data from stream */ + ret = silc_stream_read(stream, inbuf, sizeof(inbuf)); + if (ret <= 0) { + if (ret == 0) + sftp->error(context, SILC_SFTP_STATUS_EOF, sftp->context); + if (ret == -2) + sftp->error(context, SILC_SFTP_STATUS_NO_CONNECTION, sftp->context); + return; + } + + SILC_LOG_DEBUG(("Read %d bytes", ret)); + + /* Now process the SFTP packet */ + silc_buffer_set(&packet, inbuf, ret); + silc_sftp_client_receive_process(context, &packet); + break; + + case SILC_STREAM_CAN_WRITE: + if (!silc_buffer_headlen(sftp->packet)) + return; + + SILC_LOG_DEBUG(("Writing pending data to stream")); + + /* Write pending data to stream */ + silc_buffer_push(sftp->packet, silc_buffer_headlen(sftp->packet)); + while (silc_buffer_len(sftp->packet) > 0) { + ret = silc_stream_write(stream, sftp->packet->data, + silc_buffer_len(sftp->packet)); + if (ret == 0) { + sftp->error(context, SILC_SFTP_STATUS_EOF, sftp->context); + silc_buffer_reset(sftp->packet); + return; + } + + if (ret == -2) { + sftp->error(context, SILC_SFTP_STATUS_NO_CONNECTION, sftp->context); + silc_buffer_reset(sftp->packet); + return; + } + + if (ret == -1) + return; + + /* Wrote data */ + silc_buffer_pull(sftp->packet, ret); + } + break; + + default: + break; + } +} + +/* Starts SFTP client and returns context for it. */ + +SilcSFTP silc_sftp_client_start(SilcStream stream, + SilcSchedule schedule, + SilcSFTPVersionCallback version_cb, + SilcSFTPErrorCallback error_cb, void *context) { SilcSFTPClient sftp; - if (!send_packet) + SILC_LOG_DEBUG(("Starting SFTP client")); + + if (!stream) return NULL; sftp = silc_calloc(1, sizeof(*sftp)); - sftp->sock = sock; - sftp->send_packet = send_packet; - sftp->send_context = send_context; - sftp->version = callback; - sftp->version_context = context; + if (!sftp) + return NULL; + sftp->stream = stream; + sftp->version = version_cb; + sftp->error = error_cb; + sftp->context = context; + sftp->schedule = schedule; silc_list_init(sftp->requests, struct SilcSFTPRequestStruct, next); + /* We handle the stream now */ + silc_stream_set_notifier(stream, schedule, silc_sftp_client_io, sftp); + /* Send the SFTP session initialization to the server */ - silc_sftp_send_packet(sftp, SILC_SFTP_INIT, 4, + silc_sftp_send_packet(sftp, SILC_SFTP_INIT, 4, SILC_STR_UI_INT(SILC_SFTP_PROTOCOL_VERSION), SILC_STR_END); @@ -333,39 +435,60 @@ void silc_sftp_client_shutdown(SilcSFTP context) { SilcSFTPClient sftp = (SilcSFTPClient)context; + silc_stream_set_notifier(sftp->stream, sftp->schedule, NULL, NULL); if (sftp->packet) silc_buffer_free(sftp->packet); silc_free(sftp); } /* Function that is called to process the incmoing SFTP packet. */ -/* XXX Some day this will go away and we have automatic receive callbacks - for SilcSocketConnection API or SilcPacketContext API. */ -void silc_sftp_client_receive_process(SilcSFTP context, - SilcSocketConnection sock, - SilcPacketContext *packet) +void silc_sftp_client_receive_process(SilcSFTP context, SilcBuffer buffer) { SilcSFTPClient sftp = (SilcSFTPClient)context; SilcSFTPRequest req; SilcSFTPPacket type; - const unsigned char *payload = NULL; + unsigned char *payload = NULL; SilcUInt32 payload_len; int ret; SilcBufferStruct buf; SilcUInt32 id; - SILC_LOG_DEBUG(("Start")); + SILC_LOG_DEBUG(("Process SFTP packet")); /* Parse the packet */ - type = silc_sftp_packet_decode(packet->buffer, (unsigned char **)&payload, - &payload_len); - if (!type) + type = silc_sftp_packet_decode(buffer, &payload, &payload_len); + if (type <= 0) return; - silc_buffer_set(&buf, (unsigned char *)payload, payload_len); + silc_buffer_set(&buf, payload, payload_len); switch (type) { + case SILC_SFTP_DATA: + { + unsigned char *data = NULL; + SilcUInt32 data_len = 0; + + SILC_LOG_DEBUG(("Data packet")); + + ret = silc_buffer_unformat(&buf, + SILC_STR_UI_INT(&id), + SILC_STR_UI32_NSTRING(&data, &data_len), + SILC_STR_END); + if (ret < 0) + break; + + /* Get request */ + req = silc_sftp_find_request(sftp, id); + if (!req) + break; + + /* Call the callback */ + silc_sftp_call_request(sftp, req, type, SILC_SFTP_STATUS_OK, + data, data_len); + } + break; + case SILC_SFTP_VERSION: { SilcSFTPVersion version; @@ -376,14 +499,14 @@ void silc_sftp_client_receive_process(SilcSFTP context, SILC_STR_UI_INT(&version), SILC_STR_END); if (ret < 0) { - (*sftp->version)((SilcSFTP)sftp, SILC_SFTP_STATUS_FAILURE, 0, - sftp->version_context); + (*sftp->version)((SilcSFTP)sftp, SILC_SFTP_STATUS_FAILURE, 0, + sftp->context); break; } /* Call the callback */ - (*sftp->version)((SilcSFTP)sftp, SILC_SFTP_STATUS_OK, version, - sftp->version_context); + (*sftp->version)((SilcSFTP)sftp, SILC_SFTP_STATUS_OK, version, + sftp->context); } break; @@ -394,7 +517,7 @@ void silc_sftp_client_receive_process(SilcSFTP context, SILC_LOG_DEBUG(("Status packet")); - ret = silc_buffer_unformat(&buf, + ret = silc_buffer_unformat(&buf, SILC_STR_UI_INT(&id), SILC_STR_UI_INT(&status), SILC_STR_END); @@ -436,9 +559,9 @@ void silc_sftp_client_receive_process(SilcSFTP context, SILC_LOG_DEBUG(("Handle packet")); - ret = silc_buffer_unformat(&buf, + ret = silc_buffer_unformat(&buf, SILC_STR_UI_INT(&id), - SILC_STR_UI32_NSTRING(&handle, + SILC_STR_UI32_NSTRING(&handle, &handle_len), SILC_STR_END); if (ret < 0) @@ -450,36 +573,11 @@ void silc_sftp_client_receive_process(SilcSFTP context, break; /* Call the callback */ - silc_sftp_call_request(sftp, req, type, SILC_SFTP_STATUS_OK, + silc_sftp_call_request(sftp, req, type, SILC_SFTP_STATUS_OK, handle, handle_len); } break; - case SILC_SFTP_DATA: - { - unsigned char *data = NULL; - SilcUInt32 data_len = 0; - - SILC_LOG_DEBUG(("Data packet")); - - ret = silc_buffer_unformat(&buf, - SILC_STR_UI_INT(&id), - SILC_STR_UI32_NSTRING(&data, &data_len), - SILC_STR_END); - if (ret < 0) - break; - - /* Get request */ - req = silc_sftp_find_request(sftp, id); - if (!req) - break; - - /* Call the callback */ - silc_sftp_call_request(sftp, req, type, SILC_SFTP_STATUS_OK, - data, data_len); - } - break; - case SILC_SFTP_NAME: { SilcUInt32 count; @@ -487,7 +585,7 @@ void silc_sftp_client_receive_process(SilcSFTP context, SILC_LOG_DEBUG(("Name packet")); - ret = silc_buffer_unformat(&buf, + ret = silc_buffer_unformat(&buf, SILC_STR_UI_INT(&id), SILC_STR_UI_INT(&count), SILC_STR_END); @@ -519,10 +617,11 @@ void silc_sftp_client_receive_process(SilcSFTP context, SILC_LOG_DEBUG(("Attributes packet")); - ret = silc_buffer_unformat(&buf, - SILC_STR_UI_INT(&id), - SILC_STR_UI_XNSTRING(&data, buf.len - 4), - SILC_STR_END); + ret = + silc_buffer_unformat(&buf, + SILC_STR_UI_INT(&id), + SILC_STR_DATA(&data, silc_buffer_len(&buf) - 4), + SILC_STR_END); if (ret < 0) break; @@ -531,7 +630,7 @@ void silc_sftp_client_receive_process(SilcSFTP context, if (!req) break; - silc_buffer_set(&tmpbuf, data, buf.len - 4); + silc_buffer_set(&tmpbuf, data, silc_buffer_len(&buf) - 4); attr = silc_sftp_attr_decode(&tmpbuf); if (!attr) break; @@ -547,9 +646,10 @@ void silc_sftp_client_receive_process(SilcSFTP context, SILC_LOG_DEBUG(("Extended reply packet")); - ret = silc_buffer_unformat(&buf, + ret = silc_buffer_unformat(&buf, SILC_STR_UI_INT(&id), - SILC_STR_UI_XNSTRING(&data, buf.len - 4), + SILC_STR_DATA(&data, + silc_buffer_len(&buf) - 4), SILC_STR_END); if (ret < 0) break; @@ -560,8 +660,8 @@ void silc_sftp_client_receive_process(SilcSFTP context, break; /* Call the callback */ - silc_sftp_call_request(sftp, req, type, SILC_SFTP_STATUS_OK, - data, buf.len - 4); + silc_sftp_call_request(sftp, req, type, SILC_SFTP_STATUS_OK, + data, silc_buffer_len(&buf) - 4); } break; @@ -570,7 +670,7 @@ void silc_sftp_client_receive_process(SilcSFTP context, } } -void silc_sftp_open(SilcSFTP sftp, +void silc_sftp_open(SilcSFTP sftp, const char *filename, SilcSFTPFileOperation pflags, SilcSFTPAttributes attrs, @@ -585,6 +685,8 @@ void silc_sftp_open(SilcSFTP sftp, SILC_LOG_DEBUG(("Open request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_OPEN; req->handle = callback; @@ -592,15 +694,17 @@ void silc_sftp_open(SilcSFTP sftp, silc_list_add(client->requests, req); attrs_buf = silc_sftp_attr_encode(attrs); - len = 4 + 4 + strlen(filename) + 4 + attrs_buf->len; + if (!attrs_buf) + return; + len = 4 + 4 + strlen(filename) + 4 + silc_buffer_len(attrs_buf); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(filename)), SILC_STR_UI32_STRING(filename), SILC_STR_UI_INT(pflags), - SILC_STR_UI_XNSTRING(attrs_buf->data, - attrs_buf->len), + SILC_STR_UI_XNSTRING(attrs_buf->data, + silc_buffer_len(attrs_buf)), SILC_STR_END); silc_buffer_free(attrs_buf); @@ -620,6 +724,8 @@ void silc_sftp_close(SilcSFTP sftp, SILC_LOG_DEBUG(("Close request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_CLOSE; req->status = callback; @@ -629,16 +735,17 @@ void silc_sftp_close(SilcSFTP sftp, silc_sftp_handle_get(handle, &hdata, &hdata_len); len = 4 + 4 + hdata_len; - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(hdata_len), SILC_STR_UI_XNSTRING(hdata, hdata_len), SILC_STR_END); + silc_sftp_handle_delete(handle); } void silc_sftp_read(SilcSFTP sftp, SilcSFTPHandle handle, - SilcUInt64 offset, + SilcUInt64 offset, SilcUInt32 len, SilcSFTPDataCallback callback, void *context) @@ -652,6 +759,8 @@ void silc_sftp_read(SilcSFTP sftp, SILC_LOG_DEBUG(("Read request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_READ; req->data = callback; @@ -661,7 +770,7 @@ void silc_sftp_read(SilcSFTP sftp, silc_sftp_handle_get(handle, &hdata, &hdata_len); len2 = 4 + 4 + hdata_len + 8 + 4; - silc_sftp_send_packet(client, req->type, len2, + silc_sftp_send_packet(client, req->type, len2, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(hdata_len), SILC_STR_UI_XNSTRING(hdata, hdata_len), @@ -687,6 +796,8 @@ void silc_sftp_write(SilcSFTP sftp, SILC_LOG_DEBUG(("Write request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_WRITE; req->status = callback; @@ -696,7 +807,7 @@ void silc_sftp_write(SilcSFTP sftp, silc_sftp_handle_get(handle, &hdata, &hdata_len); len = 4 + 4 + hdata_len + 8 + 4 + data_len; - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(hdata_len), SILC_STR_UI_XNSTRING(hdata, hdata_len), @@ -718,6 +829,8 @@ void silc_sftp_remove(SilcSFTP sftp, SILC_LOG_DEBUG(("Remove request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_REMOVE; req->status = callback; @@ -726,7 +839,7 @@ void silc_sftp_remove(SilcSFTP sftp, len = 4 + 4 + strlen(filename); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(filename)), SILC_STR_UI32_STRING(filename), @@ -746,6 +859,8 @@ void silc_sftp_rename(SilcSFTP sftp, SILC_LOG_DEBUG(("Rename request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_RENAME; req->status = callback; @@ -754,7 +869,7 @@ void silc_sftp_rename(SilcSFTP sftp, len = 4 + 4 + strlen(oldname) + 4 + strlen(newname); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(oldname)), SILC_STR_UI32_STRING(oldname), @@ -777,6 +892,8 @@ void silc_sftp_mkdir(SilcSFTP sftp, SILC_LOG_DEBUG(("Mkdir request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_MKDIR; req->status = callback; @@ -784,14 +901,16 @@ void silc_sftp_mkdir(SilcSFTP sftp, silc_list_add(client->requests, req); attrs_buf = silc_sftp_attr_encode(attrs); - len = 4 + 4 + strlen(path) + attrs_buf->len; + if (!attrs_buf) + return; + len = 4 + 4 + strlen(path) + silc_buffer_len(attrs_buf); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), SILC_STR_UI_XNSTRING(attrs_buf->data, - attrs_buf->len), + silc_buffer_len(attrs_buf)), SILC_STR_END); silc_buffer_free(attrs_buf); @@ -809,6 +928,8 @@ void silc_sftp_rmdir(SilcSFTP sftp, SILC_LOG_DEBUG(("Rmdir request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_RMDIR; req->status = callback; @@ -817,7 +938,7 @@ void silc_sftp_rmdir(SilcSFTP sftp, len = 4 + 4 + strlen(path); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), @@ -836,6 +957,8 @@ void silc_sftp_opendir(SilcSFTP sftp, SILC_LOG_DEBUG(("Opendir request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_OPENDIR; req->handle = callback; @@ -844,7 +967,7 @@ void silc_sftp_opendir(SilcSFTP sftp, len = 4 + 4 + strlen(path); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), @@ -865,6 +988,8 @@ void silc_sftp_readdir(SilcSFTP sftp, SILC_LOG_DEBUG(("Readdir request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_READDIR; req->name = callback; @@ -874,7 +999,7 @@ void silc_sftp_readdir(SilcSFTP sftp, silc_sftp_handle_get(handle, &hdata, &hdata_len); len = 4 + 4 + hdata_len; - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(hdata_len), SILC_STR_UI_XNSTRING(hdata, hdata_len), @@ -893,6 +1018,8 @@ void silc_sftp_stat(SilcSFTP sftp, SILC_LOG_DEBUG(("Stat request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_STAT; req->attr = callback; @@ -901,7 +1028,7 @@ void silc_sftp_stat(SilcSFTP sftp, len = 4 + 4 + strlen(path); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), @@ -920,6 +1047,8 @@ void silc_sftp_lstat(SilcSFTP sftp, SILC_LOG_DEBUG(("Lstat request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_LSTAT; req->attr = callback; @@ -928,7 +1057,7 @@ void silc_sftp_lstat(SilcSFTP sftp, len = 4 + 4 + strlen(path); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), @@ -949,6 +1078,8 @@ void silc_sftp_fstat(SilcSFTP sftp, SILC_LOG_DEBUG(("Fstat request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_FSTAT; req->attr = callback; @@ -958,7 +1089,7 @@ void silc_sftp_fstat(SilcSFTP sftp, silc_sftp_handle_get(handle, &hdata, &hdata_len); len = 4 + 4 + hdata_len; - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(hdata_len), SILC_STR_UI_XNSTRING(hdata, hdata_len), @@ -979,6 +1110,8 @@ void silc_sftp_setstat(SilcSFTP sftp, SILC_LOG_DEBUG(("Setstat request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_SETSTAT; req->status = callback; @@ -986,14 +1119,16 @@ void silc_sftp_setstat(SilcSFTP sftp, silc_list_add(client->requests, req); attrs_buf = silc_sftp_attr_encode(attrs); - len = 4 + 4 + strlen(path) + attrs_buf->len; + if (!attrs_buf) + return; + len = 4 + 4 + strlen(path) + silc_buffer_len(attrs_buf); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), SILC_STR_UI_XNSTRING(attrs_buf->data, - attrs_buf->len), + silc_buffer_len(attrs_buf)), SILC_STR_END); silc_buffer_free(attrs_buf); @@ -1015,6 +1150,8 @@ void silc_sftp_fsetstat(SilcSFTP sftp, SILC_LOG_DEBUG(("Fsetstat request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_FSETSTAT; req->status = callback; @@ -1023,14 +1160,16 @@ void silc_sftp_fsetstat(SilcSFTP sftp, silc_sftp_handle_get(handle, &hdata, &hdata_len); attrs_buf = silc_sftp_attr_encode(attrs); - len = 4 + 4 + hdata_len + attrs_buf->len; + if (!attrs_buf) + return; + len = 4 + 4 + hdata_len + silc_buffer_len(attrs_buf); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(hdata_len), SILC_STR_UI_XNSTRING(hdata, hdata_len), SILC_STR_UI_XNSTRING(attrs_buf->data, - attrs_buf->len), + silc_buffer_len(attrs_buf)), SILC_STR_END); silc_buffer_free(attrs_buf); @@ -1048,6 +1187,8 @@ void silc_sftp_readlink(SilcSFTP sftp, SILC_LOG_DEBUG(("Readlink request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_READLINK; req->name = callback; @@ -1056,7 +1197,7 @@ void silc_sftp_readlink(SilcSFTP sftp, len = 4 + 4 + strlen(path); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), @@ -1076,6 +1217,8 @@ void silc_sftp_symlink(SilcSFTP sftp, SILC_LOG_DEBUG(("Symlink request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_SYMLINK; req->status = callback; @@ -1084,7 +1227,7 @@ void silc_sftp_symlink(SilcSFTP sftp, len = 4 + 4 + strlen(linkpath) + 4 + strlen(targetpath); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(linkpath)), SILC_STR_UI32_STRING(linkpath), @@ -1105,6 +1248,8 @@ void silc_sftp_realpath(SilcSFTP sftp, SILC_LOG_DEBUG(("Realpath request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_REALPATH; req->name = callback; @@ -1113,7 +1258,7 @@ void silc_sftp_realpath(SilcSFTP sftp, len = 4 + 4 + strlen(path); - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(path)), SILC_STR_UI32_STRING(path), @@ -1134,6 +1279,8 @@ void silc_sftp_extended(SilcSFTP sftp, SILC_LOG_DEBUG(("Extended request")); req = silc_calloc(1, sizeof(*req)); + if (!req) + return; req->id = client->id++; req->type = SILC_SFTP_WRITE; req->extended = callback; @@ -1142,7 +1289,7 @@ void silc_sftp_extended(SilcSFTP sftp, len = 4 + 4 + strlen(request) + data_len; - silc_sftp_send_packet(client, req->type, len, + silc_sftp_send_packet(client, req->type, len, SILC_STR_UI_INT(req->id), SILC_STR_UI_INT(strlen(request)), SILC_STR_UI32_STRING(request),