Fix stats incrementation in RecvFrom and use the right address in RecvDatagram.

diff --git a/src/libswift/channel.cpp b/src/libswift/channel.cpp
index 4fed7a5..2d9640c 100644 (file)
--- a/src/libswift/channel.cpp
+++ b/src/libswift/channel.cpp
@@ -281,8 +281,8 @@ int Channel::SendTo (evutil_socket_t sock, const Address& addr, struct evbuffer
 }
 
 int Channel::RecvFrom (evutil_socket_t sock, Address& addr, struct evbuffer **evb) {
-    socklen_t addrlen = sizeof(struct sockaddr_mptp) + addr.addr->count * sizeof(mptp_dest);
        int count = addr.addr->count;
+    socklen_t addrlen = sizeof(struct sockaddr_mptp) + count * sizeof(mptp_dest);
     struct evbuffer_iovec vec[count];
        for (int i=0; i<count; ++i) {
                if (evbuffer_reserve_space(evb[i], SWIFT_MAX_RECV_DGRAM_SIZE, &vec[i], 1) < 0) {
@@ -299,7 +299,7 @@ int Channel::RecvFrom (evutil_socket_t sock, Address& addr, struct evbuffer **ev
                iov[i].iov_len = SWIFT_MAX_RECV_DGRAM_SIZE;
        }
        msg.msg_iov = iov;
-       msg.msg_iovlen = addr.addr->count;
+       msg.msg_iovlen = count;
        msg.msg_name = addr.addr;
        msg.msg_namelen = addrlen;
        int length = recvmsg(sock, &msg, 0);
@@ -321,14 +321,16 @@ int Channel::RecvFrom (evutil_socket_t sock, Address& addr, struct evbuffer **ev
         else
                print_error("error on recv");
     }
+       length = 0;
        for (int i=0; i<addr.addr->count; ++i) {
+               length += iov[i].iov_len;
                vec[i].iov_len = iov[i].iov_len;
                if (evbuffer_commit_space(evb[i], &vec[i], 1) < 0)  {
                        length = 0;
                        print_error("error on evbuffer_commit_space");
                }
        }
-    global_dgrams_down++;
+    global_dgrams_down+=addr.addr->count;
     global_raw_bytes_down+=length;
     Time();
     return length;

diff --git a/src/libswift/sendrecv.cpp b/src/libswift/sendrecv.cpp
index 5961ad5..6676913 100644 (file)
--- a/src/libswift/sendrecv.cpp
+++ b/src/libswift/sendrecv.cpp
@@ -914,7 +914,7 @@ void Channel::LibeventReceiveCallback(evutil_socket_t fd, short event, void *arg
     event_add(&evrecv, NULL);
 }
 
-#define NUM_DATAGRAMS 10
+#define NUM_DATAGRAMS 1
 
 void    Channel::RecvDatagram (evutil_socket_t socket) {
     struct evbuffer *pevb[NUM_DATAGRAMS];
@@ -927,34 +927,38 @@ void    Channel::RecvDatagram (evutil_socket_t socket) {
        addr.addr->count = NUM_DATAGRAMS;
     RecvFrom(socket, addr, pevb);
        int i = 0;
+       printf("Got %d addresses\n", addr.addr->count);
        for (; i<addr.addr->count; ++i) {
                struct evbuffer *evb = pevb[i];
+               Address fromi;
+               fromi.set_ipv4(addr.addr->dests[i].addr);
+               fromi.set_port(addr.addr->dests[i].port);
                size_t evboriglen = evbuffer_get_length(evb);
 #define return_log(...) { fprintf(stderr,__VA_ARGS__); evbuffer_free(evb); return; }
                if (evbuffer_get_length(evb)<4)
-                       return_log("socket layer weird: datagram shorter than 4 bytes from %s (prob ICMP unreach)\n",addr.str());
+                       return_log("socket layer weird: datagram shorter than 4 bytes from %s (prob ICMP unreach)\n",fromi.str());
                uint32_t mych = evbuffer_remove_32be(evb);
                Sha1Hash hash;
                Channel* channel = NULL;
                if (mych==0) { // peer initiates handshake
                        if (evbuffer_get_length(evb)<1+4+1+4+Sha1Hash::SIZE)
                                return_log ("%s #0 incorrect size %i initial handshake packet %s\n",
-                                               tintstr(),(int)evbuffer_get_length(evb),addr.str());
+                                               tintstr(),(int)evbuffer_get_length(evb),fromi.str());
                        uint8_t hashid = evbuffer_remove_8(evb);
                        if (hashid!=SWIFT_HASH)
                                return_log ("%s #0 no hash in the initial handshake %s\n",
-                                               tintstr(),addr.str());
+                                               tintstr(),fromi.str());
                        bin_t pos = bin_fromUInt32(evbuffer_remove_32be(evb));
                        if (!pos.is_all())
-                               return_log ("%s #0 that is not the root hash %s\n",tintstr(),addr.str());
+                               return_log ("%s #0 that is not the root hash %s\n",tintstr(),fromi.str());
                        hash = evbuffer_remove_hash(evb);
                        FileTransfer* ft = FileTransfer::Find(hash);
                        if (!ft)
-                               return_log ("%s #0 hash %s unknown, requested by %s\n",tintstr(),hash.hex().c_str(),addr.str());
+                               return_log ("%s #0 hash %s unknown, requested by %s\n",tintstr(),hash.hex().c_str(),fromi.str());
                        dprintf("%s #0 -hash ALL %s\n",tintstr(),hash.hex().c_str());
 
                        // Arno, 2012-02-27: Check for duplicate channel
-                       Channel* existchannel = ft->FindChannel(addr,NULL);
+                       Channel* existchannel = ft->FindChannel(fromi,NULL);
                        if (existchannel)
                        {
                                // Arno: 2011-10-13: Ignore if established, otherwise consider
@@ -964,7 +968,7 @@ void    Channel::RecvDatagram (evutil_socket_t socket) {
                                        // attempt is to new channel or to existing. Currently read
                                        // in OnHandshake()
                                        //
-                                       return_log("%s #0 have a channel already to %s\n",tintstr(),addr.str());
+                                       return_log("%s #0 have a channel already to %s\n",tintstr(),fromi.str());
                                } else {
                                        channel = existchannel;
                                        //fprintf(stderr,"Channel::RecvDatagram: HANDSHAKE: reuse channel %s\n", channel->peer_.str() );
@@ -972,18 +976,18 @@ void    Channel::RecvDatagram (evutil_socket_t socket) {
                        }
                        if (channel == NULL) {
                                //fprintf(stderr,"Channel::RecvDatagram: HANDSHAKE: create new channel %s\n", addr.str() );
-                               channel = new Channel(ft, socket, addr);
+                               channel = new Channel(ft, socket, fromi);
                        }
                        //fprintf(stderr,"CHANNEL INCOMING DEF hass %s is id %d\n",hash.hex().c_str(),channel->id());
 
                } else { // peer responds to my handshake (and other messages)
                        mych = DecodeID(mych);
                        if (mych>=channels.size())
-                               return_log("%s invalid channel #%u, %s\n",tintstr(),mych,addr.str());
+                               return_log("%s invalid channel #%u, %s\n",tintstr(),mych,fromi.str());
                        channel = channels[mych];
                        if (!channel)
                                return_log ("%s #%u is already closed\n",tintstr(),mych);
-                       if (channel->IsDiffSenderOrDuplicate(addr,mych)) {
+                       if (channel->IsDiffSenderOrDuplicate(fromi,mych)) {
                                channel->Schedule4Close();
                                return;
                        }
@@ -993,7 +997,7 @@ void    Channel::RecvDatagram (evutil_socket_t socket) {
                //dprintf("recvd %i bytes for %i\n",data.size(),channel->id);
                bool wasestablished = channel->is_established();
 
-               dprintf("%s #%u peer %s recv_peer %s addr %s\n", tintstr(),mych, channel->peer().str(), channel->recv_peer().str(), addr.str() );
+               dprintf("%s #%u peer %s recv_peer %s addr %s\n", tintstr(),mych, channel->peer().str(), channel->recv_peer().str(), fromi.str() );
 
                channel->Recv(evb);