Allow API client to provide an fd for the client-side control socket.

src/iperf_api.c

@@ -79,6 +79,12 @@ void warning(char *str)
 
 /************** Getter routines for some fields inside iperf_test *************/
 
+int
+iperf_get_control_socket( struct iperf_test* ipt )
+{
+    return ipt->ctrl_sck;
+}
+
 int
 iperf_get_test_duration( struct iperf_test* ipt )
 {
@@ -147,6 +153,12 @@ iperf_get_test_protocol_id( struct iperf_test* ipt )
 
 /************** Setter routines for some fields inside iperf_test *************/
 
+void
+iperf_set_control_socket( struct iperf_test* ipt, int ctrl_sck )
+{
+    ipt->ctrl_sck = ctrl_sck;
+}
+
 void
 iperf_set_test_duration( struct iperf_test* ipt, int duration )
 {

src/iperf_api.h

@@ -44,6 +44,7 @@ struct iperf_stream;
 #define SERVER_ERROR (-2)
 
 /* Getter routines for some fields inside iperf_test. */
+int	iperf_get_control_socket( struct iperf_test* ipt );
 int	iperf_get_test_duration( struct iperf_test* ipt );
 char	iperf_get_test_role( struct iperf_test* ipt );
 int	iperf_get_test_blksize( struct iperf_test* ipt );
@@ -57,6 +58,7 @@ char*	iperf_get_test_server_hostname( struct iperf_test* ipt );
 int	iperf_get_test_protocol_id( struct iperf_test* ipt );
 
 /* Setter routines for some fields inside iperf_test. */
+void	iperf_set_control_socket( struct iperf_test* ipt, int ctrl_sck );
 void	iperf_set_test_duration( struct iperf_test* ipt, int duration );
 void	iperf_set_test_reporter_interval( struct iperf_test* ipt, double reporter_interval );
 void	iperf_set_test_stats_interval( struct iperf_test* ipt, double stats_interval );

src/iperf_client_api.c

@@ -136,7 +136,8 @@ iperf_connect(struct iperf_test *test)
     make_cookie(test->cookie);
 
     /* Create and connect the control channel */
-    test->ctrl_sck = netdial(test->settings->domain, Ptcp, test->bind_address, test->server_hostname, test->server_port);
+    if (test->ctrl_sck < 0)
+	test->ctrl_sck = netdial(test->settings->domain, Ptcp, test->bind_address, test->server_hostname, test->server_port);
     if (test->ctrl_sck < 0) {
         i_errno = IECONNECT;
         return -1;

src/iperf_error.c

@@ -487,4 +487,3 @@ iperf_error(char *estr)
 }
 
 */
-

src/iperf_tcp.c

@@ -272,4 +272,3 @@ iperf_tcp_connect(struct iperf_test *test)
 
     return s;
 }
-

src/iperf_tcp.h

@@ -44,4 +44,3 @@ int iperf_tcp_connect(struct iperf_test *);
 
 
 #endif
-

src/iperf_udp.h

@@ -45,4 +45,3 @@ int iperf_udp_init(struct iperf_test *);
 
 
 #endif
-

src/locale.c

@@ -346,4 +346,3 @@ const char warn_invalid_report[] =
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif
-

src/main.c

@@ -139,4 +139,3 @@ iperf_run(struct iperf_test * test)
 
     return 0;
 }
-

src/net.c

@@ -280,4 +280,3 @@ setnonblocking(int sock)
     }
     return 0;
 }
-

src/net.h

@@ -49,4 +49,3 @@ unsigned long long ntohll(unsigned long long);
 #define ntohll(n) NTOHLL(n)
 
 #endif
-

src/tcp_info.c

@@ -144,4 +144,3 @@ build_tcpinfo_message(struct iperf_interval_results *r, char *message)
 	    r->tcpInfo.tcpi_rcv_space, r->tcpInfo.tcpi_snd_ssthresh, r->tcpInfo.tcpi_rtt);
 #endif
 }
-

src/tcp_window_size.c

@@ -122,4 +122,3 @@ get_tcp_windowsize(int sock, int dir)
 
     return bufsize;
 }
-

src/version.h

@@ -8,4 +8,4 @@
  */
 
 #define IPERF_VERSION "3.0-BETA5"
-#define IPERF_VERSION_DATE "13 Nov 2012"
+#define IPERF_VERSION_DATE "13 Dec 2012"