From: weiyixuan <weiyixuan@netpas.co>
Date: Mon, 7 May 2018 07:24:54 +0000 (+0800)
Subject: for tcp, fix : bind port failed, try next sequence
X-Git-Tag: v0.93~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F259%2Fhead;p=thirdparty%2Fmtr.git

for tcp, fix : bind port failed, try next sequence
---

diff --git a/packet/probe_unix.c b/packet/probe_unix.c
index d6cca06..985caaa 100644
--- a/packet/probe_unix.c
+++ b/packet/probe_unix.c
@@ -545,8 +545,9 @@ void send_probe(
 {
     char packet[PACKET_BUFFER_SIZE];
     struct probe_t *probe;
-    int packet_size;
     struct sockaddr_storage src_sockaddr;
+    int trytimes = 0;
+    int packet_size;
 
     probe = alloc_probe(net_state, param->command_token);
     if (probe == NULL) {
@@ -566,10 +567,29 @@ void send_probe(
         exit(EXIT_FAILURE);
     }
 
-    packet_size =
-        construct_packet(net_state, &probe->platform.socket,
+	while (1) {
+		if (trytimes >= (MAX_PORT - MIN_PORT + 1))
+			break;
+			
+		packet_size = construct_packet(net_state, &probe->platform.socket,
                          probe->sequence, packet, PACKET_BUFFER_SIZE,
                          &probe->remote_addr, &src_sockaddr, param);
+        
+        if ((packet_size < 0) &&
+        	(param->protocol == IPPROTO_TCP || param->protocol == IPPROTO_SCTP) &&
+        	(errno == EADDRINUSE)) {
+        	
+        	probe->sequence = net_state->platform.next_sequence++;
+        	
+        	if (net_state->platform.next_sequence > MAX_PORT) {
+                net_state->platform.next_sequence = MIN_PORT;
+            }
+            
+            trytimes++;
+        } else {
+        	break;
+        }
+	}
 
     if (packet_size < 0) {
         /*