diff options
| author | Martin Willi <martin@strongswan.org> | 2006-03-23 15:25:43 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-03-23 15:25:43 +0000 |
| commit | dec598220b9a293c4ec75e593ab642a8945fa4fc (patch) | |
| tree | a97247afbdb29e2b071933f8c9667a7ffa03cca3 /Source/charon/encoding/payloads/sa_payload.c | |
| parent | 3264ce50b912f2aba09d2d8e7ee7ed9d364d9e46 (diff) | |
| download | strongswan-dec598220b9a293c4ec75e593ab642a8945fa4fc.tar.bz2 strongswan-dec598220b9a293c4ec75e593ab642a8945fa4fc.tar.xz | |
- rewrite of logger_manager, uses now one instance per context
- cleanups for logger here and there
- removed critical flag check in payload verification (conformance to IKEv2)
- so thats and theres everywere... ;-)
Diffstat (limited to 'Source/charon/encoding/payloads/sa_payload.c')
| -rw-r--r-- | Source/charon/encoding/payloads/sa_payload.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/charon/encoding/payloads/sa_payload.c b/Source/charon/encoding/payloads/sa_payload.c index 3a40d41b2..91049dd65 100644 --- a/Source/charon/encoding/payloads/sa_payload.c +++ b/Source/charon/encoding/payloads/sa_payload.c @@ -118,12 +118,6 @@ static status_t verify(private_sa_payload_t *this) status_t status = SUCCESS; iterator_t *iterator; bool first = TRUE; - - if (this->critical) - { - /* critical bit set! */ - return FAILED; - } /* check proposal numbering */ iterator = this->proposals->create_iterator(this->proposals,TRUE); @@ -269,7 +263,7 @@ static void add_proposal(private_sa_payload_t *this, proposal_t *proposal) proposal->get_protocols(proposal, proto); for (i = 0; i<2; i++) { - if (proto[i] != UNDEFINED_PROTOCOL_ID) + if (proto[i] != PROTO_NONE) { substructure = proposal_substructure_create_from_proposal(proposal, proto[i]); add_proposal_substructure(this, substructure); @@ -356,7 +350,7 @@ sa_payload_t *sa_payload_create() this->compute_length = compute_length; /* set default values of the fields */ - this->critical = SA_PAYLOAD_CRITICAL_FLAG; + this->critical = FALSE; this->next_payload = NO_PAYLOAD; this->payload_length = SA_PAYLOAD_HEADER_LENGTH; |