diff options
| author | Martin Willi <martin@revosec.ch> | 2010-11-10 14:17:03 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-01-05 16:45:43 +0100 |
| commit | b6c796464d625b192fcdafe19e13f115cfb95c46 (patch) | |
| tree | b851497df7497043880f4da92339d13559c07d6a /src/libcharon/encoding/message.c | |
| parent | 9431023ce61868338d1072cce5e0410b3a700703 (diff) | |
| download | strongswan-b6c796464d625b192fcdafe19e13f115cfb95c46.tar.bz2 strongswan-b6c796464d625b192fcdafe19e13f115cfb95c46.tar.xz | |
Use the payloads actual type in unknown_payload_t
Diffstat (limited to 'src/libcharon/encoding/message.c')
| -rw-r--r-- | src/libcharon/encoding/message.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c index 06198d996..f4cb5b0e1 100644 --- a/src/libcharon/encoding/message.c +++ b/src/libcharon/encoding/message.c @@ -1273,7 +1273,7 @@ static status_t decrypt_payloads(private_message_t *this, aead_t *aead) } encryption->destroy(encryption); } - if (type != UNKNOWN_PAYLOAD && !was_encrypted) + if (payload_is_known(type) && !was_encrypted) { rule = get_payload_rule(this, type); if (!rule || rule->encrypted) @@ -1315,14 +1315,13 @@ static status_t verify(private_message_t *this) unknown_payload_t *unknown; type = payload->get_type(payload); - if (type == UNKNOWN_PAYLOAD) + if (!payload_is_known(type)) { - /* unknown payloads are ignored if they are not critical */ unknown = (unknown_payload_t*)payload; if (unknown->is_critical(unknown)) { - DBG1(DBG_ENC, "%N is not supported, but its critical!", - payload_type_names, type); + DBG1(DBG_ENC, "payload type %N is not supported, " + "but its critical!", payload_type_names, type); enumerator->destroy(enumerator); return NOT_SUPPORTED; } |