From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 29 Aug 2012 13:28:14 +0000 (+0200)
Subject: struct iphdr is Linux specific use struct ip instead
X-Git-Tag: 5.0.1~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39e9af96662eabc6fbe332dcb8e7b70ccaceaceb;p=thirdparty%2Fstrongswan.git

struct iphdr is Linux specific use struct ip instead
---

diff --git a/src/libipsec/ip_packet.c b/src/libipsec/ip_packet.c
index 4593ba5c88..52aeaa209e 100644
--- a/src/libipsec/ip_packet.c
+++ b/src/libipsec/ip_packet.c
@@ -130,19 +130,19 @@ ip_packet_t *ip_packet_create(chunk_t packet)
 	{
 		case 4:
 		{
-			struct iphdr *ip;
+			struct ip *ip;
 
-			if (packet.len < sizeof(struct iphdr))
+			if (packet.len < sizeof(struct ip))
 			{
 				DBG1(DBG_ESP, "IPv4 packet too short");
 				goto failed;
 			}
-			ip = (struct iphdr*)packet.ptr;
+			ip = (struct ip*)packet.ptr;
 			src = host_create_from_chunk(AF_INET,
-										 chunk_from_thing(ip->saddr), 0);
+										 chunk_from_thing(ip->ip_src), 0);
 			dst = host_create_from_chunk(AF_INET,
-										 chunk_from_thing(ip->daddr), 0);
-			next_header = ip->protocol;
+										 chunk_from_thing(ip->ip_dst), 0);
+			next_header = ip->ip_p;
 			break;
 		}
 #ifdef HAVE_NETINET_IP6_H