Update:

[swifty.git] / src / lib_swift.c

diff --git a/src/lib_swift.c b/src/lib_swift.c
index d244b20..d26a208 100644 (file)
--- a/src/lib_swift.c
+++ b/src/lib_swift.c
@@ -8,6 +8,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#define DEBUG
 #include "lib_swift.h"
 
 struct sockSwiftaddr transformFromAddrToSwift(struct listsockaddr lsa)
@@ -39,17 +40,68 @@ struct listsockaddr transformFromSwiftToAddr(struct sockSwiftaddr ssa)
        return lsa;
 }
 
+// Function to receive a message
+ssize_t recvfromSwift(Swift s, void *buf, size_t len, int flags,
+                                         struct sockSwiftaddr *from, socklen_t fromlen)
+{
+       struct sockaddr s_other;
+       socklen_t slen=sizeof(s_other); 
+       ssize_t rec = -1, send;
+       char *command = "test";
+       struct listsockaddr lsa =  transformFromSwiftToAddr(*from);
+       int i, channel;
+       
+       Dprintf("create recv channel\n");       
+       // TODO make pool
+       if (s->usedChannels < s->maxChannels) 
+       {
+               channel = s->usedChannels++;
+               CHECK(s->recvChannel[channel] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP));
+
+               for ( i = 0 ; i < lsa.N ; i++) 
+               {
+                       Dprintf("send information to %s\n", inet_ntoa(lsa.sa[0].sin_addr));                     
+                       send = sendto(s->recvChannel[channel], command, strlen(command), 0, (const struct sockaddr *)&lsa.sa[i], sizeof(lsa.sa[i]));
+               }
+               
+               Dprintf("receive data\n");
+               // I'm waiting for response
+               rec = recvfrom(s->recvChannel[channel], buf, len, flags,  (struct sockaddr * __restrict__)&s_other, &slen);             
+       
+               close(s->recvChannel[channel]);
+               s->usedChannels--;
+       }
+       return rec;
+}
+
+// Function to send a message
+ssize_t sendToSwift(Swift s, const void *buf, size_t len, int flags, 
+                                       const struct sockSwiftaddr *to, socklen_t tolen) 
+{
+       struct listsockaddr lsa =  transformFromSwiftToAddr(*to);
+       int i;
+       ssize_t send = -1;
+       
+       Dprintf("send data\n");
+       for ( i = 0 ; i < lsa.N ; i++) 
+       {
+               send = sendto(s->sendChannel, buf, len, flags, (const struct sockaddr *)&lsa.sa[i], sizeof(lsa.sa[i]));
+       }
+       
+       return send;
+}
+// Function to listen to a port
 int listenfromSwift (Swift s, void *buf, size_t len, int flags,
-                 struct sockSwiftaddr * __restrict__ from, socklen_t *fromlen)
+                                        struct sockSwiftaddr * __restrict__ from, socklen_t *fromlen) 
 {
        struct sockaddr s_other;
        struct listsockaddr lsa;
-       socklen_t slen=sizeof(s_other);
-
-       Dprintf("wait to receive messages");
+       socklen_t slen=sizeof(s_other); 
+       ssize_t rec;
        
-       int rec = recvfrom(s->socketListener, buf, len, flags,
-               (struct sockaddr * __restrict__)&s_other, &slen);
+       Dprintf("wait to receive messages\n");
+       
+       rec = recvfrom(s->socketListener, buf, len, flags,  (struct sockaddr * __restrict__)&s_other, &slen);
        
        // fill listsockaddr
        memcpy(&lsa.sa[0], &s_other, sizeof(s_other));
@@ -60,38 +112,37 @@ int listenfromSwift (Swift s, void *buf, size_t len, int flags,
        return rec;
 }
 
+// Function to bind a port for swift socket
 int bindSwift(Swift s, const struct sockSwiftaddr *my_addr, socklen_t addrlen)
 {
-       Dprintf("bind swift socket");
-       return bind(s->socketListener, 
-               (const struct sockaddr *)&s->socketListenerAddr,
-               sizeof(s->socketListenerAddr));
+       Dprintf("bind swift socket\n");
+       struct listsockaddr lsa = transformFromSwiftToAddr(*my_addr);
+               
+       return bind(s->socketListener, (const struct sockaddr *)&lsa.sa[0], sizeof(lsa.sa[0]));
 }
 
-Swift socketSwift()
+// Function to create a Swift socket
+Swift socketSwift(int maxChannels)
 {
-       Dprintf("create swift socket"); 
+       Dprintf("create struct swift\n");       
        Swift s = calloc(1,sizeof(*s));
 
-       Dprintf("create swift socket listener");        
+       Dprintf("create swift socket listener\n");      
        CHECK(s->socketListener = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP));
 
-       Dprintf("create swift socket data");    
-       CHECK(s->socketData = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP));
+       Dprintf("create swift send channel\n"); 
+       CHECK(s->sendChannel = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP));
 
-       memset((char *) &s->socketListenerAddr, 0, sizeof(s->socketListenerAddr));
-       
-       s->socketListenerAddr.sin_family = AF_INET;
-       s->socketListenerAddr.sin_port = htons(SWIFT_PORT);
-       s->socketListenerAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-       
        return s;
 }
 
+
 void closeSwift(Swift s)
 {
-       Dprintf("close swift socket");
+       Dprintf("close swift socket\n");
        close(s->socketListener);
+       close(s->sendChannel);
+       
        
        free(s);
 }