some simplifications using the INIT macro

This commit is contained in:
Andreas Steffen
2010-08-17 20:09:32 +02:00
parent f9a2d4bfcb
commit 53115857ae
3 changed files with 19 additions and 25 deletions
@@ -182,8 +182,7 @@ eap_identity_t *eap_identity_create_server(identification_t *server,
private_eap_identity_t *this; private_eap_identity_t *this;
INIT(this, INIT(this,
.public = { .public.eap_method_interface = {
.eap_method_interface = {
.initiate = _initiate_server, .initiate = _initiate_server,
.process = _process_server, .process = _process_server,
.get_type = _get_type, .get_type = _get_type,
@@ -191,7 +190,6 @@ eap_identity_t *eap_identity_create_server(identification_t *server,
.get_msk = _get_msk, .get_msk = _get_msk,
.destroy = _destroy, .destroy = _destroy,
}, },
},
.peer = peer->clone(peer), .peer = peer->clone(peer),
.identity = chunk_empty, .identity = chunk_empty,
); );
+1 -3
View File
@@ -267,8 +267,7 @@ eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer)
private_eap_md5_t *this; private_eap_md5_t *this;
INIT(this, INIT(this,
.public = { .public.eap_method_interface = {
.eap_method_interface = {
.initiate = _initiate_peer, .initiate = _initiate_peer,
.process = _process_peer, .process = _process_peer,
.get_type = _get_type, .get_type = _get_type,
@@ -276,7 +275,6 @@ eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer)
.get_msk = _get_msk, .get_msk = _get_msk,
.destroy = _destroy, .destroy = _destroy,
}, },
},
.peer = peer->clone(peer), .peer = peer->clone(peer),
.server = server->clone(server), .server = server->clone(server),
.challenge = chunk_empty, .challenge = chunk_empty,
@@ -674,14 +674,12 @@ eap_authenticator_t *eap_authenticator_create_verifier(ike_sa_t *ike_sa,
private_eap_authenticator_t *this; private_eap_authenticator_t *this;
INIT(this, INIT(this,
.public = { .public.authenticator = {
.authenticator = {
.build = _build_server, .build = _build_server,
.process = _process_server, .process = _process_server,
.is_mutual = _is_mutual, .is_mutual = _is_mutual,
.destroy = _destroy, .destroy = _destroy,
}, },
},
.ike_sa = ike_sa, .ike_sa = ike_sa,
.received_init = received_init, .received_init = received_init,
.received_nonce = received_nonce, .received_nonce = received_nonce,