Merge branch 'kevinconstantine-master'

src/iperf.h

@@ -172,7 +172,7 @@ struct iperf_test
     signed char state;
     char     *server_hostname;                  /* -c option */
     char     *bind_address;                     /* -B option */
-    int      *bind_port;                        /* -e option */
+    int       bind_port;                        /* --cport option */
     int       server_port;
     int       omit;                             /* duration of omit period (-O flag) */
     int       duration;                         /* total duration of test (-t flag) */

src/iperf_client_api.c

@@ -33,8 +33,10 @@ iperf_create_streams(struct iperf_test *test)
     int i, s;
     struct iperf_stream *sp;
 
+    int orig_bind_port = test->bind_port;
     for (i = 0; i < test->num_streams; ++i) {
 
+        test->bind_port = orig_bind_port + i;
         if ((s = test->protocol->connect(test)) < 0)
             return -1;