net: cosmetic: Split struct ip_udp_hdr into ip_hdr
Add a structure that only contains IP header fields to be used by
functions that don't need UDP
Rename IP_HDR_SIZE_NO_UDP to IP_HDR_SIZE
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
diff --git a/include/net.h b/include/net.h
index 3e4f304..7692153 100644
--- a/include/net.h
+++ b/include/net.h
@@ -194,6 +194,30 @@
#define IPPROTO_UDP 17 /* User Datagram Protocol */
/*
+ * Internet Protocol (IP) header.
+ */
+struct ip_hdr {
+ uchar ip_hl_v; /* header length and version */
+ uchar ip_tos; /* type of service */
+ ushort ip_len; /* total length */
+ ushort ip_id; /* identification */
+ ushort ip_off; /* fragment offset field */
+ uchar ip_ttl; /* time to live */
+ uchar ip_p; /* protocol */
+ ushort ip_sum; /* checksum */
+ IPaddr_t ip_src; /* Source IP address */
+ IPaddr_t ip_dst; /* Destination IP address */
+};
+
+#define IP_OFFS 0x1fff /* ip offset *= 8 */
+#define IP_FLAGS 0xe000 /* first 3 bits */
+#define IP_FLAGS_RES 0x8000 /* reserved */
+#define IP_FLAGS_DFRAG 0x4000 /* don't fragments */
+#define IP_FLAGS_MFRAG 0x2000 /* more fragments */
+
+#define IP_HDR_SIZE (sizeof(struct ip_hdr))
+
+/*
* Internet Protocol (IP) + UDP header.
*/
struct ip_udp_hdr {
@@ -213,16 +237,8 @@
ushort udp_xsum; /* Checksum */
};
-#define IP_OFFS 0x1fff /* ip offset *= 8 */
-#define IP_FLAGS 0xe000 /* first 3 bits */
-#define IP_FLAGS_RES 0x8000 /* reserved */
-#define IP_FLAGS_DFRAG 0x4000 /* don't fragments */
-#define IP_FLAGS_MFRAG 0x2000 /* more fragments */
-
-#define IP_HDR_SIZE_NO_UDP (sizeof(struct ip_udp_hdr) - 8)
-
#define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr))
-#define UDP_HDR_SIZE (IP_UDP_HDR_SIZE - IP_HDR_SIZE_NO_UDP)
+#define UDP_HDR_SIZE (IP_UDP_HDR_SIZE - IP_HDR_SIZE)
/*
* Address Resolution Protocol (ARP) header.