LWIP - udp_io_hdr.h

lwip server needs to include struct udp_io_hdr but must not include
struct udp-hdr as it conflicts with its internal type. So it is split
into to files now.

diff --git a/common/include/Makefile.inc b/common/include/Makefile.inc
index 2d606d8d022d25981f6715781d05637122dbbe6f..ece6747808025d15a43d68c1cee66540e61bb231 100644 (file)
--- a/common/include/Makefile.inc
+++ b/common/include/Makefile.inc
@@ -28,7 +28,7 @@ INCS+=        net/gen/arp_io.h net/gen/dhcp.h net/gen/ether.h \
        net/gen/psip_hdr.h net/gen/psip_io.h net/gen/resolv.h \
        net/gen/rip.h net/gen/route.h net/gen/socket.h \
        net/gen/tcp.h net/gen/tcp_hdr.h net/gen/tcp_io.h \
-       net/gen/udp.h net/gen/udp_hdr.h net/gen/udp_io.h \
+       net/gen/udp.h net/gen/udp_hdr.h net/gen/udp_io.h net/gen/udp_io_hdr.h \
        net/gen/vjhc.h
 
 INCS+= ddekit/assert.h ddekit/initcall.h ddekit/memory.h  ddekit/pgtab.h \

diff --git a/common/include/net/gen/udp_hdr.h b/common/include/net/gen/udp_hdr.h
index 1c7caf5d95377158f4fa0771f5c6477569ca26b8..671f93e9d06f628469b427a0e3f97b431511f104 100644 (file)
--- a/common/include/net/gen/udp_hdr.h
+++ b/common/include/net/gen/udp_hdr.h
@@ -5,6 +5,12 @@ server/ip/gen/udp_hdr.h
 #ifndef __SERVER__IP__GEN__UDP_HDR_H__
 #define __SERVER__IP__GEN__UDP_HDR_H__
 
+/*
+ * Included for compatibility with programs which assume udp_io_hdr_t to be
+ * defined in this header file
+ */
+#include "udp_io_hdr.h"
+
 typedef struct udp_hdr
 {
        udpport_t uh_src_port;
@@ -13,14 +19,4 @@ typedef struct udp_hdr
        u16_t uh_chksum;
 } udp_hdr_t;
 
-typedef struct udp_io_hdr
-{
-       ipaddr_t uih_src_addr;
-       ipaddr_t uih_dst_addr;
-       udpport_t uih_src_port;
-       udpport_t uih_dst_port;
-       u16_t uih_ip_opt_len;
-       u16_t uih_data_len;
-} udp_io_hdr_t;
-
 #endif /* __SERVER__IP__GEN__UDP_HDR_H__ */

diff --git a/common/include/net/gen/udp_io_hdr.h b/common/include/net/gen/udp_io_hdr.h
new file mode 100644 (file)
index 0000000..17ada03
--- /dev/null
+++ b/common/include/net/gen/udp_io_hdr.h
@@ -0,0 +1,16 @@
+#ifndef __SERVER__IP__GEN__UDP_IO_HDR_H__
+#define __SERVER__IP__GEN__UDP_IO_HDR_H__
+
+
+typedef struct udp_io_hdr
+{
+       ipaddr_t uih_src_addr;
+       ipaddr_t uih_dst_addr;
+       udpport_t uih_src_port;
+       udpport_t uih_dst_port;
+       u16_t uih_ip_opt_len;
+       u16_t uih_data_len;
+} udp_io_hdr_t;
+
+
+#endif /* __SERVER__IP__GEN__UDP_IO_HDR_H__ */