[dpdk-dev,v2] examples/ipsec-secgw: fix missed headers for FreeBSD

Message ID 1459428190-10256-1-git-send-email-danielx.t.mrzyglod@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Daniel Mrzyglod March 31, 2016, 12:43 p.m. UTC
  In FreeBSD, sys/types.h and netinet/in.h need to be included before
netinet/ip.h

There were misssed typedef for u_char - <sys/types.h>
There were missed network definitions - <netinet/in.h>

Failure #13: http://dpdk.org/ml/archives/test-report/2016-March/001896.html

Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")

Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
---
 examples/ipsec-secgw/esp.c         | 3 ++-
 examples/ipsec-secgw/ipsec-secgw.c | 2 ++
 examples/ipsec-secgw/ipsec.c       | 2 +-
 examples/ipsec-secgw/ipsec.h       | 2 --
 examples/ipsec-secgw/rt.c          | 1 +
 examples/ipsec-secgw/sa.c          | 2 ++
 examples/ipsec-secgw/sp.c          | 2 ++
 7 files changed, 10 insertions(+), 4 deletions(-)
  

Comments

Sergio Gonzalez Monroy March 31, 2016, 1:02 p.m. UTC | #1
On 31/03/2016 13:43, Daniel Mrzyglod wrote:
> In FreeBSD, sys/types.h and netinet/in.h need to be included before
> netinet/ip.h
>
> There were misssed typedef for u_char - <sys/types.h>
> There were missed network definitions - <netinet/in.h>
>
> Failure #13: http://dpdk.org/ml/archives/test-report/2016-March/001896.html
>
> Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")
>
> Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
> ---
>

Other than typo in commit message: "misssed"

Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
  
Thomas Monjalon March 31, 2016, 8:28 p.m. UTC | #2
2016-03-31 14:02, Sergio Gonzalez Monroy:
> On 31/03/2016 13:43, Daniel Mrzyglod wrote:
> > In FreeBSD, sys/types.h and netinet/in.h need to be included before
> > netinet/ip.h
> >
> > There were misssed typedef for u_char - <sys/types.h>
> > There were missed network definitions - <netinet/in.h>
> >
> > Failure #13: http://dpdk.org/ml/archives/test-report/2016-March/001896.html
> >
> > Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")
> >
> > Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
> 
> Other than typo in commit message: "misssed"
> 
> Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>

Applied, thanks
  

Patch

diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c
index ca0fc56..1927380 100644
--- a/examples/ipsec-secgw/esp.c
+++ b/examples/ipsec-secgw/esp.c
@@ -33,9 +33,10 @@ 
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <netinet/ip.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index d6c9a5d..1d6c81b 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -36,6 +36,8 @@ 
 #include <stdint.h>
 #include <inttypes.h>
 #include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
 #include <string.h>
 #include <sys/queue.h>
 #include <stdarg.h>
diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index d385100..baf30d4 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -30,7 +30,7 @@ 
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index 8eb4e76..a13fdef 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -35,8 +35,6 @@ 
 #define __IPSEC_H__
 
 #include <stdint.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
 
 #include <rte_byteorder.h>
 #include <rte_ip.h>
diff --git a/examples/ipsec-secgw/rt.c b/examples/ipsec-secgw/rt.c
index c3bb4de..a6d0866 100644
--- a/examples/ipsec-secgw/rt.c
+++ b/examples/ipsec-secgw/rt.c
@@ -34,6 +34,7 @@ 
 /*
  * Routing Table (RT)
  */
+#include <sys/types.h>
 #include <rte_lpm.h>
 #include <rte_errno.h>
 
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 91a5f6e..a5b8a63 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -34,6 +34,8 @@ 
 /*
  * Security Associations
  */
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 
 #include <rte_memzone.h>
diff --git a/examples/ipsec-secgw/sp.c b/examples/ipsec-secgw/sp.c
index 7972f40..4f16730 100644
--- a/examples/ipsec-secgw/sp.c
+++ b/examples/ipsec-secgw/sp.c
@@ -34,6 +34,8 @@ 
 /*
  * Security Policies
  */
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 
 #include <rte_acl.h>