Migrated eap_mschapv2 plugin to INIT/METHOD macros
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 5 Apr 2011 12:23:59 +0000 (14:23 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 5 Apr 2011 12:23:59 +0000 (14:23 +0200)
src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c

index 4f39c86..22b9054 100644 (file)
@@ -560,19 +560,15 @@ static void set_ms_length(eap_mschapv2_header_t *eap, u_int16_t len)
        memcpy(&eap->ms_length, &len, sizeof(u_int16_t));
 }
 
-/**
- * Implementation of eap_method_t.initiate for the peer
- */
-static status_t initiate_peer(private_eap_mschapv2_t *this, eap_payload_t **out)
+METHOD(eap_method_t, initiate_peer, status_t,
+       private_eap_mschapv2_t *this, eap_payload_t **out)
 {
        /* peer never initiates */
        return FAILED;
 }
 
-/**
- * Implementation of eap_method_t.initiate for the server
- */
-static status_t initiate_server(private_eap_mschapv2_t *this, eap_payload_t **out)
+METHOD(eap_method_t, initiate_server, status_t,
+       private_eap_mschapv2_t *this, eap_payload_t **out)
 {
        rng_t *rng;
        eap_mschapv2_header_t *eap;
@@ -904,11 +900,8 @@ error:
        return status;
 }
 
-/**
- * Implementation of eap_method_t.process for the peer
- */
-static status_t process_peer(private_eap_mschapv2_t *this, eap_payload_t *in,
-               eap_payload_t **out)
+METHOD(eap_method_t, process_peer, status_t,
+       private_eap_mschapv2_t *this, eap_payload_t *in, eap_payload_t **out)
 {
        chunk_t data;
        eap_mschapv2_header_t *eap;
@@ -1091,11 +1084,8 @@ static status_t process_server_response(private_eap_mschapv2_t *this,
        return process_server_retry(this, out);
 }
 
-/**
- * Implementation of eap_method_t.process for the server
- */
-static status_t process_server(private_eap_mschapv2_t *this, eap_payload_t *in,
-               eap_payload_t **out)
+METHOD(eap_method_t, process_server, status_t,
+       private_eap_mschapv2_t *this, eap_payload_t *in, eap_payload_t **out)
 {
        eap_mschapv2_header_t *eap;
        chunk_t data;
@@ -1140,19 +1130,15 @@ static status_t process_server(private_eap_mschapv2_t *this, eap_payload_t *in,
        return FAILED;
 }
 
-/**
- * Implementation of eap_method_t.get_type.
- */
-static eap_type_t get_type(private_eap_mschapv2_t *this, u_int32_t *vendor)
+METHOD(eap_method_t, get_type, eap_type_t,
+       private_eap_mschapv2_t *this, u_int32_t *vendor)
 {
        *vendor = 0;
        return EAP_MSCHAPV2;
 }
 
-/**
- * Implementation of eap_method_t.get_msk.
- */
-static status_t get_msk(private_eap_mschapv2_t *this, chunk_t *msk)
+METHOD(eap_method_t, get_msk, status_t,
+       private_eap_mschapv2_t *this, chunk_t *msk)
 {
        if (this->msk.ptr)
        {
@@ -1162,18 +1148,14 @@ static status_t get_msk(private_eap_mschapv2_t *this, chunk_t *msk)
        return FAILED;
 }
 
-/**
- * Implementation of eap_method_t.is_mutual.
- */
-static bool is_mutual(private_eap_mschapv2_t *this)
+METHOD(eap_method_t, is_mutual, bool,
+       private_eap_mschapv2_t *this)
 {
        return FALSE;
 }
 
-/**
- * Implementation of eap_method_t.destroy.
- */
-static void destroy(private_eap_mschapv2_t *this)
+METHOD(eap_method_t, destroy, void,
+        private_eap_mschapv2_t *this)
 {
        this->peer->destroy(this->peer);
        this->server->destroy(this->server);
@@ -1189,25 +1171,20 @@ static void destroy(private_eap_mschapv2_t *this)
  */
 static private_eap_mschapv2_t *eap_mschapv2_create_generic(identification_t *server, identification_t *peer)
 {
-       private_eap_mschapv2_t *this = malloc_thing(private_eap_mschapv2_t);
-
-       this->public.eap_method_interface.initiate = NULL;
-       this->public.eap_method_interface.process = NULL;
-       this->public.eap_method_interface.get_type = (eap_type_t(*)(eap_method_t*,u_int32_t*))get_type;
-       this->public.eap_method_interface.is_mutual = (bool(*)(eap_method_t*))is_mutual;
-       this->public.eap_method_interface.get_msk = (status_t(*)(eap_method_t*,chunk_t*))get_msk;
-       this->public.eap_method_interface.destroy = (void(*)(eap_method_t*))destroy;
-
-       /* private data */
-       this->peer = peer->clone(peer);
-       this->server = server->clone(server);
-       this->challenge = chunk_empty;
-       this->nt_response = chunk_empty;
-       this->auth_response = chunk_empty;
-       this->msk = chunk_empty;
-       this->identifier = 0;
-       this->mschapv2id = 0;
-       this->retries = 0;
+       private_eap_mschapv2_t *this;
+
+       INIT(this,
+               .public = {
+                       .eap_method_interface = {
+                               .get_type = _get_type,
+                               .is_mutual = _is_mutual,
+                               .get_msk = _get_msk,
+                               .destroy = _destroy,
+                       },
+               },
+               .peer = peer->clone(peer),
+               .server = server->clone(server),
+       );
 
        return this;
 }
@@ -1219,8 +1196,8 @@ eap_mschapv2_t *eap_mschapv2_create_server(identification_t *server, identificat
 {
        private_eap_mschapv2_t *this = eap_mschapv2_create_generic(server, peer);
 
-       this->public.eap_method_interface.initiate = (status_t(*)(eap_method_t*,eap_payload_t**))initiate_server;
-       this->public.eap_method_interface.process = (status_t(*)(eap_method_t*,eap_payload_t*, eap_payload_t**))process_server;
+       this->public.eap_method_interface.initiate = _initiate_server;
+       this->public.eap_method_interface.process = _process_server;
 
        /* generate a non-zero identifier */
        do
@@ -1240,8 +1217,8 @@ eap_mschapv2_t *eap_mschapv2_create_peer(identification_t *server, identificatio
 {
        private_eap_mschapv2_t *this = eap_mschapv2_create_generic(server, peer);
 
-       this->public.eap_method_interface.initiate = (status_t(*)(eap_method_t*,eap_payload_t**))initiate_peer;
-       this->public.eap_method_interface.process = (status_t(*)(eap_method_t*,eap_payload_t*, eap_payload_t**))process_peer;
+       this->public.eap_method_interface.initiate = _initiate_peer;
+       this->public.eap_method_interface.process = _process_peer;
 
        return &this->public;
 }