X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=jam.c;h=fc0b723867e18ade828c9c9ee73aae038b68a873;hb=12e7e145baf058f169ae789a8155be116a9e2e0b;hp=80737a758de8f082aa74bcb51a58c20a75625ee1;hpb=0a7d81641be5f3ac761c431b18547c8989f03ce9;p=jam

diff --git a/jam.c b/jam.c
index 80737a7..fc0b723 100644
--- a/jam.c
+++ b/jam.c
@@ -20,12 +20,14 @@ unsigned num_sources = 0;
 unsigned room_sources = 0;
 
 unsigned num_senders = 128;
+unsigned do_listen = 1;
 
 const static struct option longopts[] = {
 	{ "source-list", required_argument, NULL, 's' },
 	{ "destination-list", required_argument, NULL, 'd' },
 	{ "num-senders", required_argument, NULL, 'n' },
 	{ "port", required_argument, NULL, 'p' },
+	{ "sender-only", no_argument, NULL, 'o' },
 	{ NULL, 0, NULL, 0 }
 };
 
@@ -101,7 +103,7 @@ void parse_options(int argc, char **argv)
 	int option_index = 0;
 
 	for ( ;; ) {
-		int c = getopt_long(argc, argv, "s:d:n:p:", longopts, &option_index); 
+		int c = getopt_long(argc, argv, "s:d:n:p:o", longopts, &option_index); 
 		switch (c) {
 		case 's':
 			read_ip_list(optarg, &sources, &num_sources, &room_sources);
@@ -115,6 +117,9 @@ void parse_options(int argc, char **argv)
 		case 'p':
 			port = atoi(optarg);
 			break;
+		case 'o':
+			do_listen = 0;
+			break;
 		case -1:
 			return;       // end of argument list
 		default:
@@ -128,6 +133,10 @@ void *sender_worker(void *arg)
 {
 	unsigned i;
 	int sock;
+	char buf[65536];
+
+	for (i = 0; i < 65536; ++i)
+		buf[i] = rand() & 0xff;
 
 	for (i = 0; i < 1000; ++i) {
 		unsigned src_num = (unsigned)(num_sources * gen_uniform_random());
@@ -156,7 +165,23 @@ void *sender_worker(void *arg)
 		
 		fprintf(stderr, "connected\n");
 
-		// FIXME: send data here
+		while (num_bytes > 0) {
+			unsigned bytes_to_send = num_bytes;
+			unsigned ret;
+
+			if (bytes_to_send > 65536) {
+				bytes_to_send = 65536;	
+			}
+
+			ret = send(sock, buf, bytes_to_send, MSG_NOSIGNAL);
+			if (ret == -1) {
+				perror("send()");
+				exit(1);
+			}
+
+			num_bytes -= ret;
+		}
+		fprintf(stderr, "sent\n");
 
 		close(sock);
 	}
@@ -169,6 +194,8 @@ void *receiver_worker(void *arg)
 	int sock = (int)arg;
 	char buf[65536];
 
+	fprintf(stderr, "Receiver started\n");
+
 	for ( ;; ) {
 		int ret = read(sock, buf, 65536);
 		if (ret == 0)
@@ -231,7 +258,9 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Missing or empty source or destination host list. Aborting.\n");
 	}
 
-	server_sock = get_server_socket(port);
+	if (do_listen) {
+		server_sock = get_server_socket(port);
+	}
 	
 	printf("Sending data on port %u from %u sources to %u destinations.\n\n",
 		port, num_sources, num_destinations);
@@ -267,6 +296,11 @@ int main(int argc, char **argv)
 	 * thread for each (which will just gobble up the data until
 	 * we're done).
 	 */
+	if (!do_listen) {
+		sleep(3600);
+		exit(0);
+	}
+
 	for ( ;; ) {
 		struct sockaddr_in addr;
 		socklen_t addr_len = sizeof(addr);