diff options
| author | Martin Willi <martin@strongswan.org> | 2009-06-19 10:01:04 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-06-19 10:01:04 +0200 |
| commit | f53b7e00c203f925009550ea414d6aebb8565bc7 (patch) | |
| tree | ffb4b4e3ce23cf67def5af15dd457f3ded79874f /src/charon/encoding | |
| parent | 126f2130fb2bf4246e78da484b01c7e5bdd908cb (diff) | |
| download | strongswan-f53b7e00c203f925009550ea414d6aebb8565bc7.tar.bz2 strongswan-f53b7e00c203f925009550ea414d6aebb8565bc7.tar.xz | |
reverted rule_count back to size_t, as it is passed as pointer (fixes 64bit issues)
Diffstat (limited to 'src/charon/encoding')
| -rw-r--r-- | src/charon/encoding/generator.c | 10 | ||||
| -rw-r--r-- | src/charon/encoding/parser.c | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/charon/encoding/generator.c b/src/charon/encoding/generator.c index e610c1a8a..406cfc688 100644 --- a/src/charon/encoding/generator.c +++ b/src/charon/encoding/generator.c @@ -484,12 +484,12 @@ static void write_to_chunk(private_generator_t *this,chunk_t *data) */ static void generate_payload (private_generator_t *this,payload_t *payload) { - int i; - this->data_struct = payload; - int rule_count, offset_start; + int i, offset_start; + size_t rule_count; encoding_rule_t *rules; payload_type_t payload_type; + this->data_struct = payload; payload_type = payload->get_type(payload); /* spi size has to get reseted */ this->last_spi_size = 0; @@ -500,7 +500,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload) payload_type_names, payload_type); /* each payload has its own encoding rules */ - payload->get_encoding_rules(payload,&rules,&rule_count); + payload->get_encoding_rules(payload, &rules, &rule_count); for (i = 0; i < rule_count;i++) { @@ -517,7 +517,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload) case ATTRIBUTE_TYPE: case CONFIGURATION_ATTRIBUTE_LENGTH: { - generate_u_int_type(this, rules[i].type,rules[i].offset); + generate_u_int_type(this, rules[i].type, rules[i].offset); break; } case RESERVED_BIT: diff --git a/src/charon/encoding/parser.c b/src/charon/encoding/parser.c index 76ae32fb9..ac2b78c28 100644 --- a/src/charon/encoding/parser.c +++ b/src/charon/encoding/parser.c @@ -371,7 +371,8 @@ static status_t parse_payload(private_parser_t *this, { payload_t *pld; void *output; - int rule_count, payload_length = 0, spi_size = 0, attribute_length = 0; + size_t rule_count; + int payload_length = 0, spi_size = 0, attribute_length = 0; u_int16_t ts_type = 0; bool attribute_format = FALSE; int rule_number; @@ -396,7 +397,7 @@ static status_t parse_payload(private_parser_t *this, output = pld; /* parse the payload with its own rulse */ - pld->get_encoding_rules(pld, &(this->rules), &rule_count); + pld->get_encoding_rules(pld, &this->rules, &rule_count); for (rule_number = 0; rule_number < rule_count; rule_number++) { rule = &(this->rules[rule_number]); |