Merge remote-tracking branch 'other/ticket37' into ticket

[stg.git] / projects / stargazer / plugins / other / rscript / send_functor.h

diff --git a/projects/stargazer/plugins/other/rscript/send_functor.h b/projects/stargazer/plugins/other/rscript/send_functor.h
index 479cdc3b84275b6fc67ae32a0f32b393b7ac46c2..a14fe20b3e95cdf18ec602fc656d087974ab0654 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/send_functor.h
+++ b/projects/stargazer/plugins/other/rscript/send_functor.h
@@ -32,30 +32,29 @@
 
 #include <functional>
 
 
 #include <functional>
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 

-class PacketSender : public std::unary_function<uint32_t, void> {
+class PacketSender : public std::unary_function<uint32_t, ssize_t> {

     public:
     public:

-        PacketSender(int s, char * b, int l, uint16_t p)
+        PacketSender(int s, char * b, size_t l, uint16_t p)

             : sock(s),
               buffer(b),
               length(l),
             : sock(s),
               buffer(b),
               length(l),

-              port(p) {};
-        void operator() (uint32_t ip)
+              port(p) {}
+        ssize_t operator() (uint32_t ip)

         {
         {

-        int res;

         struct sockaddr_in sendAddr;
 
         sendAddr.sin_family = AF_INET;
         sendAddr.sin_port = port;
         sendAddr.sin_addr.s_addr = ip;
 
         struct sockaddr_in sendAddr;
 
         sendAddr.sin_family = AF_INET;
         sendAddr.sin_port = port;
         sendAddr.sin_addr.s_addr = ip;
 

-        res = sendto(sock, buffer, length, 0, (struct sockaddr*)&sendAddr, sizeof(sendAddr));
+        return sendto(sock, buffer, length, 0, (struct sockaddr*)&sendAddr, sizeof(sendAddr));

         }
     private:
         int sock;
         char * buffer;
         }
     private:
         int sock;
         char * buffer;

-        int length;
+        size_t length;

         uint16_t port;
 };
 
         uint16_t port;
 };