Improve memory administration for tx/rx packet manager
This commit is contained in:
@ -17,79 +17,59 @@ Length: 8
|
||||
|
||||
********************************************************************/
|
||||
|
||||
struct capwap_80211_directsequencecontrol_raw_element {
|
||||
unsigned char radioid;
|
||||
unsigned char reserved;
|
||||
unsigned char currentchannel;
|
||||
unsigned char currentcca;
|
||||
unsigned long enerydetectthreshold;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* */
|
||||
struct capwap_message_element* capwap_80211_dscontrol_element_create(void* data, unsigned long datalength) {
|
||||
struct capwap_message_element* element;
|
||||
struct capwap_80211_directsequencecontrol_raw_element* dataraw;
|
||||
struct capwap_80211_directsequencecontrol_element* dataelement = (struct capwap_80211_directsequencecontrol_element*)data;
|
||||
static void capwap_80211_directsequencecontrol_element_create(void* data, capwap_message_elements_handle handle, struct capwap_write_message_elements_ops* func) {
|
||||
struct capwap_80211_directsequencecontrol_element* element = (struct capwap_80211_directsequencecontrol_element*)data;
|
||||
|
||||
ASSERT(data != NULL);
|
||||
ASSERT(datalength >= sizeof(struct capwap_80211_directsequencecontrol_element));
|
||||
|
||||
/* Alloc block of memory */
|
||||
element = capwap_alloc(sizeof(struct capwap_message_element) + sizeof(struct capwap_80211_directsequencecontrol_raw_element));
|
||||
if (!element) {
|
||||
capwap_outofmemory();
|
||||
}
|
||||
|
||||
/* Create message element */
|
||||
memset(element, 0, sizeof(struct capwap_message_element) + sizeof(struct capwap_80211_directsequencecontrol_raw_element));
|
||||
element->type = htons(CAPWAP_ELEMENT_80211_DIRECTSEQUENCECONTROL);
|
||||
element->length = htons(sizeof(struct capwap_80211_directsequencecontrol_raw_element));
|
||||
dataraw = (struct capwap_80211_directsequencecontrol_raw_element*)element->data;
|
||||
|
||||
dataraw->radioid = dataelement->radioid;
|
||||
dataraw->currentchannel = dataelement->currentchannel;
|
||||
dataraw->currentcca = dataelement->currentcca;
|
||||
dataraw->enerydetectthreshold = htonl(dataelement->enerydetectthreshold);
|
||||
return element;
|
||||
/* */
|
||||
func->write_u8(handle, element->radioid);
|
||||
func->write_u8(handle, 0);
|
||||
func->write_u8(handle, element->currentchannel);
|
||||
func->write_u8(handle, element->currentcca);
|
||||
func->write_u32(handle, element->enerydetectthreshold);
|
||||
}
|
||||
|
||||
/* */
|
||||
int capwap_80211_dscontrol_element_validate(struct capwap_message_element* element) {
|
||||
/* TODO */
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* */
|
||||
void* capwap_80211_dscontrol_element_parsing(struct capwap_message_element* element) {
|
||||
static void* capwap_80211_directsequencecontrol_element_parsing(capwap_message_elements_handle handle, struct capwap_read_message_elements_ops* func) {
|
||||
struct capwap_80211_directsequencecontrol_element* data;
|
||||
struct capwap_80211_directsequencecontrol_raw_element* dataraw;
|
||||
|
||||
ASSERT(element);
|
||||
ASSERT(ntohs(element->type) == CAPWAP_ELEMENT_80211_DIRECTSEQUENCECONTROL);
|
||||
ASSERT(handle != NULL);
|
||||
ASSERT(func != NULL);
|
||||
|
||||
if (ntohs(element->length) != 8) {
|
||||
if (func->read_ready(handle) != 8) {
|
||||
capwap_logging_debug("Invalid IEEE 802.11 Direct Sequence Control element");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
dataraw = (struct capwap_80211_directsequencecontrol_raw_element*)element->data;
|
||||
|
||||
/* */
|
||||
data = (struct capwap_80211_directsequencecontrol_element*)capwap_alloc(sizeof(struct capwap_80211_directsequencecontrol_element));
|
||||
if (!data) {
|
||||
capwap_outofmemory();
|
||||
}
|
||||
|
||||
/* */
|
||||
data->radioid = dataraw->radioid;
|
||||
data->currentchannel = dataraw->currentchannel;
|
||||
data->currentcca = dataraw->currentcca;
|
||||
data->enerydetectthreshold = ntohl(dataraw->enerydetectthreshold);
|
||||
/* Retrieve data */
|
||||
memset(data, 0, sizeof(struct capwap_80211_directsequencecontrol_element));
|
||||
func->read_u8(handle, &data->radioid);
|
||||
func->read_u8(handle, NULL);
|
||||
func->read_u8(handle, &data->currentchannel);
|
||||
func->read_u8(handle, &data->currentcca);
|
||||
func->read_u32(handle, &data->enerydetectthreshold);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
/* */
|
||||
void capwap_80211_dscontrol_element_free(void* data) {
|
||||
static void capwap_80211_directsequencecontrol_element_free(void* data) {
|
||||
ASSERT(data != NULL);
|
||||
|
||||
capwap_free(data);
|
||||
}
|
||||
|
||||
/* */
|
||||
struct capwap_message_elements_ops capwap_element_80211_directsequencecontrol_ops = {
|
||||
.create_message_element = capwap_80211_directsequencecontrol_element_create,
|
||||
.parsing_message_element = capwap_80211_directsequencecontrol_element_parsing,
|
||||
.free_parsed_message_element = capwap_80211_directsequencecontrol_element_free
|
||||
};
|
||||
|
Reference in New Issue
Block a user