From 77172e23f723162aea65674c6bf9e8b76c505228 Mon Sep 17 00:00:00 2001 From: Tomas Hruby Date: Thu, 7 Apr 2011 07:43:03 +0000 Subject: [PATCH] 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. --- common/include/Makefile.inc | 2 +- common/include/net/gen/udp_hdr.h | 16 ++++++---------- common/include/net/gen/udp_io_hdr.h | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 common/include/net/gen/udp_io_hdr.h diff --git a/common/include/Makefile.inc b/common/include/Makefile.inc index 2d606d8d0..ece674780 100644 --- 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 1c7caf5d9..671f93e9d 100644 --- 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 index 000000000..17ada03a9 --- /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__ */