[GNUnet-SVN] r33218 - gnunet/src/scalarproduct

[gnunet]

Author: cfuchs
Date: 2014-05-08 11:55:00 +0200 (Thu, 08 May 2014)
New Revision: 33218

Modified:
   gnunet/src/scalarproduct/scalarproduct_api.c
Log:
- proper service-side error reporting for the SP API

Modified: gnunet/src/scalarproduct/scalarproduct_api.c
===================================================================
--- gnunet/src/scalarproduct/scalarproduct_api.c        2014-05-08 09:46:46 UTC 
(rev 33217)
+++ gnunet/src/scalarproduct/scalarproduct_api.c        2014-05-08 09:55:00 UTC 
(rev 33218)
@@ -228,12 +228,8 @@
       LOG (GNUNET_ERROR_TYPE_WARNING, "Disconnected by Service.\n");
       status = GNUNET_SCALARPRODUCT_Status_ServiceDisconnected;
     }
-  else if (GNUNET_MESSAGE_TYPE_SCALARPRODUCT_RESULT != ntohs (msg->type))
+  else if ((GNUNET_SYSERR != message->status) && (0 < message->product_length 
))
     {
-      LOG (GNUNET_ERROR_TYPE_WARNING, "Invalid message type received\n");
-    }
-  else if (0 < ntohl (message->product_length) || (0 == message->range))
-    {
       // response for the responder client, successful
       GNUNET_STATISTICS_update (h->stats,
                                 gettext_noop ("# SUC responder result messages 
received"), 1,
@@ -241,7 +237,11 @@
 
       status = GNUNET_SCALARPRODUCT_Status_Success;
     }
-
+  else if (message->status == GNUNET_SYSERR){
+      // service signaled an error
+      status = GNUNET_SCALARPRODUCT_Status_Failure;
+  }
+  
   if (h->cont_status != NULL)
     h->response_proc (h, msg, status);