Fix header includes and build failures on musl (#518)

* Include stdint.h in files where its types are used Signed-off-by: Moritz Kick <[email protected]> * Fix type of len parameter passed to getsockopt getsockopt expects socklen_t instead of int as its fifth argument Signed-off-by: Moritz Kick <[email protected]> * Remove unnecassary includes of netinet/tcp.h also cleanup the second include of stdint.h in main.c This commit fixes #331 and is a replacement for #344. Signed-off-by: Moritz Kick <[email protected]>
esnet · Mar 22, 2017 · a8ee9c6 · a8ee9c6
1 parent b3828fe
commit a8ee9c6
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/src/cjson.h b/src/cjson.h
@@ -19,10 +19,15 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
+#include "iperf_config.h"
 
 #ifndef cJSON__h
 #define cJSON__h
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {

diff --git a/src/iperf.h b/src/iperf.h
@@ -36,6 +36,7 @@
 #endif
 #include <sys/select.h>
 #include <sys/socket.h>
+#define _GNU_SOURCE
 #include <netinet/tcp.h>
 
 #if defined(HAVE_CPUSET_SETAFFINITY)

diff --git a/src/iperf_sctp.c b/src/iperf_sctp.c
@@ -35,7 +35,6 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <netinet/tcp.h>
 #include <sys/time.h>
 #include <sys/select.h>
 

diff --git a/src/iperf_server_api.c b/src/iperf_server_api.c
@@ -44,7 +44,6 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-#include <netinet/tcp.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sched.h>
@@ -526,7 +525,7 @@ iperf_run_server(struct iperf_test *test)
 			    } 
 			}
 			{
-			    int len = TCP_CA_NAME_MAX;
+			    socklen_t len = TCP_CA_NAME_MAX;
 			    char ca[TCP_CA_NAME_MAX + 1];
 			    if (getsockopt(s, IPPROTO_TCP, TCP_CONGESTION, ca, &len) < 0) {
 				close(s);

diff --git a/src/iperf_tcp.c b/src/iperf_tcp.c
@@ -35,7 +35,6 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <netinet/tcp.h>
 #include <sys/time.h>
 #include <sys/select.h>
 

diff --git a/src/main.c b/src/main.c
@@ -41,10 +41,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#include <netinet/tcp.h>
 
 #include "iperf.h"
 #include "iperf_api.h"

diff --git a/src/t_timer.c b/src/t_timer.c
@@ -24,6 +24,11 @@
  * This code is distributed under a BSD style license, see the LICENSE
  * file for complete information.
  */
+#include "iperf_config.h"
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/src/tcp_info.c b/src/tcp_info.c
@@ -48,7 +48,6 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/tcp.h>
 #include <string.h>
 #include <netinet/in.h>
 #include <errno.h>

diff --git a/src/units.c b/src/units.c
@@ -60,7 +60,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <netinet/tcp.h>
 
 
 #include "iperf.h"