[Libpdtp-svn] r62 - /

[<tar...@pd...>]

Author: tarcieri
Date: 2005-01-03 16:13:29 -0700 (Mon, 03 Jan 2005)
New Revision: 62

Modified:
   download.c
Log:
Readded success and failure reporting

Modified: download.c
===================================================================
--- download.c	2005-01-03 20:41:37 UTC (rev 61)
+++ download.c	2005-01-03 23:13:29 UTC (rev 62)
@@ -281,7 +281,6 @@
 {
 }
 
-#if 0
 static void transfer_success_notify(piece_transfer_params_t params)
 {
 	pdtp_transaction_out_t txn;
@@ -305,7 +304,6 @@
 	pdtp__transaction_write(params->dl->conn, txn);
 	pdtp__transaction_out_destroy(txn);
 }
-#endif
 
 static int download_transaction_handler(pdtp_multiplexer_t mplx, const pdtp_transaction_in_t txn, void *arg)
 {
@@ -405,6 +403,7 @@
 #ifndef NDEBUG
 		debug("Error: Connection refused");
 #endif
+		transfer_failure_notify(arg);
 
 		pdtp__free(arg);
 		pdtp__socket_close(sock);
@@ -431,6 +430,7 @@
 #ifndef NDEBUG
 		debug("Write error sending PTPP handshake");
 #endif
+		transfer_failure_notify(arg);
 
 		pdtp__free(arg);
 		pdtp__socket_close(sock);
@@ -501,6 +501,8 @@
         return 1;
 
 err:
+	transfer_failure_notify(arg);
+
 	pdtp__free(arg);
         pdtp__socket_close(sock);
         return 1;
@@ -521,7 +523,10 @@
 	uint8_t piece_request[8];
 	uint32_t value;
 
+	/* Check to see length of response was sufficient */
 	if(bytes != 18) {
+		transfer_failure_notify(arg);
+
         	pdtp__free(arg);
 	        pdtp__socket_close(sock);
 
@@ -618,7 +623,7 @@
         params->bytes_transferred += bytes;
         
         if(params->bytes_transferred == params->bytes_total) { 
-                /* XXX transfer_success_notify(params); */
+                transfer_success_notify(params);
                 goto done; 
         }
         
@@ -641,9 +646,8 @@
 #ifndef DEBUG
 	debug("Transfer failure!");
 #endif
-        /* XXX transfer_failure_notify(params); */
+        transfer_failure_notify(params);
 done:
-	pdtp__multiplexer_remove_socket(mplx, sock);
         pdtp__free(params);
         pdtp__socket_close(sock);