short command line options -w -a -t

4 files changed, 35 insertions, 9 deletions

diff --git a/src/options.c b/src/options.c
index 4ae434f..024e358 100644
--- a/src/options.c
+++ b/src/options.c
@@ -380,7 +380,7 @@ int parse_options(int argc, char **argv) {
 
 	/* parse command line arguments */
 	while (1) {
-		c = getopt_long(argc, argv, "m:p:l:r::R::c:v:L::o::sP:d::Su::g::C::e::h", &long_options[0], &oidx);
+		c = getopt_long(argc, argv, "m:p:l:r::R::c:v:L::o::sP:d::Su::g::C::e::w:a:t:h", &long_options[0], &oidx);
 		if (c == -1) break;
 
 		switch (c) {
@@ -529,6 +529,21 @@ int parse_options(int argc, char **argv) {
 				pt_log(kLog_error, "SeLinux: %s\n", "feature not supported");
 				exit(1);
 #endif
+			case 'w':
+				if (!optarg)
+					break;
+				opts.window_size = atoi(optarg);
+				break;
+			case 'a':
+				if (!optarg)
+					break;
+				opts.ack_interval = atoi(optarg);
+				break;
+			case 't':
+				if (!optarg)
+					break;
+				opts.resend_interval = atoi(optarg);
+				break;
 			case 'h':
 				print_usage(argv[0]);
 				exit(EXIT_SUCCESS);
diff --git a/src/options.h b/src/options.h
index 176620a..f0dd7d8 100644
--- a/src/options.h
+++ b/src/options.h
@@ -88,6 +88,9 @@ struct options {
 	int udp;
 	/** unpriviledged mode */
 	int unprivileged;
+	uint16_t window_size;
+	uint16_t ack_interval;
+	uint16_t resend_interval;
 
 #ifndef WIN32
 	/** run as daemon if non zero value */
diff --git a/src/pdesc.c b/src/pdesc.c
index b39648f..819bf4e 100644
--- a/src/pdesc.c
+++ b/src/pdesc.c
@@ -111,9 +111,9 @@ proxy_desc_t *create_and_insert_proxy_desc(uint16_t id_no, uint16_t icmp_id,
 	pthread_mutex_unlock(&chain_lock);
 	cur->xfer.bytes_in      = 0.0;
 	cur->xfer.bytes_out     = 0.0;
-	cur->window_size	= 64;
-	cur->ack_interval	= 1.0;
-	cur->resend_interval	= 1.5;
+	cur->window_size	= opts.window_size ? opts.window_size : 64;
+	cur->ack_interval	= opts.ack_interval ? opts.ack_interval / 1000.0 : 1.0;
+	cur->resend_interval	= opts.resend_interval ? opts.resend_interval / 1000.0 : 1.5;
 	memset(cur->extended_options, 0, sizeof(cur->extended_options));
 	cur->send_ring		= calloc(cur->window_size, sizeof(icmp_desc_t));
 	cur->recv_ring		= calloc(cur->window_size, sizeof(forward_desc_t *));
diff --git a/src/ptunnel.c b/src/ptunnel.c
index 6f9fdc7..456a747 100644
--- a/src/ptunnel.c
+++ b/src/ptunnel.c
@@ -558,14 +558,22 @@ void* pt_proxy(void *args) {
 			if (cur->state == kProxy_start) {
 				pt_log(kLog_verbose, "Sending proxy request.\n");
 				cur->last_ack = time_as_double();
-				uint16_t extended_options[3];
-				extended_options[0] = htons(cur->window_size);
-				extended_options[1] = htons(cur->ack_interval*1000);
-				extended_options[2] = htons(cur->resend_interval*1000);
-				queue_packet(fwd_sock, cur->pkt_type, (char *)extended_options, sizeof(extended_options), cur->id_no, cur->id_no,
+				uint16_t *extended_options = 0;
+				size_t extended_options_size = 0;
+				if (opts.window_size || opts.ack_interval || opts.resend_interval) {
+					extended_options = calloc(3, sizeof(uint16_t));
+					extended_options_size = 3*sizeof(uint16_t);
+					extended_options[0] = htons(opts.window_size);
+					extended_options[1] = htons(opts.ack_interval);
+					extended_options[2] = htons(opts.resend_interval);
+				}
+				queue_packet(fwd_sock, cur->pkt_type, (char *)extended_options, extended_options_size, cur->id_no, cur->id_no,
 				             &cur->my_seq, cur->send_ring, &cur->send_idx, &cur->send_wait_ack,
 				             cur->dst_ip, cur->dst_port, cur->state | cur->type_flag,
 				             &cur->dest_addr, cur->next_remote_seq, &cur->send_first_ack, &cur->ping_seq, cur->window_size);
+				if (extended_options) {
+					free(extended_options);
+				}
 				cur->xfer.icmp_out++;
 				cur->state = kProto_data;
 			}