diff options
| author | Martin Willi <martin@revosec.ch> | 2010-08-18 12:15:03 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-08-18 12:15:03 +0200 |
| commit | ba31fe1fd65feba781434ee4fabd9b1fd6432ecb (patch) | |
| tree | 3d7073eb9bb51512d073eeccd3f0b3b5d32e1ff5 /src/libcharon/plugins/eap_md5 | |
| parent | 53115857ae5f3b25e889f394de0c61e7cc455c74 (diff) | |
| download | strongswan-ba31fe1fd65feba781434ee4fabd9b1fd6432ecb.tar.bz2 strongswan-ba31fe1fd65feba781434ee4fabd9b1fd6432ecb.tar.xz | |
Use a seperate section for each nested struct member in INIT macro
Diffstat (limited to 'src/libcharon/plugins/eap_md5')
| -rw-r--r-- | src/libcharon/plugins/eap_md5/eap_md5.c | 22 | ||||
| -rw-r--r-- | src/libcharon/plugins/eap_md5/eap_md5.h | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/libcharon/plugins/eap_md5/eap_md5.c b/src/libcharon/plugins/eap_md5/eap_md5.c index a74151ac1..f70754abb 100644 --- a/src/libcharon/plugins/eap_md5/eap_md5.c +++ b/src/libcharon/plugins/eap_md5/eap_md5.c @@ -236,7 +236,7 @@ eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *pee INIT(this, .public = { - .eap_method_interface = { + .eap_method = { .initiate = _initiate_server, .process = _process_server, .get_type = _get_type, @@ -247,8 +247,6 @@ eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *pee }, .peer = peer->clone(peer), .server = server->clone(server), - .challenge = chunk_empty, - .identifier = 0, ); /* generate a non-zero identifier */ @@ -267,18 +265,18 @@ eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer) private_eap_md5_t *this; INIT(this, - .public.eap_method_interface = { - .initiate = _initiate_peer, - .process = _process_peer, - .get_type = _get_type, - .is_mutual = _is_mutual, - .get_msk = _get_msk, - .destroy = _destroy, + .public = { + .eap_method = { + .initiate = _initiate_peer, + .process = _process_peer, + .get_type = _get_type, + .is_mutual = _is_mutual, + .get_msk = _get_msk, + .destroy = _destroy, + }, }, .peer = peer->clone(peer), .server = server->clone(server), - .challenge = chunk_empty, - .identifier = 0, ); return &this->public; diff --git a/src/libcharon/plugins/eap_md5/eap_md5.h b/src/libcharon/plugins/eap_md5/eap_md5.h index 3cff0dd79..c6687149a 100644 --- a/src/libcharon/plugins/eap_md5/eap_md5.h +++ b/src/libcharon/plugins/eap_md5/eap_md5.h @@ -33,7 +33,7 @@ struct eap_md5_t { /** * Implemented eap_method_t interface. */ - eap_method_t eap_method_interface; + eap_method_t eap_method; }; /** |