X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=src%2Flibswift%2Fchannel.cpp;h=c05ec03bcd252875e11489482ac5c6851d32b63c;hb=HEAD;hp=4fed7a5d7cbb6bbcb6ab99c2b07e496dd70e51cd;hpb=722d42608bfc8f90d258ecd9c2e6a591c47602fa;p=swifty.git

diff --git a/src/libswift/channel.cpp b/src/libswift/channel.cpp
index 4fed7a5..c05ec03 100644
--- a/src/libswift/channel.cpp
+++ b/src/libswift/channel.cpp
@@ -27,7 +27,9 @@ tint Channel::start = now_t::now;
 tint Channel::epoch = now_t::now/360000000LL*360000000LL; // make logs mergeable
 uint64_t Channel::global_dgrams_up=0, Channel::global_dgrams_down=0,
          Channel::global_raw_bytes_up=0, Channel::global_raw_bytes_down=0,
-         Channel::global_bytes_up=0, Channel::global_bytes_down=0;
+         Channel::global_bytes_up=0, Channel::global_bytes_down=0,
+		 Channel::global_buffers_up=0, Channel::global_syscalls_up=0,
+		 Channel::global_buffers_down=0, Channel::global_syscalls_down=0;
 sckrwecb_t Channel::sock_open[] = {};
 int Channel::sock_count = 0;
 swift::tint Channel::last_tick = 0;
@@ -253,36 +255,45 @@ Address swift::BoundAddress(evutil_socket_t sock) {
 }
 
 
-int Channel::SendTo (evutil_socket_t sock, const Address& addr, struct evbuffer *evb) {
+int Channel::SendTo (evutil_socket_t sock, const Address& addr, struct evbuffer **evb) {
 
-    int length = evbuffer_get_length(evb);
-	int addr_len = sizeof(struct sockaddr_mptp) + addr.addr->count * sizeof(struct mptp_dest);
-	struct iovec iov[1];
+	int count = addr.addr->count;
+	int addr_len = sizeof(struct sockaddr_mptp) + count * sizeof(struct mptp_dest);
+	struct iovec iov[count];
+	int lengths[count];
 	struct msghdr msg;
 	memset(&msg, 0, sizeof(msg));
 	memset(&iov, 0, sizeof(iov));
-	iov[0].iov_base = evbuffer_pullup(evb, length);
-	iov[0].iov_len = length;
+	for (int i=0; i<count; ++i) {
+		lengths[i] = evbuffer_get_length(evb[i]);
+		iov[i].iov_base = evbuffer_pullup(evb[i], lengths[i]);
+		iov[i].iov_len = lengths[i];
+	}
 	msg.msg_iov = iov;
-	msg.msg_iovlen = 1;
+	msg.msg_iovlen = count;
 	msg.msg_name = addr.addr;
 	msg.msg_namelen = addr_len;
 	int r = sendmsg(sock, &msg, 0);
     if (r<0) {
         print_error("can't send");
-        evbuffer_drain(evb, length); // Arno: behaviour is to pretend the packet got lost
+		for (int i=0; i<count; ++i)
+	        evbuffer_drain(evb[i], lengths[i]); // Arno: behaviour is to pretend the packet got lost
     }
     else
-    	evbuffer_drain(evb,r);
-    global_dgrams_up++;
-    global_raw_bytes_up+=length;
+		for (int i=0; i<count; ++i)
+			evbuffer_drain(evb[i], addr.addr->dests[i].bytes);
+    global_dgrams_up+=count;
+	global_buffers_up+=count;
+	global_syscalls_up++;
+	for (int i=0; i<count; ++i)
+		global_raw_bytes_up+=lengths[i];
     Time();
     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);
 	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 +310,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 +332,18 @@ 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) {
-		vec[i].iov_len = iov[i].iov_len;
+		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++;
+    global_dgrams_down+=addr.addr->count;
+	global_buffers_down+=addr.addr->count;
+	global_syscalls_down++;
     global_raw_bytes_down+=length;
     Time();
     return length;