diff options
| -rw-r--r-- | src/options.c | 7 | ||||
| -rw-r--r-- | src/options.h | 1 | ||||
| -rw-r--r-- | src/pconfig.h | 2 | ||||
| -rw-r--r-- | src/pdesc.c | 1 | ||||
| -rw-r--r-- | src/pdesc.h | 3 | ||||
| -rw-r--r-- | src/pkt.c | 7 | ||||
| -rw-r--r-- | src/ptunnel.c | 10 |
7 files changed, 23 insertions, 8 deletions
diff --git a/src/options.c b/src/options.c index f1080aa..f6dba79 100644 --- a/src/options.c +++ b/src/options.c @@ -384,7 +384,7 @@ int parse_options(int argc, char **argv) { * since you have to pass long options as '--option=value'. Commonly used * '--option value' is *NOT* allowed for some libc implementations. */ - 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); + c = getopt_long(argc, argv, "m:p:l:r::R::c:v:L::o::sP:d::Su::g::C::e::w:a:t:y:h", &long_options[0], &oidx); if (c == -1) break; switch (c) { @@ -548,6 +548,11 @@ int parse_options(int argc, char **argv) { break; opts.resend_interval = atoi(optarg); break; + case 'y': + if (!optarg) + break; + opts.payload_size = atoi(optarg); + break; case 'h': print_usage(argv[0]); exit(EXIT_SUCCESS); diff --git a/src/options.h b/src/options.h index f0dd7d8..b180ef5 100644 --- a/src/options.h +++ b/src/options.h @@ -91,6 +91,7 @@ struct options { uint16_t window_size; uint16_t ack_interval; uint16_t resend_interval; + uint16_t payload_size; #ifndef WIN32 /** run as daemon if non zero value */ diff --git a/src/pconfig.h b/src/pconfig.h index 6be141e..e13f7ee 100644 --- a/src/pconfig.h +++ b/src/pconfig.h @@ -75,7 +75,7 @@ enum { * we send. Note that this does not include * the IP or ICMP headers! */ - kDefault_buf_size = 1024, + kDefault_buf_size = 0xFFFF, /** Type code for echo request and replies */ kICMP_echo_request = 8, kICMP_echo_reply = 0, diff --git a/src/pdesc.c b/src/pdesc.c index b034b8b..df8df46 100644 --- a/src/pdesc.c +++ b/src/pdesc.c @@ -114,6 +114,7 @@ proxy_desc_t *create_and_insert_proxy_desc(uint16_t id_no, uint16_t icmp_id, 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; + cur->payload_size = opts.payload_size ? opts.payload_size : 1024; 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/pdesc.h b/src/pdesc.h index d4c463d..a537b9a 100644 --- a/src/pdesc.h +++ b/src/pdesc.h @@ -159,7 +159,8 @@ typedef struct proxy_desc_t { uint16_t window_size; double ack_interval; double resend_interval; - uint16_t extended_options[3]; + uint16_t payload_size; + uint16_t extended_options[4]; icmp_desc_t *send_ring; forward_desc_t **recv_ring; xfer_stats_t xfer; @@ -361,6 +361,9 @@ void handle_data(icmp_echo_packet_t *pkt, int total_len, forward_desc_t *ring[], if (pt_pkt->data_len >= 6) { cur->extended_options[2] = ntohs(extended_options[2]); } + if (pt_pkt->data_len >= 8) { + cur->extended_options[3] = ntohs(extended_options[3]); + } return; } if (pt_pkt->seq_no == *next_expected_seq) { @@ -439,6 +442,10 @@ void handle_extended_options(void *vcur) cur->resend_interval = cur->extended_options[2] / 1000.0; pt_log(kLog_verbose, "Received extended option for resend interval %f \n", cur->resend_interval); } + if (cur->extended_options[3] > 0) { + cur->payload_size = cur->extended_options[3]; + pt_log(kLog_verbose, "Received extended option for payload size %d \n", cur->payload_size); + } } void handle_ack(uint16_t seq_no, icmp_desc_t ring[], int *packets_awaiting_ack, diff --git a/src/ptunnel.c b/src/ptunnel.c index c87fa3f..3f5975d 100644 --- a/src/ptunnel.c +++ b/src/ptunnel.c @@ -88,7 +88,6 @@ uint32_t num_tunnels = 0; uint32_t *seq_expiry_tbl = NULL; /* Some buffer constants */ -const int tcp_receive_buf_len = kDefault_buf_size; const int icmp_receive_buf_len = kDefault_buf_size + kIP_header_size + kICMP_header_size + sizeof(ping_tunnel_pkt_t); const int pcap_buf_size = (kDefault_buf_size + kIP_header_size + @@ -560,12 +559,13 @@ void* pt_proxy(void *args) { cur->last_ack = time_as_double(); 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); + if (opts.window_size || opts.ack_interval || opts.resend_interval || opts.payload_size) { + extended_options = calloc(4, sizeof(uint16_t)); + extended_options_size = 4*sizeof(uint16_t); extended_options[0] = htons(opts.window_size); extended_options[1] = htons(opts.ack_interval); extended_options[2] = htons(opts.resend_interval); + extended_options[3] = htons(opts.payload_size); } 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, @@ -587,7 +587,7 @@ void* pt_proxy(void *args) { } /* Handle TCP traffic */ if (FD_ISSET(cur->sock, &set)) { - bytes = recv(cur->sock, cur->buf, tcp_receive_buf_len, 0); + bytes = recv(cur->sock, cur->buf, cur->payload_size, 0); if (bytes <= 0) { pt_log(kLog_info, "Connection closed or lost.\n"); tmp = cur->next; |