aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/encoding/payloads/sa_payload.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-11-17 15:44:42 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:30:42 +0100
commitf62a7c7c7192d791eb4c10e7ff4d09cf54c7d4da (patch)
tree3f9bd3f93211d661dcdc3b186598730c92aea4f0 /src/libcharon/encoding/payloads/sa_payload.c
parent95a26523afc0d2a997cd1d4f738c287ae045ae4e (diff)
downloadstrongswan-f62a7c7c7192d791eb4c10e7ff4d09cf54c7d4da.tar.bz2
strongswan-f62a7c7c7192d791eb4c10e7ff4d09cf54c7d4da.tar.xz
Use a generic list encoding rule we can use to specify the wrapped payload type
Diffstat (limited to 'src/libcharon/encoding/payloads/sa_payload.c')
-rw-r--r--src/libcharon/encoding/payloads/sa_payload.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcharon/encoding/payloads/sa_payload.c b/src/libcharon/encoding/payloads/sa_payload.c
index 66e994b43..29c671d8e 100644
--- a/src/libcharon/encoding/payloads/sa_payload.c
+++ b/src/libcharon/encoding/payloads/sa_payload.c
@@ -99,9 +99,9 @@ static encoding_rule_t encodings_v1[] = {
{ U_INT_32, offsetof(private_sa_payload_t, doi) },
/* Situation*/
{ U_INT_32, offsetof(private_sa_payload_t, situation) },
- /* Proposals are stored in a proposal substructure,
- offset points to a linked_list_t pointer */
- { PROPOSALS_V1, offsetof(private_sa_payload_t, proposals) },
+ /* Proposals are stored in a proposal substructure list */
+ { PAYLOAD_LIST + PROPOSAL_SUBSTRUCTURE_V1,
+ offsetof(private_sa_payload_t, proposals) },
};
/*
@@ -138,9 +138,9 @@ static encoding_rule_t encodings_v2[] = {
{ RESERVED_BIT, offsetof(private_sa_payload_t, reserved[6]) },
/* Length of the whole SA payload*/
{ PAYLOAD_LENGTH, offsetof(private_sa_payload_t, payload_length) },
- /* Proposals are stored in a proposal substructure,
- offset points to a linked_list_t pointer */
- { PROPOSALS, offsetof(private_sa_payload_t, proposals) },
+ /* Proposals are stored in a proposal substructure list */
+ { PAYLOAD_LIST + PROPOSAL_SUBSTRUCTURE,
+ offsetof(private_sa_payload_t, proposals) },
};
/*