diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2008-03-26 18:40:19 +0000 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2008-03-26 18:40:19 +0000 |
| commit | dc04b7c743fe6718bd361f13adbbe5436c481486 (patch) | |
| tree | 6e1f3550847a19bebac26609d28cc8858b10c432 /src/charon/encoding/payloads/ike_header.c | |
| parent | 685232670aa717850f304a5299781520405a419d (diff) | |
| download | strongswan-dc04b7c743fe6718bd361f13adbbe5436c481486.tar.bz2 strongswan-dc04b7c743fe6718bd361f13adbbe5436c481486.tar.xz | |
mediation extension adapted to the naming convention of the current version of the draft. note: the external interface (config, autotools) has not yet been changed
Diffstat (limited to 'src/charon/encoding/payloads/ike_header.c')
| -rw-r--r-- | src/charon/encoding/payloads/ike_header.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/charon/encoding/payloads/ike_header.c b/src/charon/encoding/payloads/ike_header.c index dbe0ee2a1..9cc55677f 100644 --- a/src/charon/encoding/payloads/ike_header.c +++ b/src/charon/encoding/payloads/ike_header.c @@ -105,13 +105,13 @@ ENUM_NEXT(exchange_type_names, IKE_SA_INIT, INFORMATIONAL, EXCHANGE_TYPE_UNDEFIN "IKE_AUTH", "CREATE_CHILD_SA", "INFORMATIONAL"); -#ifdef P2P -ENUM_NEXT(exchange_type_names, P2P_CONNECT, P2P_CONNECT, INFORMATIONAL, - "P2P_CONNECT"); -ENUM_END(exchange_type_names, P2P_CONNECT); +#ifdef ME +ENUM_NEXT(exchange_type_names, ME_CONNECT, ME_CONNECT, INFORMATIONAL, + "ME_CONNECT"); +ENUM_END(exchange_type_names, ME_CONNECT); #else ENUM_END(exchange_type_names, INFORMATIONAL); -#endif /* P2P */ +#endif /* ME */ /** * Encoding rules to parse or generate a IKEv2-Header. @@ -176,9 +176,9 @@ static status_t verify(private_ike_header_t *this) { if ((this->exchange_type < IKE_SA_INIT) || ((this->exchange_type > INFORMATIONAL) -#ifdef P2P - && (this->exchange_type != P2P_CONNECT) -#endif /* P2P */ +#ifdef ME + && (this->exchange_type != ME_CONNECT) +#endif /* ME */ )) { /* unsupported exchange type */ @@ -186,11 +186,11 @@ static status_t verify(private_ike_header_t *this) } if (this->initiator_spi == 0 -#ifdef P2P +#ifdef ME /* we allow zero spi for INFORMATIONAL exchanges, - * to allow P2P connectivity checks */ + * to allow connectivity checks */ && this->exchange_type != INFORMATIONAL -#endif /* P2P */ +#endif /* ME */ ) { /* initiator spi not set */ |