X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=blobdiff_plain;f=gssapiP_eap.h;h=74fb52221c4dc68c1d94a0f8ddb9a0a8cde39a55;hp=757649b49d8d66dbbd4c051882eff70ffe1a0e07;hb=4866125c4be79ec72fc388eabba01505786850b4;hpb=3cf99bde12e2bef0fbf6cd65ab45e99aa834af63

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index 757649b..74fb522 100644
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -40,6 +40,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
+#include <sys/param.h>
 
 /* GSS includes */
 #include <gssapi/gssapi.h>
@@ -50,7 +51,7 @@
 /* Kerberos includes */
 #include <krb5.h>
 
-/* EAP includes */
+/* EAP includes (not C++ clean) */
 #ifndef __cplusplus
 #include <common.h>
 #include <eap_peer/eap.h>
@@ -59,11 +60,25 @@
 #include <wpabuf.h>
 #endif
 
-#include <freeradius-client.h>
+/* Workaround for FreeRADIUS not being C++ clean */
+#ifdef __cplusplus
+extern "C" {
+#define operator fr_operator
+#endif
+#include <freeradius/libradius.h>
 #include <freeradius/radius.h>
+#include <radsec/radsec.h>
+#ifdef __cplusplus
+#undef operator
+}
+#endif
 
 #include "util.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* These name flags are informative and not actually used by anything yet */
 #define NAME_FLAG_NAI                       0x00000001
 #define NAME_FLAG_SERVICE                   0x00000002
@@ -141,7 +156,8 @@ struct gss_eap_initiator_ctx {
 };
 
 struct gss_eap_acceptor_ctx {
-    rc_handle *radHandle;
+    struct rs_handle *radHandle;
+    struct rs_connection *radConn;
     char *radServer;
     gss_buffer_desc state;
     VALUE_PAIR *avps;
@@ -226,4 +242,8 @@ rfc4121Flags(gss_ctx_id_t ctx, int receiving);
 void
 gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GSSAPIP_EAP_H_ */