summaryrefslogtreecommitdiff
path: root/cesar/cp
diff options
context:
space:
mode:
authorThierry Carré2011-10-13 16:13:27 +0200
committerThierry Carré2011-10-20 10:46:36 +0200
commitda6dab42f85f6ed00b12e7c3196b791058c3cb01 (patch)
treebd79950e336857a72814badba1dc9cfa86fe8ed3 /cesar/cp
parent8563c98f11d1704bc8289f7ccc4026d4523f7b29 (diff)
cesar/{common,cp}: remove a define unused, and rename the second.
Diffstat (limited to 'cesar/cp')
-rw-r--r--cesar/cp/msg/inc/msg_drv.h5
-rw-r--r--cesar/cp/msg/src/msg_drv.c11
-rw-r--r--cesar/cp/msg/test/src/msg_cc.c6
-rw-r--r--cesar/cp/msg/test/src/msg_drv.c4
-rw-r--r--cesar/cp/sta/action/src/drv.c2
5 files changed, 15 insertions, 13 deletions
diff --git a/cesar/cp/msg/inc/msg_drv.h b/cesar/cp/msg/inc/msg_drv.h
index a15a98c6e4..e1a5ac6230 100644
--- a/cesar/cp/msg/inc/msg_drv.h
+++ b/cesar/cp/msg/inc/msg_drv.h
@@ -215,8 +215,9 @@ cp_msg_drv_sta_set_key_req_receive (cp_t *ctx, cp_mme_rx_t *mme, cp_key_t *nmk,
* It can failed it there is no '\0' at the end of the string.
*/
bool
-cp_msg_drv_sta_set_config_req_receive (cp_t *ctx, cp_mme_rx_t *mme,
- char config[HPAV_MME_PAYLOAD_MAX_SIZE]);
+cp_msg_drv_sta_set_config_req_receive (
+ cp_t *ctx, cp_mme_rx_t *mme,
+ char config[HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN]);
/**
* Send a DRV_STA_SET_KEY.CNF.
diff --git a/cesar/cp/msg/src/msg_drv.c b/cesar/cp/msg/src/msg_drv.c
index 371877c29a..3d8bc4f22f 100644
--- a/cesar/cp/msg/src/msg_drv.c
+++ b/cesar/cp/msg/src/msg_drv.c
@@ -436,8 +436,9 @@ cp_msg_drv_sta_set_key_req_receive (cp_t *ctx, cp_mme_rx_t *mme,
}
bool
-cp_msg_drv_sta_set_config_req_receive (cp_t *ctx, cp_mme_rx_t *mme,
- char config[HPAV_MME_PAYLOAD_MAX_SIZE])
+cp_msg_drv_sta_set_config_req_receive (
+ cp_t *ctx, cp_mme_rx_t *mme,
+ char config[HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN])
{
/* Check parameters. */
dbg_assert (ctx);
@@ -449,9 +450,9 @@ cp_msg_drv_sta_set_config_req_receive (cp_t *ctx, cp_mme_rx_t *mme,
/* Read configuration string. */
uint config_len =
bitstream_read_str (&mme->bitstream, config,
- HPAV_MME_PAYLOAD_MAX_SIZE);
- /* Message must be lower than HPAV_MME_PAYLOAD_MAX_SIZE. */
- if (config_len != HPAV_MME_PAYLOAD_MAX_SIZE)
+ HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN);
+ /* Message must be lower than HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN. */
+ if (config_len != HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN)
/* No check is done for the last character, bitstream_read_str
* will stop when it found it (or when there is no more space). */
return true;
diff --git a/cesar/cp/msg/test/src/msg_cc.c b/cesar/cp/msg/test/src/msg_cc.c
index b77d134372..c0a381e79f 100644
--- a/cesar/cp/msg/test/src/msg_cc.c
+++ b/cesar/cp/msg/test/src/msg_cc.c
@@ -1073,7 +1073,7 @@ test_case_msg_cc_handover (test_t test)
CP_MSG_CC_HANDOVER_REQ_REASON_CCO_SELECTION);
bitstream_read_init (&stream, buffer + HPAV_MME_HEADER,
- HPAV_MME_PAYLOAD_MAX_SIZE);
+ HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN);
data = bitstream_read (&stream, 8);
test_fail_unless (data == 0x1);
test_fail_unless (data == CP_MSG_CC_HANDOVER_REQ_HANDOVER_HARD);
@@ -1176,7 +1176,7 @@ test_case_msg_cc_handover (test_t test)
CP_MSG_CC_HANDOVER_CNF_RESULT_ACCEPT);
bitstream_read_init (&stream, buffer + HPAV_MME_HEADER,
- HPAV_MME_PAYLOAD_MAX_SIZE);
+ HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN);
data = bitstream_read (&stream, 8);
test_fail_unless (data == 0x0);
test_fail_unless (data == CP_MSG_CC_HANDOVER_CNF_RESULT_ACCEPT);
@@ -1287,7 +1287,7 @@ test_case_msg_cc_handover (test_t test)
/* Read the MMe. */
bitstream_read_init (&stream, buffer + HPAV_MME_HEADER,
- HPAV_MME_PAYLOAD_MAX_SIZE);
+ HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN);
data = bitstream_read (&stream, 8);
test_fail_unless (data == 0x1);
test_fail_unless (data == CP_MSG_CC_HANDOVER_INFO_IND_RSC_UPDATE_BCCO);
diff --git a/cesar/cp/msg/test/src/msg_drv.c b/cesar/cp/msg/test/src/msg_drv.c
index 41920140ba..2ec1fc09b4 100644
--- a/cesar/cp/msg/test/src/msg_drv.c
+++ b/cesar/cp/msg/test/src/msg_drv.c
@@ -845,7 +845,7 @@ test_case_drv_sta_set_config (test_t test)
bitstream_read_init (&rx.bitstream, &buffer_ref, rx.length);
- char buffer[HPAV_MME_PAYLOAD_MAX_SIZE];
+ char buffer[HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN];
test_fail_unless (cp_msg_drv_sta_set_config_req_receive (&cp, &rx,
buffer)
== true);
@@ -859,7 +859,7 @@ test_case_drv_sta_set_config (test_t test)
rx.length = 1;
bitstream_read_init (&rx.bitstream, &buffer_ref, rx.length);
- char buffer[HPAV_MME_PAYLOAD_MAX_SIZE];
+ char buffer[HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN];
test_fail_unless (cp_msg_drv_sta_set_config_req_receive (&cp, &rx,
buffer)
== true);
diff --git a/cesar/cp/sta/action/src/drv.c b/cesar/cp/sta/action/src/drv.c
index 58a0984931..069e2026f7 100644
--- a/cesar/cp/sta/action/src/drv.c
+++ b/cesar/cp/sta/action/src/drv.c
@@ -529,7 +529,7 @@ cp_sta_action_drv__drv_sta_set_config_req (cp_t *ctx, cp_mme_rx_t *mme)
/* Check parameter. */
dbg_assert (mme);
- char config[HPAV_MME_PAYLOAD_MAX_SIZE];
+ char config[HPAV_MME_PAYLOAD_MAX_SIZE_WITHOUT_VLAN];
cp_msg_drv_result_t result = CP_MSG_DRV_RESULT_FAILURE;
if (cp_msg_drv_sta_set_config_req_receive (ctx, mme, config))