updated tnc-pdp plugin for 5.0.0

diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp.c b/src/libcharon/plugins/tnc_pdp/tnc_pdp.c
index 0625baa..26d777a 100644 (file)
--- a/src/libcharon/plugins/tnc_pdp/tnc_pdp.c
+++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp.c
@@ -27,7 +27,7 @@
 #include <pen/pen.h>
 #include <threading/thread.h>
 #include <processing/jobs/callback_job.h>
 #include <pen/pen.h>
 #include <threading/thread.h>
 #include <processing/jobs/callback_job.h>

-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>

 
 typedef struct private_tnc_pdp_t private_tnc_pdp_t;
 
 
 typedef struct private_tnc_pdp_t private_tnc_pdp_t;
 

diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
index 175a57a..0abda8d 100644 (file)
--- a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
+++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
@@ -114,8 +114,8 @@ METHOD(tnc_pdp_connections_t, add, void,
        ike_sa_t *ike_sa;
        bool found = FALSE;
 
        ike_sa_t *ike_sa;
        bool found = FALSE;
 

-       ike_sa_id = ike_sa_id_create(0, 0, FALSE);
-       ike_sa = ike_sa_create(ike_sa_id);
+       ike_sa_id = ike_sa_id_create(IKEV2_MAJOR_VERSION, 0, 0, FALSE);
+       ike_sa = ike_sa_create(ike_sa_id, FALSE, IKEV2);

        ike_sa_id->destroy(ike_sa_id);
        ike_sa->set_other_id(ike_sa, peer);
 
        ike_sa_id->destroy(ike_sa_id);
        ike_sa->set_other_id(ike_sa, peer);
 

diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.h b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.h
index b9f5d09..1649202 100644 (file)
--- a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.h
+++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.h
@@ -25,7 +25,7 @@ typedef struct tnc_pdp_connections_t tnc_pdp_connections_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
 
 #include <library.h>
 #include <sa/ike_sa.h>

-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>

 
 /**
  * Public interface of a tnc_pdp_connections object
 
 /**
  * Public interface of a tnc_pdp_connections object