Added controls

This commit is contained in:
vemax78
2013-09-22 22:28:07 +02:00
parent 2aa926fff8
commit 210e84a453
6 changed files with 50 additions and 21 deletions

View File

@ -19,19 +19,37 @@ Length: >= 5
/* */
static void capwap_80211_antenna_element_create(void* data, capwap_message_elements_handle handle, struct capwap_write_message_elements_ops* func) {
int i;
struct capwap_80211_antenna_element* element = (struct capwap_80211_antenna_element*)data;
ASSERT(data != NULL);
ASSERT(IS_VALID_RADIOID(element->radioid));
ASSERT(element->selections != NULL);
func->write_u8(handle, element->radioid);
func->write_u8(handle, element->diversity);
func->write_u8(handle, element->combiner);
func->write_u8(handle, element->antennacount);
func->write_block(handle, element->antennaselections, element->antennacount);
func->write_u8(handle, element->selections->count);
for (i = 0; i < element->selections->count; i++) {
func->write_u8(handle, *(uint8_t*)capwap_array_get_item_pointer(element->selections, i));
}
}
/* */
static void capwap_80211_antenna_element_free(void* data) {
struct capwap_80211_antenna_element* element = (struct capwap_80211_antenna_element*)data;
ASSERT(data != NULL);
ASSERT(element->selections != NULL);
capwap_array_free(element->selections);
capwap_free(data);
}
/* */
static void* capwap_80211_antenna_element_parsing(capwap_message_elements_handle handle, struct capwap_read_message_elements_ops* func) {
int i;
uint8_t count;
unsigned short length;
struct capwap_80211_antenna_element* data;
@ -53,32 +71,34 @@ static void* capwap_80211_antenna_element_parsing(capwap_message_elements_handle
/* */
data = (struct capwap_80211_antenna_element*)capwap_alloc(sizeof(struct capwap_80211_antenna_element));
memset(data, 0, sizeof(struct capwap_80211_antenna_element));
data->selections = capwap_array_create(sizeof(uint8_t), 0, 1);
/* Retrieve data */
func->read_u8(handle, &data->radioid);
if (!IS_VALID_RADIOID(data->radioid)) {
capwap_80211_antenna_element_free((void*)data);
capwap_logging_debug("Invalid IEEE 802.11 Antenna element element: invalid radio");
return NULL;
}
func->read_u8(handle, &data->diversity);
func->read_u8(handle, &data->combiner);
func->read_u8(handle, &data->antennacount);
func->read_u8(handle, &count);
/* Check */
if (data->antennacount != length) {
if (count != length) {
capwap_logging_debug("Invalid IEEE 802.11 Antenna element");
capwap_free(data);
return NULL;
}
func->read_block(handle, data->antennaselections, length);
for (i = 0; i < count; i++) {
func->read_u8(handle, (uint8_t*)capwap_array_get_item_pointer(data->selections, i));
}
return data;
}
/* */
static void capwap_80211_antenna_element_free(void* data) {
ASSERT(data != NULL);
capwap_free(data);
}
/* */
struct capwap_message_elements_ops capwap_element_80211_antenna_ops = {
.create_message_element = capwap_80211_antenna_element_create,