[PATCH 09/29] libnetworking: Fix unknown type name 'tcp_cc'

Christian Mauderer christian.mauderer at embedded-brains.de
Mon Apr 25 15:06:43 UTC 2016


From: Christian Mauderer <Christian.Mauderer at embedded-brains.de>

---
 cpukit/libnetworking/Makefile.am               |  1 +
 cpukit/libnetworking/netinet/in_proto.c        |  1 +
 cpukit/libnetworking/netinet/in_rmx.c          |  1 +
 cpukit/libnetworking/netinet/ip_fw.c           |  1 +
 cpukit/libnetworking/netinet/ip_icmp.c         |  1 +
 cpukit/libnetworking/netinet/tcp_debug.c       |  1 +
 cpukit/libnetworking/netinet/tcp_input.c       |  1 +
 cpukit/libnetworking/netinet/tcp_output.c      |  1 +
 cpukit/libnetworking/netinet/tcp_subr.c        |  1 +
 cpukit/libnetworking/netinet/tcp_timer.c       |  1 +
 cpukit/libnetworking/netinet/tcp_usrreq.c      |  1 +
 cpukit/libnetworking/preinstall.am             |  4 ++++
 cpukit/libnetworking/rtems/rtems_netinet_tcp.h | 31 ++++++++++++++++++++++++++
 cpukit/libnetworking/rtems/rtems_showtcpstat.c |  1 +
 14 files changed, 47 insertions(+)
 create mode 100644 cpukit/libnetworking/rtems/rtems_netinet_tcp.h

diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index ef00f40..97784b8 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -146,6 +146,7 @@ include_rtems_HEADERS += rtems/rtems_mii_ioctl.h
 include_rtems_HEADERS += rtems/rtems_socket.h
 include_rtems_HEADERS += rtems/rtems_net_if.h
 include_rtems_HEADERS += rtems/rtems_netinet_in.h
+include_rtems_HEADERS += rtems/rtems_netinet_tcp.h
 
 libnetworking_a_SOURCES += rtems/sghostname.c \
     rtems/rtems_glue.c rtems/rtems_malloc_mbuf.c rtems/rtems_syscall.c \
diff --git a/cpukit/libnetworking/netinet/in_proto.c b/cpukit/libnetworking/netinet/in_proto.c
index 36c91f7..73faf11 100644
--- a/cpukit/libnetworking/netinet/in_proto.c
+++ b/cpukit/libnetworking/netinet/in_proto.c
@@ -57,6 +57,7 @@
 #include <netinet/in_pcb.h>
 #include <netinet/igmp_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
diff --git a/cpukit/libnetworking/netinet/in_rmx.c b/cpukit/libnetworking/netinet/in_rmx.c
index ed45045..4f1df49 100644
--- a/cpukit/libnetworking/netinet/in_rmx.c
+++ b/cpukit/libnetworking/netinet/in_rmx.c
@@ -64,6 +64,7 @@
 #include <netinet/ip_var.h>
 
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
diff --git a/cpukit/libnetworking/netinet/ip_fw.c b/cpukit/libnetworking/netinet/ip_fw.c
index 6a891df..4b00596 100644
--- a/cpukit/libnetworking/netinet/ip_fw.c
+++ b/cpukit/libnetworking/netinet/ip_fw.c
@@ -43,6 +43,7 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/ip_fw.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
diff --git a/cpukit/libnetworking/netinet/ip_icmp.c b/cpukit/libnetworking/netinet/ip_icmp.c
index fd8f8da..2d5ec15 100644
--- a/cpukit/libnetworking/netinet/ip_icmp.c
+++ b/cpukit/libnetworking/netinet/ip_icmp.c
@@ -57,6 +57,7 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/icmp_var.h>
diff --git a/cpukit/libnetworking/netinet/tcp_debug.c b/cpukit/libnetworking/netinet/tcp_debug.c
index ca449bb..2d2d579 100644
--- a/cpukit/libnetworking/netinet/tcp_debug.c
+++ b/cpukit/libnetworking/netinet/tcp_debug.c
@@ -57,6 +57,7 @@
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
diff --git a/cpukit/libnetworking/netinet/tcp_input.c b/cpukit/libnetworking/netinet/tcp_input.c
index a01a3d6..de4981d 100644
--- a/cpukit/libnetworking/netinet/tcp_input.c
+++ b/cpukit/libnetworking/netinet/tcp_input.c
@@ -60,6 +60,7 @@
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
diff --git a/cpukit/libnetworking/netinet/tcp_output.c b/cpukit/libnetworking/netinet/tcp_output.c
index d23656f..bc09fdd 100644
--- a/cpukit/libnetworking/netinet/tcp_output.c
+++ b/cpukit/libnetworking/netinet/tcp_output.c
@@ -53,6 +53,7 @@
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #define	TCPOUTFLAGS
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
diff --git a/cpukit/libnetworking/netinet/tcp_subr.c b/cpukit/libnetworking/netinet/tcp_subr.c
index 75f6657..f31cd92 100644
--- a/cpukit/libnetworking/netinet/tcp_subr.c
+++ b/cpukit/libnetworking/netinet/tcp_subr.c
@@ -62,6 +62,7 @@
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
diff --git a/cpukit/libnetworking/netinet/tcp_timer.c b/cpukit/libnetworking/netinet/tcp_timer.c
index b27d2ee..1105147 100644
--- a/cpukit/libnetworking/netinet/tcp_timer.c
+++ b/cpukit/libnetworking/netinet/tcp_timer.c
@@ -59,6 +59,7 @@
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
diff --git a/cpukit/libnetworking/netinet/tcp_usrreq.c b/cpukit/libnetworking/netinet/tcp_usrreq.c
index 03ed9f0..5548c92 100644
--- a/cpukit/libnetworking/netinet/tcp_usrreq.c
+++ b/cpukit/libnetworking/netinet/tcp_usrreq.c
@@ -60,6 +60,7 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
diff --git a/cpukit/libnetworking/preinstall.am b/cpukit/libnetworking/preinstall.am
index dcaa5d2..83ef2f8 100644
--- a/cpukit/libnetworking/preinstall.am
+++ b/cpukit/libnetworking/preinstall.am
@@ -298,6 +298,10 @@ $(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h: rtems/rtems_netinet_in.h $(PROJECT_
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h
 
+$(PROJECT_INCLUDE)/rtems/rtems_netinet_tcp.h: rtems/rtems_netinet_tcp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_netinet_tcp.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_netinet_tcp.h
+
 $(PROJECT_INCLUDE)/sys/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/sys
 	@: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
diff --git a/cpukit/libnetworking/rtems/rtems_netinet_tcp.h b/cpukit/libnetworking/rtems/rtems_netinet_tcp.h
new file mode 100644
index 0000000..fe509af
--- /dev/null
+++ b/cpukit/libnetworking/rtems/rtems_netinet_tcp.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems at embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#ifndef RTEMS_NETINET_TCP_H
+#define RTEMS_NETINET_TCP_H
+
+#include <rtems.h>
+#include <netinet/tcp.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef u_long	tcp_cc;			/* connection count per rfc1644 */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* RTEMS_NETINET_TCP_H */
diff --git a/cpukit/libnetworking/rtems/rtems_showtcpstat.c b/cpukit/libnetworking/rtems/rtems_showtcpstat.c
index 403e3c9..efe5d49 100644
--- a/cpukit/libnetworking/rtems/rtems_showtcpstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showtcpstat.c
@@ -16,6 +16,7 @@
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
+#include <rtems/rtems_netinet_tcp.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_var.h>
-- 
1.8.4.5




More information about the devel mailing list