automake build system

[mech_eap.orig] / src / radius / radius_server.h

diff --git a/src/radius/radius_server.h b/src/radius/radius_server.h
index fafa851..126e314 100644 (file)
--- a/src/radius/radius_server.h
+++ b/src/radius/radius_server.h
@@ -143,6 +143,13 @@ struct radius_server_conf {
        int tnc;
 
        /**
+        * pwd_group - EAP-pwd D-H group
+        *
+        * This is used to select which D-H group to use with EAP-pwd.
+        */
+       u16 pwd_group;
+
+       /**
         * wps - Wi-Fi Protected Setup context
         *
         * If WPS is used with an external RADIUS server (which is quite
@@ -189,10 +196,13 @@ struct radius_server_conf {
         * eap_req_id_text_len - Length of eap_req_id_text buffer in octets
         */
        size_t eap_req_id_text_len;
-};
 
+       /*
+        * msg_ctx - Context data for wpa_msg() calls
+        */
+       void *msg_ctx;
+};
 
-#ifdef RADIUS_SERVER
 
 struct radius_server_data *
 radius_server_init(struct radius_server_conf *conf);
@@ -204,29 +214,4 @@ int radius_server_get_mib(struct radius_server_data *data, char *buf,
 
 void radius_server_eap_pending_cb(struct radius_server_data *data, void *ctx);
 
-#else /* RADIUS_SERVER */
-
-static inline struct radius_server_data *
-radius_server_init(struct radius_server_conf *conf)
-{
-       return NULL;
-}
-
-static inline void radius_server_deinit(struct radius_server_data *data)
-{
-}
-
-static inline int radius_server_get_mib(struct radius_server_data *data,
-                                       char *buf, size_t buflen)
-{
-       return 0;
-}
-
-static inline void
-radius_server_eap_pending_cb(struct radius_server_data *data, void *ctx)
-{
-}
-
-#endif /* RADIUS_SERVER */
-
 #endif /* RADIUS_SERVER_H */