Fix multiple sends for swift.

diff --git a/src/libswift/sendrecv.cpp b/src/libswift/sendrecv.cpp
index 1281192..cbdf264 100644 (file)
--- a/src/libswift/sendrecv.cpp
+++ b/src/libswift/sendrecv.cpp
@@ -181,7 +181,7 @@ void    Channel::Send () {
                        }
                        AddPex(evb);
                        TimeoutDataOut();
-                       data = AddData(evb);
+                       data = AddData(&evb);
        } else {
                // Arno: send explicit close
                AddHandshake(evb);
@@ -296,7 +296,7 @@ void    Channel::AddHint (struct evbuffer *evb) {
 }
 
 
-bin_t        Channel::AddData (struct evbuffer *evb) {
+bin_t        Channel::AddData (struct evbuffer **evb) {
        // RATELIMIT
        if (transfer().GetCurrentSpeed(DDIR_UPLOAD) > transfer().GetMaxSpeed(DDIR_UPLOAD)) {
                transfer().OnSendNoData();
@@ -325,11 +325,11 @@ bin_t        Channel::AddData (struct evbuffer *evb) {
         return bin_t::NONE; // once in a while, empty data is sent just to check rtt FIXED
 
     if (ack_in_.is_empty() && file().size())
-        AddPeakHashes(evb);
+        AddPeakHashes(*evb);
 
     //NETWVSHASH
     if (file().get_check_netwvshash())
-       AddUncleHashes(evb,tosend);
+       AddUncleHashes(*evb,tosend);
 
     if (!ack_in_.is_empty()) // TODO: cwnd_>1
         data_out_cap_ = tosend;
@@ -339,12 +339,13 @@ bin_t        Channel::AddData (struct evbuffer *evb) {
     // frame with DATA. Send 2 datagrams then, one with peaks so they have
     // a better chance of arriving. Optimistic violation of atomic datagram
     // principle.
-    if (file().chunk_size() == SWIFT_DEFAULT_CHUNK_SIZE && evbuffer_get_length(evb) > SWIFT_MAX_NONDATA_DGRAM_SIZE) {
+    if (file().chunk_size() == SWIFT_DEFAULT_CHUNK_SIZE && evbuffer_get_length(*evb) > SWIFT_MAX_NONDATA_DGRAM_SIZE) {
         dprintf("%s #%u fsent %ib %s:%x\n",
-                tintstr(),id_,(int)evbuffer_get_length(evb),peer().str(),
+                tintstr(),id_,(int)evbuffer_get_length(*evb),peer().str(),
                 peer_channel_id_);
-               messageQueue.AddBuffer(socket_, evb, peer(), this, false);
-        evbuffer_add_32be(evb, peer_channel_id_);
+               messageQueue.AddBuffer(socket_, *evb, peer(), this, false);
+               *evb = evbuffer_new();
+        evbuffer_add_32be(*evb, peer_channel_id_);
     }
 
     if (file().chunk_size() != SWIFT_DEFAULT_CHUNK_SIZE && isretransmit) {
@@ -361,15 +362,15 @@ bin_t        Channel::AddData (struct evbuffer *evb) {
         */
             char binstr[32];
          fprintf(stderr,"AddData: retransmit of randomized chunk %s\n",tosend.str(binstr) );
-         evbuffer_add_8(evb, SWIFT_RANDOMIZE);
-         evbuffer_add_32be(evb, (int)rand() );
+         evbuffer_add_8(*evb, SWIFT_RANDOMIZE);
+         evbuffer_add_32be(*evb, (int)rand() );
     }
 
-    evbuffer_add_8(evb, SWIFT_DATA);
-    evbuffer_add_32be(evb, bin_toUInt32(tosend));
+    evbuffer_add_8(*evb, SWIFT_DATA);
+    evbuffer_add_32be(*evb, bin_toUInt32(tosend));
 
     struct evbuffer_iovec vec;
-    if (evbuffer_reserve_space(evb, file().chunk_size(), &vec, 1) < 0) {
+    if (evbuffer_reserve_space(*evb, file().chunk_size(), &vec, 1) < 0) {
        print_error("error on evbuffer_reserve_space");
        return bin_t::NONE;
     }
@@ -379,12 +380,12 @@ bin_t        Channel::AddData (struct evbuffer *evb) {
     if (r<0) {
         print_error("error on reading");
         vec.iov_len = 0;
-        evbuffer_commit_space(evb, &vec, 1);
+        evbuffer_commit_space(*evb, &vec, 1);
         return bin_t::NONE;
     }
     // assert(dgram.space()>=r+4+1);
     vec.iov_len = r;
-    if (evbuffer_commit_space(evb, &vec, 1) < 0) {
+    if (evbuffer_commit_space(*evb, &vec, 1) < 0) {
         print_error("error on evbuffer_commit_space");
         return bin_t::NONE;
     }
@@ -486,7 +487,7 @@ void    Channel::Recv (struct evbuffer *evb) {
         uint8_t type = evbuffer_remove_8(evb);
 
         if (DEBUGTRAFFIC)
-               fprintf(stderr," %d", type);
+               fprintf(stderr," %d\n", type);
 
         switch (type) {
             case SWIFT_HANDSHAKE: OnHandshake(evb); break;

diff --git a/src/libswift/swift.h b/src/libswift/swift.h
index 3fac390..1c5634a 100644 (file)
--- a/src/libswift/swift.h
+++ b/src/libswift/swift.h
@@ -525,7 +525,7 @@ namespace swift {
         void        OnHandshake (struct evbuffer *evb);
         void        OnRandomize (struct evbuffer *evb); //FRAGRAND
         void        AddHandshake (struct evbuffer *evb);
-        bin_t       AddData (struct evbuffer *evb);
+        bin_t       AddData (struct evbuffer **evb);
         void        AddAck (struct evbuffer *evb);
         void        AddHave (struct evbuffer *evb);
         void        AddHint (struct evbuffer *evb);
@@ -791,7 +791,7 @@ namespace swift {
     // Arno: Save transfer's binmap for zero-hashcheck restart
     void Checkpoint(int fdes);
 
-#define MAX_QUEUE_LENGTH 10
+#define MAX_QUEUE_LENGTH 1
 #define TIMER_USEC 100000
 
        class MessageQueue
@@ -845,13 +845,10 @@ namespace swift {
                        }
 
                        int r = Channel::SendTo(sock, addr, evbs);
-                       printf("Sent %d buffers\n", list.size());
                        if (r > 0) {
                                i = 0;
-                               for (EntryList::iterator it = list.begin(); it != list.end(); ++it, ++i) {
+                               for (EntryList::iterator it = list.begin(); it != list.end(); ++it, ++i)
                                        (*it).channel->Sent(evbuffer_get_length((*it).evb), (*it).evb, (*it).tofree);
-                                       printf("Sent %d bytes\n", addr.addr->dests[i].bytes);
-                               }
                        }
                        list.clear();
                }