X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=src%2Flibswift%2Fchannel.cpp;h=ef30addc05e2e26852b61b6daa24fd9c8e01c294;hb=45ee60cc6bc8ba52c1dbc4784cf61291a90c97f9;hp=2828e86cffa84c7dd565407bfd3c69b03eb3dda5;hpb=45635e914bca29ba32720ea13ed88e2e3d753c34;p=swifty.git

diff --git a/src/libswift/channel.cpp b/src/libswift/channel.cpp
index 2828e86..ef30add 100644
--- a/src/libswift/channel.cpp
+++ b/src/libswift/channel.cpp
@@ -280,21 +280,26 @@ int Channel::SendTo (evutil_socket_t sock, const Address& addr, struct evbuffer
     return r;
 }
 
-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);
-    struct evbuffer_iovec vec;
-    if (evbuffer_reserve_space(evb, SWIFT_MAX_RECV_DGRAM_SIZE, &vec, 1) < 0) {
-    	print_error("error on evbuffer_reserve_space");
-    	return 0;
-    }
-	struct iovec iov[1];
+int Channel::RecvFrom (evutil_socket_t sock, Address& addr, struct evbuffer **evb) {
+	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) {
+			print_error("error on evbuffer_reserve_space");
+			return 0;
+		}
+	}
+	struct iovec iov[count];
 	struct msghdr msg;
 	memset(&msg, 0, sizeof(msg));
 	memset(&iov, 0, sizeof(iov));
-	iov[0].iov_base = vec.iov_base;
-	iov[0].iov_len = SWIFT_MAX_RECV_DGRAM_SIZE;
+	for (int i=0; i<count; ++i) {
+		iov[i].iov_base = vec[i].iov_base;
+		iov[i].iov_len = SWIFT_MAX_RECV_DGRAM_SIZE;
+	}
 	msg.msg_iov = iov;
-	msg.msg_iovlen = 1;
+	msg.msg_iovlen = count;
 	msg.msg_name = addr.addr;
 	msg.msg_namelen = addrlen;
 	int length = recvmsg(sock, &msg, 0);
@@ -316,12 +321,16 @@ int Channel::RecvFrom (evutil_socket_t sock, Address& addr, struct evbuffer *evb
         else
         	print_error("error on recv");
     }
-    vec.iov_len = length;
-    if (evbuffer_commit_space(evb, &vec, 1) < 0)  {
-        length = 0;
-        print_error("error on evbuffer_commit_space");
-    }
-    global_dgrams_down++;
+	length = 0;
+	for (int i=0; i<addr.addr->count; ++i) {
+		length += addr.addr->dests[i].bytes;
+		vec[i].iov_len = addr.addr->dests[i].bytes;
+		if (evbuffer_commit_space(evb[i], &vec[i], 1) < 0)  {
+			length = 0;
+			print_error("error on evbuffer_commit_space");
+		}
+	}
+    global_dgrams_down+=addr.addr->count;
     global_raw_bytes_down+=length;
     Time();
     return length;