libpdtp-svn Mailing List for libpdtp (Page 2)
Status: Alpha
Brought to you by:
bascule
You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(3) |
Nov
(3) |
Dec
(13) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <tar...@pd...> - 2004-09-21 19:45:45
|
Author: tarcieri Date: 2004-09-21 13:45:35 -0600 (Tue, 21 Sep 2004) New Revision: 40 Modified: download.c Log: Download support updates and bugfixes Modified: download.c =================================================================== --- download.c 2004-09-09 18:49:34 UTC (rev 39) +++ download.c 2004-09-21 19:45:35 UTC (rev 40) @@ -217,11 +217,15 @@ pdtp_transaction_out_t out; pdtp_notifier_t notifier; + debug("pdtp_download_run() starting"); + /* pdtp_piecelist_create() handles not only MD5 checksumming but also truncating the file to the specified length */ if(!(list = pdtp__piecelist_create(file, (pdtp_filelen_t)dl->length, dl->piece_length, dl->hashes))) { /* XXX Some sort of error handling here */ + debug("Couldn't hash existing file"); + return; } @@ -250,11 +254,19 @@ return; } - if((i = pdtp__transaction_object_index(in, OBJ_HANDLE)) < 0) + if((i = pdtp__transaction_object_index(in, OBJ_HANDLE)) < 0) { +#ifndef NDEBUG + debug("No handle object!"); +#endif goto err; + } - if(pdtp__transaction_object_uint32(in, i, &dl->handle) < 0) + if(pdtp__transaction_object_uint32(in, i, &dl->handle) < 0) { +#ifndef NDEBUG + debug("Invalid handle object!"); +#endif goto err; + } #ifndef NDEBUG debug("dl->handle is: %d", dl->handle); @@ -285,14 +297,25 @@ dl->file = file; dl->callback = table; +#ifndef NDEBUG + debug("Calling pdtp__multiplexer_run()"); +#endif + pdtp__multiplexer_run(dl->mplx); err: pdtp_set_last_error(ERROR_DOWNLOAD_INIT); + +#ifndef NDEBUG + debug("Freeing transaction"); +#endif + pdtp__transaction_in_destroy(in); - pdtp__free(dl); /* XXX Yipe, we really need to do something here */ +#ifndef NDEBUG + debug("Error running download"); +#endif } void pdtp_download_stop(pdtp_download_t dl) |
From: <tar...@pd...> - 2004-09-09 18:49:51
|
Author: tarcieri Date: 2004-09-09 12:49:34 -0600 (Thu, 09 Sep 2004) New Revision: 39 Modified: download.c errmsg.h Log: Download support updates Modified: download.c =================================================================== --- download.c 2004-08-13 18:38:06 UTC (rev 38) +++ download.c 2004-09-09 18:49:34 UTC (rev 39) @@ -55,6 +55,9 @@ /* Internal definition of download structure */ struct pdtp_download { + /* File path */ + char *path; + /* Handle of file */ uint32_t handle; @@ -123,8 +126,10 @@ pdtp__transaction_out_destroy(out); /* Read the server's reply */ - if(!(in = pdtp__transaction_wait(conn, notifier, PDTP_STORE))) + if(!(in = pdtp__transaction_wait(conn, notifier, PDTP_STORE))) { + pdtp_set_last_error(ERROR_FILEINFO); return 0; + } if(!pdtp__transaction_id(in)) { if((i = pdtp__transaction_object_index(in, OBJ_ERRMSG)) < 0 || pdtp__transaction_object_string(in, i, &errstr) < 0) @@ -138,16 +143,8 @@ dl = NEW(pdtp_download); - if((i = pdtp__transaction_object_index(in, OBJ_HANDLE)) < 0) - goto err; + dl->path = pdtp__strdup(path); - if(pdtp__transaction_object_uint32(in, i, &dl->handle) < 0) - goto err; - -#ifndef NDEBUG - debug("dl->handle is: %d", dl->handle); -#endif - if((i = pdtp__transaction_object_index(in, OBJ_FILELEN)) < 0) goto err; @@ -194,6 +191,7 @@ return dl; err: + pdtp_set_last_error(ERROR_FILEINFO); pdtp__transaction_in_destroy(in); pdtp__free(dl); @@ -212,6 +210,7 @@ void pdtp_download_run(pdtp_download_t dl, pdtp_file_t file, pdtp_callback_table_t *table, void *ptr) { + unsigned i; uint32_t value; pdtp_piecelist_t list; pdtp_transaction_in_t in; @@ -228,7 +227,7 @@ out = pdtp__transaction_create(TXN_DOWNLOAD, 2); notifier = pdtp__transaction_set_serial(out, dl->conn); - pdtp__transaction_add_int32(out, OBJ_HANDLE, dl->handle); + pdtp__transaction_add_string(out, OBJ_PATH, dl->path); pdtp__piecelist_add_to_transaction(out, list); pdtp__transaction_write(dl->conn, out); pdtp__transaction_out_destroy(out); @@ -251,6 +250,16 @@ return; } + if((i = pdtp__transaction_object_index(in, OBJ_HANDLE)) < 0) + goto err; + + if(pdtp__transaction_object_uint32(in, i, &dl->handle) < 0) + goto err; + +#ifndef NDEBUG + debug("dl->handle is: %d", dl->handle); +#endif + pdtp__transaction_in_destroy(in); /* Create the multiplexer for this download */ @@ -277,6 +286,13 @@ dl->callback = table; pdtp__multiplexer_run(dl->mplx); + +err: + pdtp_set_last_error(ERROR_DOWNLOAD_INIT); + pdtp__transaction_in_destroy(in); + pdtp__free(dl); + + /* XXX Yipe, we really need to do something here */ } void pdtp_download_stop(pdtp_download_t dl) Modified: errmsg.h =================================================================== --- errmsg.h 2004-08-13 18:38:06 UTC (rev 38) +++ errmsg.h 2004-09-09 18:49:34 UTC (rev 39) @@ -25,6 +25,9 @@ /** Error listing a directory */ #define ERROR_DIRLIST "Error listing directory" +/** Error getting file information */ +#define ERROR_FILEINFO "Error retrieving file information from server" + /** Error initializing download */ #define ERROR_DOWNLOAD_INIT "Error initializing download" |