aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/encoding/payloads/traffic_selector_substructure.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-11-17 11:27:55 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:30:42 +0100
commite9b55b832546d05f464bdddbe779ed21cd17b624 (patch)
tree375064023de39c892823be79795c09aa8cd1e2d9 /src/libcharon/encoding/payloads/traffic_selector_substructure.c
parent683d83ed3ef6c920a59f6d23d0f44c66fc6ded42 (diff)
downloadstrongswan-e9b55b832546d05f464bdddbe779ed21cd17b624.tar.bz2
strongswan-e9b55b832546d05f464bdddbe779ed21cd17b624.tar.xz
Simplify signature of get_encoding_rules(), make all rules static
Diffstat (limited to 'src/libcharon/encoding/payloads/traffic_selector_substructure.c')
-rw-r--r--src/libcharon/encoding/payloads/traffic_selector_substructure.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libcharon/encoding/payloads/traffic_selector_substructure.c b/src/libcharon/encoding/payloads/traffic_selector_substructure.c
index df36e4383..c213441ab 100644
--- a/src/libcharon/encoding/payloads/traffic_selector_substructure.c
+++ b/src/libcharon/encoding/payloads/traffic_selector_substructure.c
@@ -74,7 +74,7 @@ struct private_traffic_selector_substructure_t {
* The defined offsets are the positions in a object of type
* private_traffic_selector_substructure_t.
*/
-encoding_rule_t traffic_selector_substructure_encodings[] = {
+static encoding_rule_t encodings[] = {
/* 1 Byte next ts type*/
{ TS_TYPE, offsetof(private_traffic_selector_substructure_t, ts_type) },
/* 1 Byte IP protocol id*/
@@ -148,12 +148,11 @@ METHOD(payload_t, verify, status_t,
return SUCCESS;
}
-METHOD(payload_t, get_encoding_rules, void,
- private_traffic_selector_substructure_t *this, encoding_rule_t **rules,
- size_t *rule_count)
+METHOD(payload_t, get_encoding_rules, int,
+ private_traffic_selector_substructure_t *this, encoding_rule_t **rules)
{
- *rules = traffic_selector_substructure_encodings;
- *rule_count = countof(traffic_selector_substructure_encodings);
+ *rules = encodings;
+ return countof(encodings);
}
METHOD(payload_t, get_type, payload_type_t,