From 1436fc9e5f941a176169359bac62702b90da1e23 Mon Sep 17 00:00:00 2001 From: Andreas Schultz Date: Mon, 7 Mar 2016 17:12:48 +0100 Subject: [PATCH] rename overly verbose capwap_message_elements_ops The struct is already conveys the scope of the operations, repeating it in the name of ops again is redundant and bloats the resulting source code. Rename the opt to shorter versions. --- src/ac/ac_80211_json.c | 46 +++++++++---------- src/ac/ac_80211_json_addwlan.c | 6 +-- src/ac/ac_80211_json_antenna.c | 6 +-- src/ac/ac_80211_json_assignbssid.c | 6 +-- src/ac/ac_80211_json_deletewlan.c | 6 +-- src/ac/ac_80211_json_directsequencecontrol.c | 6 +-- src/ac/ac_80211_json_ie.c | 4 +- src/ac/ac_80211_json_macoperation.c | 6 +-- src/ac/ac_80211_json_miccountermeasures.c | 6 +-- src/ac/ac_80211_json_multidomaincapability.c | 6 +-- src/ac/ac_80211_json_ofdmcontrol.c | 6 +-- src/ac/ac_80211_json_rateset.c | 6 +-- src/ac/ac_80211_json_rsnaerrorreport.c | 6 +-- src/ac/ac_80211_json_statistics.c | 6 +-- src/ac/ac_80211_json_supportedrates.c | 6 +-- src/ac/ac_80211_json_txpower.c | 6 +-- src/ac/ac_80211_json_txpowerlevel.c | 6 +-- src/ac/ac_80211_json_updatewlan.c | 6 +-- src/ac/ac_80211_json_wtpqos.c | 6 +-- src/ac/ac_80211_json_wtpradioconf.c | 6 +-- src/ac/ac_80211_json_wtpradiofailalarm.c | 6 +-- src/ac/ac_80211_json_wtpradioinformation.c | 6 +-- src/ac/ac_json.h | 2 +- src/common/capwap_element.c | 8 ++-- src/common/capwap_element.h | 8 ++-- src/common/capwap_element_80211_addwlan.c | 8 ++-- src/common/capwap_element_80211_antenna.c | 8 ++-- src/common/capwap_element_80211_assignbssid.c | 8 ++-- src/common/capwap_element_80211_deletewlan.c | 8 ++-- ...pwap_element_80211_directsequencecontrol.c | 8 ++-- src/common/capwap_element_80211_ie.c | 8 ++-- .../capwap_element_80211_macoperation.c | 8 ++-- .../capwap_element_80211_miccountermeasures.c | 8 ++-- ...pwap_element_80211_multidomaincapability.c | 8 ++-- src/common/capwap_element_80211_ofdmcontrol.c | 8 ++-- src/common/capwap_element_80211_rateset.c | 8 ++-- .../capwap_element_80211_rsnaerrorreport.c | 8 ++-- src/common/capwap_element_80211_station.c | 8 ++-- src/common/capwap_element_80211_stationkey.c | 8 ++-- src/common/capwap_element_80211_stationqos.c | 8 ++-- src/common/capwap_element_80211_statistics.c | 8 ++-- .../capwap_element_80211_supportedrates.c | 8 ++-- src/common/capwap_element_80211_txpower.c | 8 ++-- .../capwap_element_80211_txpowerlevel.c | 8 ++-- .../capwap_element_80211_updatestationqos.c | 8 ++-- src/common/capwap_element_80211_updatewlan.c | 8 ++-- src/common/capwap_element_80211_wtpqos.c | 8 ++-- .../capwap_element_80211_wtpradioconf.c | 8 ++-- .../capwap_element_80211_wtpradiofailalarm.c | 8 ++-- ...capwap_element_80211_wtpradioinformation.c | 8 ++-- src/common/capwap_element_80211n_radioconf.c | 8 ++-- ...apwap_element_80211n_station_information.c | 8 ++-- src/common/capwap_element_acdescriptor.c | 8 ++-- src/common/capwap_element_acipv4list.c | 8 ++-- src/common/capwap_element_acipv6list.c | 8 ++-- src/common/capwap_element_acname.c | 8 ++-- src/common/capwap_element_acnamepriority.c | 8 ++-- src/common/capwap_element_actimestamp.c | 8 ++-- src/common/capwap_element_addmacacl.c | 8 ++-- src/common/capwap_element_addstation.c | 8 ++-- src/common/capwap_element_controlipv4.c | 8 ++-- src/common/capwap_element_controlipv6.c | 8 ++-- src/common/capwap_element_datatransferdata.c | 8 ++-- src/common/capwap_element_datatransfermode.c | 8 ++-- .../capwap_element_decrypterrorreport.c | 8 ++-- .../capwap_element_decrypterrorreportperiod.c | 8 ++-- src/common/capwap_element_deletemacacl.c | 8 ++-- src/common/capwap_element_deletestation.c | 8 ++-- src/common/capwap_element_discoverytype.c | 8 ++-- src/common/capwap_element_duplicateipv4.c | 8 ++-- src/common/capwap_element_duplicateipv6.c | 8 ++-- src/common/capwap_element_ecnsupport.c | 8 ++-- src/common/capwap_element_idletimeout.c | 8 ++-- src/common/capwap_element_imagedata.c | 8 ++-- src/common/capwap_element_imageidentifier.c | 8 ++-- src/common/capwap_element_imageinfo.c | 8 ++-- src/common/capwap_element_initdownload.c | 8 ++-- src/common/capwap_element_localipv4.c | 8 ++-- src/common/capwap_element_localipv6.c | 8 ++-- src/common/capwap_element_location.c | 8 ++-- src/common/capwap_element_maximumlength.c | 8 ++-- src/common/capwap_element_mtudiscovery.c | 8 ++-- src/common/capwap_element_radioadmstate.c | 8 ++-- src/common/capwap_element_radiooprstate.c | 8 ++-- src/common/capwap_element_resultcode.c | 8 ++-- src/common/capwap_element_returnedmessage.c | 8 ++-- src/common/capwap_element_sessionid.c | 8 ++-- src/common/capwap_element_statisticstimer.c | 8 ++-- src/common/capwap_element_timers.c | 8 ++-- src/common/capwap_element_transport.c | 8 ++-- src/common/capwap_element_vendorpayload.c | 8 ++-- src/common/capwap_element_wtpboarddata.c | 8 ++-- src/common/capwap_element_wtpdescriptor.c | 8 ++-- src/common/capwap_element_wtpfallback.c | 8 ++-- .../capwap_element_wtpframetunnelmode.c | 8 ++-- src/common/capwap_element_wtpmactype.c | 8 ++-- src/common/capwap_element_wtpname.c | 8 ++-- src/common/capwap_element_wtpradiostat.c | 8 ++-- src/common/capwap_element_wtprebootstat.c | 8 ++-- .../capwap_element_wtpstaticipaddress.c | 8 ++-- src/common/capwap_protocol.c | 8 ++-- 101 files changed, 398 insertions(+), 398 deletions(-) diff --git a/src/ac/ac_80211_json.c b/src/ac/ac_80211_json.c index d24faf0..498513c 100644 --- a/src/ac/ac_80211_json.c +++ b/src/ac/ac_80211_json.c @@ -74,93 +74,93 @@ void ac_json_ieee80211_free(struct ac_json_ieee80211_wtpradio* wtpradio) { if (item->valid) { if (item->addwlan) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_ADD_WLAN)->free_message_element(item->addwlan); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_ADD_WLAN)->free(item->addwlan); } if (item->antenna) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_ANTENNA)->free_message_element(item->antenna); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_ANTENNA)->free(item->antenna); } if (item->assignbssid) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_ASSIGN_BSSID)->free_message_element(item->assignbssid); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_ASSIGN_BSSID)->free(item->assignbssid); } if (item->deletewlan) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_DELETE_WLAN)->free_message_element(item->deletewlan); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_DELETE_WLAN)->free(item->deletewlan); } if (item->directsequencecontrol) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_DIRECTSEQUENCECONTROL)->free_message_element(item->directsequencecontrol); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_DIRECTSEQUENCECONTROL)->free(item->directsequencecontrol); } if (item->iearray) { struct capwap_message_elements_ops* ieops = capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_IE); for (j = 0; j < item->iearray->count; j++) { - ieops->free_message_element(*(struct capwap_80211_ie_element**)capwap_array_get_item_pointer(item->iearray, j)); + ieops->free(*(struct capwap_80211_ie_element**)capwap_array_get_item_pointer(item->iearray, j)); } capwap_array_free(item->iearray); } if (item->macoperation) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_MACOPERATION)->free_message_element(item->macoperation); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_MACOPERATION)->free(item->macoperation); } if (item->miccountermeasures) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_MIC_COUNTERMEASURES)->free_message_element(item->miccountermeasures); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_MIC_COUNTERMEASURES)->free(item->miccountermeasures); } if (item->multidomaincapability) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_MULTIDOMAINCAPABILITY)->free_message_element(item->multidomaincapability); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_MULTIDOMAINCAPABILITY)->free(item->multidomaincapability); } if (item->ofdmcontrol) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_OFDMCONTROL)->free_message_element(item->ofdmcontrol); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_OFDMCONTROL)->free(item->ofdmcontrol); } if (item->rateset) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_RATESET)->free_message_element(item->rateset); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_RATESET)->free(item->rateset); } if (item->rsnaerrorreport) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_RSNA_ERROR_REPORT)->free_message_element(item->rsnaerrorreport); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_RSNA_ERROR_REPORT)->free(item->rsnaerrorreport); } if (item->statistics) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_STATISTICS)->free_message_element(item->statistics); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_STATISTICS)->free(item->statistics); } if (item->supportedrates) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_SUPPORTEDRATES)->free_message_element(item->supportedrates); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_SUPPORTEDRATES)->free(item->supportedrates); } if (item->txpower) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_TXPOWER)->free_message_element(item->txpower); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_TXPOWER)->free(item->txpower); } if (item->txpowerlevel) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_TXPOWERLEVEL)->free_message_element(item->txpowerlevel); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_TXPOWERLEVEL)->free(item->txpowerlevel); } if (item->updatewlan) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_UPDATE_WLAN)->free_message_element(item->updatewlan); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_UPDATE_WLAN)->free(item->updatewlan); } if (item->wtpqos) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTP_QOS)->free_message_element(item->wtpqos); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTP_QOS)->free(item->wtpqos); } if (item->wtpradioconf) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTP_RADIO_CONF)->free_message_element(item->wtpradioconf); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTP_RADIO_CONF)->free(item->wtpradioconf); } if (item->wtpradiofailalarm) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTP_RADIO_FAIL_ALARM)->free_message_element(item->wtpradiofailalarm); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTP_RADIO_FAIL_ALARM)->free(item->wtpradiofailalarm); } if (item->wtpradioinformation) { - capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTPRADIOINFORMATION)->free_message_element(item->wtpradioinformation); + capwap_get_message_element_ops(CAPWAP_ELEMENT_80211_WTPRADIOINFORMATION)->free(item->wtpradioinformation); } } } @@ -239,13 +239,13 @@ int ac_json_ieee80211_parsingjson(struct ac_json_ieee80211_wtpradio* wtpradio, s for(entry = json_object_get_object(jsonradio)->head; entry != NULL; entry = entry->next) { struct ac_json_ieee80211_ops* ops = ac_json_80211_getops_by_jsontype((char*)entry->k); /* Retrieve JSON handler */ if (ops) { - void* data = ops->create_message_element((struct json_object*)entry->v, radioid); + void* data = ops->create((struct json_object*)entry->v, radioid); if (data) { /* Message element complete */ ac_json_ieee80211_addmessageelement(wtpradio, ops->type, data, 1); /* Free resource */ - capwap_get_message_element_ops(ops->type)->free_message_element(data); + capwap_get_message_element_ops(ops->type)->free(data); } } } diff --git a/src/ac/ac_80211_json_addwlan.c b/src/ac/ac_80211_json_addwlan.c index 87d655b..9aacc16 100644 --- a/src/ac/ac_80211_json_addwlan.c +++ b/src/ac/ac_80211_json_addwlan.c @@ -17,11 +17,11 @@ static int ac_json_80211_addwlan_addmessageelement(struct ac_json_ieee80211_wtpr return 0; } - ops->free_message_element(item->addwlan); + ops->free(item->addwlan); } item->valid = 1; - item->addwlan = (struct capwap_80211_addwlan_element*)ops->clone_message_element(addwlan); + item->addwlan = (struct capwap_80211_addwlan_element*)ops->clone(addwlan); return 1; } @@ -35,7 +35,7 @@ static void ac_json_80211_addwlan_createjson(struct json_object* jsonparent, voi struct ac_json_ieee80211_ops ac_json_80211_addwlan_ops = { .type = CAPWAP_ELEMENT_80211_ADD_WLAN, .json_type = "IEEE80211AddWLAN", - .create_message_element = ac_json_80211_addwlan_createmessageelement, + .create = ac_json_80211_addwlan_createmessageelement, .add_message_element = ac_json_80211_addwlan_addmessageelement, .create_json = ac_json_80211_addwlan_createjson }; diff --git a/src/ac/ac_80211_json_antenna.c b/src/ac/ac_80211_json_antenna.c index 57b0e7f..92d6c7f 100644 --- a/src/ac/ac_80211_json_antenna.c +++ b/src/ac/ac_80211_json_antenna.c @@ -71,11 +71,11 @@ static int ac_json_80211_antenna_addmessageelement(struct ac_json_ieee80211_wtpr return 0; } - ops->free_message_element(item->antenna); + ops->free(item->antenna); } item->valid = 1; - item->antenna = (struct capwap_80211_antenna_element*)ops->clone_message_element(antenna); + item->antenna = (struct capwap_80211_antenna_element*)ops->clone(antenna); return 1; } @@ -103,7 +103,7 @@ static void ac_json_80211_antenna_createjson(struct json_object* jsonparent, voi struct ac_json_ieee80211_ops ac_json_80211_antenna_ops = { .type = CAPWAP_ELEMENT_80211_ANTENNA, .json_type = "IEEE80211Antenna", - .create_message_element = ac_json_80211_antenna_createmessageelement, + .create = ac_json_80211_antenna_createmessageelement, .add_message_element = ac_json_80211_antenna_addmessageelement, .create_json = ac_json_80211_antenna_createjson }; diff --git a/src/ac/ac_80211_json_assignbssid.c b/src/ac/ac_80211_json_assignbssid.c index 035769e..b6b80a2 100644 --- a/src/ac/ac_80211_json_assignbssid.c +++ b/src/ac/ac_80211_json_assignbssid.c @@ -17,11 +17,11 @@ static int ac_json_80211_assignbssid_addmessageelement(struct ac_json_ieee80211_ return 0; } - ops->free_message_element(item->assignbssid); + ops->free(item->assignbssid); } item->valid = 1; - item->assignbssid = (struct capwap_80211_assignbssid_element*)ops->clone_message_element(assignbssid); + item->assignbssid = (struct capwap_80211_assignbssid_element*)ops->clone(assignbssid); return 1; } @@ -35,7 +35,7 @@ static void ac_json_80211_assignbssid_createjson(struct json_object* jsonparent, struct ac_json_ieee80211_ops ac_json_80211_assignbssid_ops = { .type = CAPWAP_ELEMENT_80211_ASSIGN_BSSID, .json_type = "IEEE80211AssignBSSID", - .create_message_element = ac_json_80211_assignbssid_createmessageelement, + .create = ac_json_80211_assignbssid_createmessageelement, .add_message_element = ac_json_80211_assignbssid_addmessageelement, .create_json = ac_json_80211_assignbssid_createjson }; diff --git a/src/ac/ac_80211_json_deletewlan.c b/src/ac/ac_80211_json_deletewlan.c index 7a32b4f..e566671 100644 --- a/src/ac/ac_80211_json_deletewlan.c +++ b/src/ac/ac_80211_json_deletewlan.c @@ -17,11 +17,11 @@ static int ac_json_80211_deletewlan_addmessageelement(struct ac_json_ieee80211_w return 0; } - ops->free_message_element(item->deletewlan); + ops->free(item->deletewlan); } item->valid = 1; - item->deletewlan = (struct capwap_80211_deletewlan_element*)ops->clone_message_element(deletewlan); + item->deletewlan = (struct capwap_80211_deletewlan_element*)ops->clone(deletewlan); return 1; } @@ -35,7 +35,7 @@ static void ac_json_80211_deletewlan_createjson(struct json_object* jsonparent, struct ac_json_ieee80211_ops ac_json_80211_deletewlan_ops = { .type = CAPWAP_ELEMENT_80211_DELETE_WLAN, .json_type = "IEEE80211DeleteWLAN", - .create_message_element = ac_json_80211_deletewlan_createmessageelement, + .create = ac_json_80211_deletewlan_createmessageelement, .add_message_element = ac_json_80211_deletewlan_addmessageelement, .create_json = ac_json_80211_deletewlan_createjson }; diff --git a/src/ac/ac_80211_json_directsequencecontrol.c b/src/ac/ac_80211_json_directsequencecontrol.c index 85c8a3b..1b536db 100644 --- a/src/ac/ac_80211_json_directsequencecontrol.c +++ b/src/ac/ac_80211_json_directsequencecontrol.c @@ -57,11 +57,11 @@ static int ac_json_80211_directsequencecontrol_addmessageelement(struct ac_json_ return 0; } - ops->free_message_element(item->directsequencecontrol); + ops->free(item->directsequencecontrol); } item->valid = 1; - item->directsequencecontrol = (struct capwap_80211_directsequencecontrol_element*)ops->clone_message_element(directsequencecontrol); + item->directsequencecontrol = (struct capwap_80211_directsequencecontrol_element*)ops->clone(directsequencecontrol); return 1; } @@ -82,7 +82,7 @@ static void ac_json_80211_directsequencecontrol_createjson(struct json_object* j struct ac_json_ieee80211_ops ac_json_80211_directsequencecontrol_ops = { .type = CAPWAP_ELEMENT_80211_DIRECTSEQUENCECONTROL, .json_type = "IEEE80211DirectSequenceControl", - .create_message_element = ac_json_80211_directsequencecontrol_createmessageelement, + .create = ac_json_80211_directsequencecontrol_createmessageelement, .add_message_element = ac_json_80211_directsequencecontrol_addmessageelement, .create_json = ac_json_80211_directsequencecontrol_createjson }; diff --git a/src/ac/ac_80211_json_ie.c b/src/ac/ac_80211_json_ie.c index 87afa09..1d0bf5e 100644 --- a/src/ac/ac_80211_json_ie.c +++ b/src/ac/ac_80211_json_ie.c @@ -19,7 +19,7 @@ static int ac_json_80211_ie_addmessageelement(struct ac_json_ieee80211_wtpradio* item->valid = 1; ieclone = (struct capwap_80211_ie_element**)capwap_array_get_item_pointer(item->iearray, item->iearray->count); - *ieclone = (struct capwap_80211_ie_element*)ops->clone_message_element(ie); + *ieclone = (struct capwap_80211_ie_element*)ops->clone(ie); return 1; } @@ -33,7 +33,7 @@ static void ac_json_80211_ie_createjson(struct json_object* jsonparent, void* da struct ac_json_ieee80211_ops ac_json_80211_ie_ops = { .type = CAPWAP_ELEMENT_80211_IE, .json_type = "IEEE80211IE", - .create_message_element = ac_json_80211_ie_createmessageelement, + .create = ac_json_80211_ie_createmessageelement, .add_message_element = ac_json_80211_ie_addmessageelement, .create_json = ac_json_80211_ie_createjson }; diff --git a/src/ac/ac_80211_json_macoperation.c b/src/ac/ac_80211_json_macoperation.c index d34db2e..f383029 100644 --- a/src/ac/ac_80211_json_macoperation.c +++ b/src/ac/ac_80211_json_macoperation.c @@ -84,11 +84,11 @@ static int ac_json_80211_macoperation_addmessageelement(struct ac_json_ieee80211 return 0; } - ops->free_message_element(item->macoperation); + ops->free(item->macoperation); } item->valid = 1; - item->macoperation = (struct capwap_80211_macoperation_element*)ops->clone_message_element(macoperation); + item->macoperation = (struct capwap_80211_macoperation_element*)ops->clone(macoperation); return 1; } @@ -112,7 +112,7 @@ static void ac_json_80211_macoperation_createjson(struct json_object* jsonparent struct ac_json_ieee80211_ops ac_json_80211_macoperation_ops = { .type = CAPWAP_ELEMENT_80211_MACOPERATION, .json_type = "IEEE80211MACOperation", - .create_message_element = ac_json_80211_macoperation_createmessageelement, + .create = ac_json_80211_macoperation_createmessageelement, .add_message_element = ac_json_80211_macoperation_addmessageelement, .create_json = ac_json_80211_macoperation_createjson }; diff --git a/src/ac/ac_80211_json_miccountermeasures.c b/src/ac/ac_80211_json_miccountermeasures.c index 15ec6ac..f2ebff8 100644 --- a/src/ac/ac_80211_json_miccountermeasures.c +++ b/src/ac/ac_80211_json_miccountermeasures.c @@ -17,11 +17,11 @@ static int ac_json_80211_miccountermeasures_addmessageelement(struct ac_json_iee return 0; } - ops->free_message_element(item->miccountermeasures); + ops->free(item->miccountermeasures); } item->valid = 1; - item->miccountermeasures = (struct capwap_80211_miccountermeasures_element*)ops->clone_message_element(miccountermeasures); + item->miccountermeasures = (struct capwap_80211_miccountermeasures_element*)ops->clone(miccountermeasures); return 1; } @@ -35,7 +35,7 @@ static void ac_json_80211_miccountermeasures_createjson(struct json_object* json struct ac_json_ieee80211_ops ac_json_80211_miccountermeasures_ops = { .type = CAPWAP_ELEMENT_80211_MIC_COUNTERMEASURES, .json_type = "IEEE80211MicCounterMeasures", - .create_message_element = ac_json_80211_miccountermeasures_createmessageelement, + .create = ac_json_80211_miccountermeasures_createmessageelement, .add_message_element = ac_json_80211_miccountermeasures_addmessageelement, .create_json = ac_json_80211_miccountermeasures_createjson }; diff --git a/src/ac/ac_80211_json_multidomaincapability.c b/src/ac/ac_80211_json_multidomaincapability.c index 024331c..c945d22 100644 --- a/src/ac/ac_80211_json_multidomaincapability.c +++ b/src/ac/ac_80211_json_multidomaincapability.c @@ -57,11 +57,11 @@ static int ac_json_80211_multidomaincapability_addmessageelement(struct ac_json_ return 0; } - ops->free_message_element(item->multidomaincapability); + ops->free(item->multidomaincapability); } item->valid = 1; - item->multidomaincapability = (struct capwap_80211_multidomaincapability_element*)ops->clone_message_element(multidomaincapability); + item->multidomaincapability = (struct capwap_80211_multidomaincapability_element*)ops->clone(multidomaincapability); return 1; } @@ -82,7 +82,7 @@ static void ac_json_80211_multidomaincapability_createjson(struct json_object* j struct ac_json_ieee80211_ops ac_json_80211_multidomaincapability_ops = { .type = CAPWAP_ELEMENT_80211_MULTIDOMAINCAPABILITY, .json_type = "IEEE80211MultiDomainCapability", - .create_message_element = ac_json_80211_multidomaincapability_createmessageelement, + .create = ac_json_80211_multidomaincapability_createmessageelement, .add_message_element = ac_json_80211_multidomaincapability_addmessageelement, .create_json = ac_json_80211_multidomaincapability_createjson }; diff --git a/src/ac/ac_80211_json_ofdmcontrol.c b/src/ac/ac_80211_json_ofdmcontrol.c index e2ee376..09f7dcc 100644 --- a/src/ac/ac_80211_json_ofdmcontrol.c +++ b/src/ac/ac_80211_json_ofdmcontrol.c @@ -57,11 +57,11 @@ static int ac_json_80211_ofdmcontrol_addmessageelement(struct ac_json_ieee80211_ return 0; } - ops->free_message_element(item->ofdmcontrol); + ops->free(item->ofdmcontrol); } item->valid = 1; - item->ofdmcontrol = (struct capwap_80211_ofdmcontrol_element*)ops->clone_message_element(ofdmcontrol); + item->ofdmcontrol = (struct capwap_80211_ofdmcontrol_element*)ops->clone(ofdmcontrol); return 1; } @@ -82,7 +82,7 @@ static void ac_json_80211_ofdmcontrol_createjson(struct json_object* jsonparent, struct ac_json_ieee80211_ops ac_json_80211_ofdmcontrol_ops = { .type = CAPWAP_ELEMENT_80211_OFDMCONTROL, .json_type = "IEEE80211OFDMControl", - .create_message_element = ac_json_80211_ofdmcontrol_createmessageelement, + .create = ac_json_80211_ofdmcontrol_createmessageelement, .add_message_element = ac_json_80211_ofdmcontrol_addmessageelement, .create_json = ac_json_80211_ofdmcontrol_createjson }; diff --git a/src/ac/ac_80211_json_rateset.c b/src/ac/ac_80211_json_rateset.c index 3f2ada4..1b30207 100644 --- a/src/ac/ac_80211_json_rateset.c +++ b/src/ac/ac_80211_json_rateset.c @@ -48,11 +48,11 @@ static int ac_json_80211_rateset_addmessageelement(struct ac_json_ieee80211_wtpr return 0; } - ops->free_message_element(item->rateset); + ops->free(item->rateset); } item->valid = 1; - item->rateset = (struct capwap_80211_rateset_element*)ops->clone_message_element(rateset); + item->rateset = (struct capwap_80211_rateset_element*)ops->clone(rateset); return 1; } @@ -75,7 +75,7 @@ static void ac_json_80211_rateset_createjson(struct json_object* jsonparent, voi struct ac_json_ieee80211_ops ac_json_80211_rateset_ops = { .type = CAPWAP_ELEMENT_80211_RATESET, .json_type = "IEEE80211Rateset", - .create_message_element = ac_json_80211_rateset_createmessageelement, + .create = ac_json_80211_rateset_createmessageelement, .add_message_element = ac_json_80211_rateset_addmessageelement, .create_json = ac_json_80211_rateset_createjson }; diff --git a/src/ac/ac_80211_json_rsnaerrorreport.c b/src/ac/ac_80211_json_rsnaerrorreport.c index 19a784b..86a6766 100644 --- a/src/ac/ac_80211_json_rsnaerrorreport.c +++ b/src/ac/ac_80211_json_rsnaerrorreport.c @@ -17,11 +17,11 @@ static int ac_json_80211_rsnaerrorreport_addmessageelement(struct ac_json_ieee80 return 0; } - ops->free_message_element(item->rsnaerrorreport); + ops->free(item->rsnaerrorreport); } item->valid = 1; - item->rsnaerrorreport = (struct capwap_80211_rsnaerrorreport_element*)ops->clone_message_element(rsnaerrorreport); + item->rsnaerrorreport = (struct capwap_80211_rsnaerrorreport_element*)ops->clone(rsnaerrorreport); return 1; } @@ -35,7 +35,7 @@ static void ac_json_80211_rsnaerrorreport_createjson(struct json_object* jsonpar struct ac_json_ieee80211_ops ac_json_80211_rsnaerrorreport_ops = { .type = CAPWAP_ELEMENT_80211_RSNA_ERROR_REPORT, .json_type = "IEEE80211RSNAErrorReport", - .create_message_element = ac_json_80211_rsnaerrorreport_createmessageelement, + .create = ac_json_80211_rsnaerrorreport_createmessageelement, .add_message_element = ac_json_80211_rsnaerrorreport_addmessageelement, .create_json = ac_json_80211_rsnaerrorreport_createjson }; diff --git a/src/ac/ac_80211_json_statistics.c b/src/ac/ac_80211_json_statistics.c index 0f37626..1c81464 100644 --- a/src/ac/ac_80211_json_statistics.c +++ b/src/ac/ac_80211_json_statistics.c @@ -17,11 +17,11 @@ static int ac_json_80211_statistics_addmessageelement(struct ac_json_ieee80211_w return 0; } - ops->free_message_element(item->statistics); + ops->free(item->statistics); } item->valid = 1; - item->statistics = (struct capwap_80211_statistics_element*)ops->clone_message_element(statistics); + item->statistics = (struct capwap_80211_statistics_element*)ops->clone(statistics); return 1; } @@ -35,7 +35,7 @@ static void ac_json_80211_statistics_createjson(struct json_object* jsonparent, struct ac_json_ieee80211_ops ac_json_80211_statistics_ops = { .type = CAPWAP_ELEMENT_80211_STATISTICS, .json_type = "IEEE80211Statistics", - .create_message_element = ac_json_80211_statistics_createmessageelement, + .create = ac_json_80211_statistics_createmessageelement, .add_message_element = ac_json_80211_statistics_addmessageelement, .create_json = ac_json_80211_statistics_createjson }; diff --git a/src/ac/ac_80211_json_supportedrates.c b/src/ac/ac_80211_json_supportedrates.c index 4fd87cc..fbc5d5b 100644 --- a/src/ac/ac_80211_json_supportedrates.c +++ b/src/ac/ac_80211_json_supportedrates.c @@ -48,11 +48,11 @@ static int ac_json_80211_supportedrates_addmessageelement(struct ac_json_ieee802 return 0; } - ops->free_message_element(item->supportedrates); + ops->free(item->supportedrates); } item->valid = 1; - item->supportedrates = (struct capwap_80211_supportedrates_element*)ops->clone_message_element(supportedrates); + item->supportedrates = (struct capwap_80211_supportedrates_element*)ops->clone(supportedrates); return 1; } @@ -75,7 +75,7 @@ static void ac_json_80211_supportedrates_createjson(struct json_object* jsonpare struct ac_json_ieee80211_ops ac_json_80211_supportedrates_ops = { .type = CAPWAP_ELEMENT_80211_SUPPORTEDRATES, .json_type = "IEEE80211SupportedRates", - .create_message_element = ac_json_80211_supportedrates_createmessageelement, + .create = ac_json_80211_supportedrates_createmessageelement, .add_message_element = ac_json_80211_supportedrates_addmessageelement, .create_json = ac_json_80211_supportedrates_createjson }; diff --git a/src/ac/ac_80211_json_txpower.c b/src/ac/ac_80211_json_txpower.c index 986f55d..7a6609c 100644 --- a/src/ac/ac_80211_json_txpower.c +++ b/src/ac/ac_80211_json_txpower.c @@ -39,11 +39,11 @@ static int ac_json_80211_txpower_addmessageelement(struct ac_json_ieee80211_wtpr return 0; } - ops->free_message_element(item->txpower); + ops->free(item->txpower); } item->valid = 1; - item->txpower = (struct capwap_80211_txpower_element*)ops->clone_message_element(txpower); + item->txpower = (struct capwap_80211_txpower_element*)ops->clone(txpower); return 1; } @@ -62,7 +62,7 @@ static void ac_json_80211_txpower_createjson(struct json_object* jsonparent, voi struct ac_json_ieee80211_ops ac_json_80211_txpower_ops = { .type = CAPWAP_ELEMENT_80211_TXPOWER, .json_type = "IEEE80211TxPower", - .create_message_element = ac_json_80211_txpower_createmessageelement, + .create = ac_json_80211_txpower_createmessageelement, .add_message_element = ac_json_80211_txpower_addmessageelement, .create_json = ac_json_80211_txpower_createjson }; diff --git a/src/ac/ac_80211_json_txpowerlevel.c b/src/ac/ac_80211_json_txpowerlevel.c index cfcd9b3..f304e71 100644 --- a/src/ac/ac_80211_json_txpowerlevel.c +++ b/src/ac/ac_80211_json_txpowerlevel.c @@ -48,11 +48,11 @@ static int ac_json_80211_txpowerlevel_addmessageelement(struct ac_json_ieee80211 return 0; } - ops->free_message_element(item->txpowerlevel); + ops->free(item->txpowerlevel); } item->valid = 1; - item->txpowerlevel = (struct capwap_80211_txpowerlevel_element*)ops->clone_message_element(txpowerlevel); + item->txpowerlevel = (struct capwap_80211_txpowerlevel_element*)ops->clone(txpowerlevel); return 1; } @@ -75,7 +75,7 @@ static void ac_json_80211_txpowerlevel_createjson(struct json_object* jsonparent struct ac_json_ieee80211_ops ac_json_80211_txpowerlevel_ops = { .type = CAPWAP_ELEMENT_80211_TXPOWERLEVEL, .json_type = "IEEE80211TXPowerLevel", - .create_message_element = ac_json_80211_txpowerlevel_createmessageelement, + .create = ac_json_80211_txpowerlevel_createmessageelement, .add_message_element = ac_json_80211_txpowerlevel_addmessageelement, .create_json = ac_json_80211_txpowerlevel_createjson }; diff --git a/src/ac/ac_80211_json_updatewlan.c b/src/ac/ac_80211_json_updatewlan.c index 7c98647..15017a0 100644 --- a/src/ac/ac_80211_json_updatewlan.c +++ b/src/ac/ac_80211_json_updatewlan.c @@ -17,11 +17,11 @@ static int ac_json_80211_updatewlan_addmessageelement(struct ac_json_ieee80211_w return 0; } - ops->free_message_element(item->updatewlan); + ops->free(item->updatewlan); } item->valid = 1; - item->updatewlan = (struct capwap_80211_updatewlan_element*)ops->clone_message_element(updatewlan); + item->updatewlan = (struct capwap_80211_updatewlan_element*)ops->clone(updatewlan); return 1; } @@ -35,7 +35,7 @@ static void ac_json_80211_updatewlan_createjson(struct json_object* jsonparent, struct ac_json_ieee80211_ops ac_json_80211_updatewlan_ops = { .type = CAPWAP_ELEMENT_80211_UPDATE_WLAN, .json_type = "IEEE80211UpdateWLAN", - .create_message_element = ac_json_80211_updatewlan_createmessageelement, + .create = ac_json_80211_updatewlan_createmessageelement, .add_message_element = ac_json_80211_updatewlan_addmessageelement, .create_json = ac_json_80211_updatewlan_createjson }; diff --git a/src/ac/ac_80211_json_wtpqos.c b/src/ac/ac_80211_json_wtpqos.c index 961bb66..a3b6fce 100644 --- a/src/ac/ac_80211_json_wtpqos.c +++ b/src/ac/ac_80211_json_wtpqos.c @@ -55,11 +55,11 @@ static int ac_json_80211_wtpqos_addmessageelement(struct ac_json_ieee80211_wtpra return 0; } - ops->free_message_element(item->wtpqos); + ops->free(item->wtpqos); } item->valid = 1; - item->wtpqos = (struct capwap_80211_wtpqos_element*)ops->clone_message_element(wtpqos); + item->wtpqos = (struct capwap_80211_wtpqos_element*)ops->clone(wtpqos); return 1; } @@ -73,7 +73,7 @@ static void ac_json_80211_wtpqos_createjson(struct json_object* jsonparent, void struct ac_json_ieee80211_ops ac_json_80211_wtpqos_ops = { .type = CAPWAP_ELEMENT_80211_WTP_QOS, .json_type = "IEEE80211WTPQoS", - .create_message_element = ac_json_80211_wtpqos_createmessageelement, + .create = ac_json_80211_wtpqos_createmessageelement, .add_message_element = ac_json_80211_wtpqos_addmessageelement, .create_json = ac_json_80211_wtpqos_createjson }; diff --git a/src/ac/ac_80211_json_wtpradioconf.c b/src/ac/ac_80211_json_wtpradioconf.c index f974910..8480166 100644 --- a/src/ac/ac_80211_json_wtpradioconf.c +++ b/src/ac/ac_80211_json_wtpradioconf.c @@ -93,11 +93,11 @@ static int ac_json_80211_wtpradioconf_addmessageelement(struct ac_json_ieee80211 return 0; } - ops->free_message_element(item->wtpradioconf); + ops->free(item->wtpradioconf); } item->valid = 1; - item->wtpradioconf = (struct capwap_80211_wtpradioconf_element*)ops->clone_message_element(wtpradioconf); + item->wtpradioconf = (struct capwap_80211_wtpradioconf_element*)ops->clone(wtpradioconf); return 1; } @@ -122,7 +122,7 @@ static void ac_json_80211_wtpradioconf_createjson(struct json_object* jsonparent struct ac_json_ieee80211_ops ac_json_80211_wtpradioconf_ops = { .type = CAPWAP_ELEMENT_80211_WTP_RADIO_CONF, .json_type = "IEEE80211WTPRadioConfiguration", - .create_message_element = ac_json_80211_wtpradioconf_createmessageelement, + .create = ac_json_80211_wtpradioconf_createmessageelement, .add_message_element = ac_json_80211_wtpradioconf_addmessageelement, .create_json = ac_json_80211_wtpradioconf_createjson }; diff --git a/src/ac/ac_80211_json_wtpradiofailalarm.c b/src/ac/ac_80211_json_wtpradiofailalarm.c index 3a42d6f..163536e 100644 --- a/src/ac/ac_80211_json_wtpradiofailalarm.c +++ b/src/ac/ac_80211_json_wtpradiofailalarm.c @@ -49,11 +49,11 @@ static int ac_json_80211_wtpradiofailalarm_addmessageelement(struct ac_json_ieee return 0; } - ops->free_message_element(item->wtpradiofailalarm); + ops->free(item->wtpradiofailalarm); } item->valid = 1; - item->wtpradiofailalarm = (struct capwap_80211_wtpradiofailalarm_element*)ops->clone_message_element(wtpradiofailalarm); + item->wtpradiofailalarm = (struct capwap_80211_wtpradiofailalarm_element*)ops->clone(wtpradiofailalarm); return 1; } @@ -73,7 +73,7 @@ static void ac_json_80211_wtpradiofailalarm_createjson(struct json_object* jsonp struct ac_json_ieee80211_ops ac_json_80211_wtpradiofailalarm_ops = { .type = CAPWAP_ELEMENT_80211_WTP_RADIO_FAIL_ALARM, .json_type = "IEEE80211WTPRadioFailAlarm", - .create_message_element = ac_json_80211_wtpradiofailalarm_createmessageelement, + .create = ac_json_80211_wtpradiofailalarm_createmessageelement, .add_message_element = ac_json_80211_wtpradiofailalarm_addmessageelement, .create_json = ac_json_80211_wtpradiofailalarm_createjson }; diff --git a/src/ac/ac_80211_json_wtpradioinformation.c b/src/ac/ac_80211_json_wtpradioinformation.c index 7fbe9e0..d3e019a 100644 --- a/src/ac/ac_80211_json_wtpradioinformation.c +++ b/src/ac/ac_80211_json_wtpradioinformation.c @@ -39,11 +39,11 @@ static int ac_json_80211_wtpradioinformation_addmessageelement(struct ac_json_ie return 0; } - ops->free_message_element(item->wtpradioinformation); + ops->free(item->wtpradioinformation); } item->valid = 1; - item->wtpradioinformation = (struct capwap_80211_wtpradioinformation_element*)ops->clone_message_element(wtpradioinformation); + item->wtpradioinformation = (struct capwap_80211_wtpradioinformation_element*)ops->clone(wtpradioinformation); return 1; } @@ -62,7 +62,7 @@ static void ac_json_80211_wtpradioinformation_createjson(struct json_object* jso struct ac_json_ieee80211_ops ac_json_80211_wtpradioinformation_ops = { .type = CAPWAP_ELEMENT_80211_WTPRADIOINFORMATION, .json_type = "IEEE80211WTPRadioInformation", - .create_message_element = ac_json_80211_wtpradioinformation_createmessageelement, + .create = ac_json_80211_wtpradioinformation_createmessageelement, .add_message_element = ac_json_80211_wtpradioinformation_addmessageelement, .create_json = ac_json_80211_wtpradioinformation_createjson }; diff --git a/src/ac/ac_json.h b/src/ac/ac_json.h index c037afe..6428aa7 100644 --- a/src/ac/ac_json.h +++ b/src/ac/ac_json.h @@ -67,7 +67,7 @@ struct ac_json_ieee80211_ops { char* json_type; /* Build message element */ - void* (*create_message_element)(struct json_object* jsonparent, uint16_t radioid); + void* (*create)(struct json_object* jsonparent, uint16_t radioid); int (*add_message_element)(struct ac_json_ieee80211_wtpradio* wtpradio, void* data, int overwrite); /* Build JSON */ diff --git a/src/common/capwap_element.c b/src/common/capwap_element.c index c8b1483..4f10fae 100644 --- a/src/common/capwap_element.c +++ b/src/common/capwap_element.c @@ -251,7 +251,7 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap messageelement = (struct capwap_message_element_itemlist*)itemlist->item; messageelement->type = type; messageelement->category = CAPWAP_MESSAGE_ELEMENT_SINGLE; - messageelement->data = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops); + messageelement->data = read_ops->parse((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops); if (!messageelement->data) { capwap_itemlist_free(itemlist); return INVALID_MESSAGE_ELEMENT; @@ -281,7 +281,7 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap } /* Get message element */ - datamsgelement = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops); + datamsgelement = read_ops->parse((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops); if (!datamsgelement) { return INVALID_MESSAGE_ELEMENT; } @@ -643,12 +643,12 @@ void capwap_free_parsed_packet(struct capwap_parsed_packet* packet) { msgops = capwap_get_message_element_ops(messageelement->type); if (messageelement->category == CAPWAP_MESSAGE_ELEMENT_SINGLE) { - msgops->free_message_element(messageelement->data); + msgops->free(messageelement->data); } else if (messageelement->category == CAPWAP_MESSAGE_ELEMENT_ARRAY) { struct capwap_array* arraymessageelement = (struct capwap_array*)messageelement->data; for (i = 0; i < arraymessageelement->count; i++) { - msgops->free_message_element(*(void**)capwap_array_get_item_pointer(arraymessageelement, i)); + msgops->free(*(void**)capwap_array_get_item_pointer(arraymessageelement, i)); } /* */ diff --git a/src/common/capwap_element.h b/src/common/capwap_element.h index c905b4d..4ff4f1f 100644 --- a/src/common/capwap_element.h +++ b/src/common/capwap_element.h @@ -23,14 +23,14 @@ struct capwap_read_message_elements_ops { struct capwap_message_elements_ops { /* Build message element */ - void (*create_message_element)(void* data, capwap_message_elements_handle handle, struct capwap_write_message_elements_ops* func); + void (*create)(void* data, capwap_message_elements_handle handle, struct capwap_write_message_elements_ops* func); /* Parsing message element */ - void* (*parsing_message_element)(capwap_message_elements_handle handle, struct capwap_read_message_elements_ops* func); + void* (*parse)(capwap_message_elements_handle handle, struct capwap_read_message_elements_ops* func); /* Memory management */ - void* (*clone_message_element)(void*); - void (*free_message_element)(void*); + void* (*clone)(void*); + void (*free)(void*); }; struct capwap_message_elements_ops* capwap_get_message_element_ops(unsigned short code); diff --git a/src/common/capwap_element_80211_addwlan.c b/src/common/capwap_element_80211_addwlan.c index 9e33703..2a540ff 100644 --- a/src/common/capwap_element_80211_addwlan.c +++ b/src/common/capwap_element_80211_addwlan.c @@ -154,8 +154,8 @@ static void* capwap_80211_addwlan_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_80211_addwlan_ops = { - .create_message_element = capwap_80211_addwlan_element_create, - .parsing_message_element = capwap_80211_addwlan_element_parsing, - .clone_message_element = capwap_80211_addwlan_element_clone, - .free_message_element = capwap_80211_addwlan_element_free + .create = capwap_80211_addwlan_element_create, + .parse = capwap_80211_addwlan_element_parsing, + .clone = capwap_80211_addwlan_element_clone, + .free = capwap_80211_addwlan_element_free }; diff --git a/src/common/capwap_element_80211_antenna.c b/src/common/capwap_element_80211_antenna.c index 2a3c398..f69ad15 100644 --- a/src/common/capwap_element_80211_antenna.c +++ b/src/common/capwap_element_80211_antenna.c @@ -143,8 +143,8 @@ void capwap_element_80211_antenna_copy(struct capwap_80211_antenna_element* dst, /* */ struct capwap_message_elements_ops capwap_element_80211_antenna_ops = { - .create_message_element = capwap_80211_antenna_element_create, - .parsing_message_element = capwap_80211_antenna_element_parsing, - .clone_message_element = capwap_80211_antenna_element_clone, - .free_message_element = capwap_80211_antenna_element_free + .create = capwap_80211_antenna_element_create, + .parse = capwap_80211_antenna_element_parsing, + .clone = capwap_80211_antenna_element_clone, + .free = capwap_80211_antenna_element_free }; diff --git a/src/common/capwap_element_80211_assignbssid.c b/src/common/capwap_element_80211_assignbssid.c index b5e8ebb..2924ee6 100644 --- a/src/common/capwap_element_80211_assignbssid.c +++ b/src/common/capwap_element_80211_assignbssid.c @@ -68,8 +68,8 @@ static void capwap_80211_assignbssid_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_assignbssid_ops = { - .create_message_element = capwap_80211_assignbssid_element_create, - .parsing_message_element = capwap_80211_assignbssid_element_parsing, - .clone_message_element = capwap_80211_assignbssid_element_clone, - .free_message_element = capwap_80211_assignbssid_element_free + .create = capwap_80211_assignbssid_element_create, + .parse = capwap_80211_assignbssid_element_parsing, + .clone = capwap_80211_assignbssid_element_clone, + .free = capwap_80211_assignbssid_element_free }; diff --git a/src/common/capwap_element_80211_deletewlan.c b/src/common/capwap_element_80211_deletewlan.c index 773c6a4..93a55b6 100644 --- a/src/common/capwap_element_80211_deletewlan.c +++ b/src/common/capwap_element_80211_deletewlan.c @@ -64,8 +64,8 @@ static void capwap_80211_deletewlan_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_deletewlan_ops = { - .create_message_element = capwap_80211_deletewlan_element_create, - .parsing_message_element = capwap_80211_deletewlan_element_parsing, - .clone_message_element = capwap_80211_deletewlan_element_clone, - .free_message_element = capwap_80211_deletewlan_element_free + .create = capwap_80211_deletewlan_element_create, + .parse = capwap_80211_deletewlan_element_parsing, + .clone = capwap_80211_deletewlan_element_clone, + .free = capwap_80211_deletewlan_element_free }; diff --git a/src/common/capwap_element_80211_directsequencecontrol.c b/src/common/capwap_element_80211_directsequencecontrol.c index 7914941..dc7f417 100644 --- a/src/common/capwap_element_80211_directsequencecontrol.c +++ b/src/common/capwap_element_80211_directsequencecontrol.c @@ -80,8 +80,8 @@ static void* capwap_80211_directsequencecontrol_element_parsing(capwap_message_e /* */ 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, - .clone_message_element = capwap_80211_directsequencecontrol_element_clone, - .free_message_element = capwap_80211_directsequencecontrol_element_free + .create = capwap_80211_directsequencecontrol_element_create, + .parse = capwap_80211_directsequencecontrol_element_parsing, + .clone = capwap_80211_directsequencecontrol_element_clone, + .free = capwap_80211_directsequencecontrol_element_free }; diff --git a/src/common/capwap_element_80211_ie.c b/src/common/capwap_element_80211_ie.c index 46859f3..d4fa806 100644 --- a/src/common/capwap_element_80211_ie.c +++ b/src/common/capwap_element_80211_ie.c @@ -84,8 +84,8 @@ static void capwap_80211_ie_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_ie_ops = { - .create_message_element = capwap_80211_ie_element_create, - .parsing_message_element = capwap_80211_ie_element_parsing, - .clone_message_element = capwap_80211_ie_element_clone, - .free_message_element = capwap_80211_ie_element_free + .create = capwap_80211_ie_element_create, + .parse = capwap_80211_ie_element_parsing, + .clone = capwap_80211_ie_element_clone, + .free = capwap_80211_ie_element_free }; diff --git a/src/common/capwap_element_80211_macoperation.c b/src/common/capwap_element_80211_macoperation.c index b7e9b1e..c36378b 100644 --- a/src/common/capwap_element_80211_macoperation.c +++ b/src/common/capwap_element_80211_macoperation.c @@ -83,8 +83,8 @@ static void capwap_80211_macoperation_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_macoperation_ops = { - .create_message_element = capwap_80211_macoperation_element_create, - .parsing_message_element = capwap_80211_macoperation_element_parsing, - .clone_message_element = capwap_80211_macoperation_element_clone, - .free_message_element = capwap_80211_macoperation_element_free + .create = capwap_80211_macoperation_element_create, + .parse = capwap_80211_macoperation_element_parsing, + .clone = capwap_80211_macoperation_element_clone, + .free = capwap_80211_macoperation_element_free }; diff --git a/src/common/capwap_element_80211_miccountermeasures.c b/src/common/capwap_element_80211_miccountermeasures.c index e0d9ad5..5ddf663 100644 --- a/src/common/capwap_element_80211_miccountermeasures.c +++ b/src/common/capwap_element_80211_miccountermeasures.c @@ -68,8 +68,8 @@ static void capwap_80211_miccountermeasures_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_miccountermeasures_ops = { - .create_message_element = capwap_80211_miccountermeasures_element_create, - .parsing_message_element = capwap_80211_miccountermeasures_element_parsing, - .clone_message_element = capwap_80211_miccountermeasures_element_clone, - .free_message_element = capwap_80211_miccountermeasures_element_free + .create = capwap_80211_miccountermeasures_element_create, + .parse = capwap_80211_miccountermeasures_element_parsing, + .clone = capwap_80211_miccountermeasures_element_clone, + .free = capwap_80211_miccountermeasures_element_free }; diff --git a/src/common/capwap_element_80211_multidomaincapability.c b/src/common/capwap_element_80211_multidomaincapability.c index 55dc3e8..75b96ee 100644 --- a/src/common/capwap_element_80211_multidomaincapability.c +++ b/src/common/capwap_element_80211_multidomaincapability.c @@ -73,8 +73,8 @@ static void capwap_80211_multidomaincapability_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_multidomaincapability_ops = { - .create_message_element = capwap_80211_multidomaincapability_element_create, - .parsing_message_element = capwap_80211_multidomaincapability_element_parsing, - .clone_message_element = capwap_80211_multidomaincapability_element_clone, - .free_message_element = capwap_80211_multidomaincapability_element_free + .create = capwap_80211_multidomaincapability_element_create, + .parse = capwap_80211_multidomaincapability_element_parsing, + .clone = capwap_80211_multidomaincapability_element_clone, + .free = capwap_80211_multidomaincapability_element_free }; diff --git a/src/common/capwap_element_80211_ofdmcontrol.c b/src/common/capwap_element_80211_ofdmcontrol.c index b42f897..9643504 100644 --- a/src/common/capwap_element_80211_ofdmcontrol.c +++ b/src/common/capwap_element_80211_ofdmcontrol.c @@ -73,8 +73,8 @@ static void capwap_80211_ofdmcontrol_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_ofdmcontrol_ops = { - .create_message_element = capwap_80211_ofdmcontrol_element_create, - .parsing_message_element = capwap_80211_ofdmcontrol_element_parsing, - .clone_message_element = capwap_80211_ofdmcontrol_element_clone, - .free_message_element = capwap_80211_ofdmcontrol_element_free + .create = capwap_80211_ofdmcontrol_element_create, + .parse = capwap_80211_ofdmcontrol_element_parsing, + .clone = capwap_80211_ofdmcontrol_element_clone, + .free = capwap_80211_ofdmcontrol_element_free }; diff --git a/src/common/capwap_element_80211_rateset.c b/src/common/capwap_element_80211_rateset.c index af4ee0e..a0c239b 100644 --- a/src/common/capwap_element_80211_rateset.c +++ b/src/common/capwap_element_80211_rateset.c @@ -73,8 +73,8 @@ static void capwap_80211_rateset_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_rateset_ops = { - .create_message_element = capwap_80211_rateset_element_create, - .parsing_message_element = capwap_80211_rateset_element_parsing, - .clone_message_element = capwap_80211_rateset_element_clone, - .free_message_element = capwap_80211_rateset_element_free + .create = capwap_80211_rateset_element_create, + .parse = capwap_80211_rateset_element_parsing, + .clone = capwap_80211_rateset_element_clone, + .free = capwap_80211_rateset_element_free }; diff --git a/src/common/capwap_element_80211_rsnaerrorreport.c b/src/common/capwap_element_80211_rsnaerrorreport.c index 28fb860..c6c3b73 100644 --- a/src/common/capwap_element_80211_rsnaerrorreport.c +++ b/src/common/capwap_element_80211_rsnaerrorreport.c @@ -101,8 +101,8 @@ static void capwap_80211_rsnaerrorreport_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_rsnaerrorreport_ops = { - .create_message_element = capwap_80211_rsnaerrorreport_element_create, - .parsing_message_element = capwap_80211_rsnaerrorreport_element_parsing, - .clone_message_element = capwap_80211_rsnaerrorreport_element_clone, - .free_message_element = capwap_80211_rsnaerrorreport_element_free + .create = capwap_80211_rsnaerrorreport_element_create, + .parse = capwap_80211_rsnaerrorreport_element_parsing, + .clone = capwap_80211_rsnaerrorreport_element_clone, + .free = capwap_80211_rsnaerrorreport_element_free }; diff --git a/src/common/capwap_element_80211_station.c b/src/common/capwap_element_80211_station.c index 5c60f38..c180804 100644 --- a/src/common/capwap_element_80211_station.c +++ b/src/common/capwap_element_80211_station.c @@ -89,8 +89,8 @@ static void capwap_80211_station_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_station_ops = { - .create_message_element = capwap_80211_station_element_create, - .parsing_message_element = capwap_80211_station_element_parsing, - .clone_message_element = capwap_80211_station_element_clone, - .free_message_element = capwap_80211_station_element_free + .create = capwap_80211_station_element_create, + .parse = capwap_80211_station_element_parsing, + .clone = capwap_80211_station_element_clone, + .free = capwap_80211_station_element_free }; diff --git a/src/common/capwap_element_80211_stationkey.c b/src/common/capwap_element_80211_stationkey.c index 66309e1..7d51326 100644 --- a/src/common/capwap_element_80211_stationkey.c +++ b/src/common/capwap_element_80211_stationkey.c @@ -97,8 +97,8 @@ static void capwap_80211_stationkey_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_stationkey_ops = { - .create_message_element = capwap_80211_stationkey_element_create, - .parsing_message_element = capwap_80211_stationkey_element_parsing, - .clone_message_element = capwap_80211_stationkey_element_clone, - .free_message_element = capwap_80211_stationkey_element_free + .create = capwap_80211_stationkey_element_create, + .parse = capwap_80211_stationkey_element_parsing, + .clone = capwap_80211_stationkey_element_clone, + .free = capwap_80211_stationkey_element_free }; diff --git a/src/common/capwap_element_80211_stationqos.c b/src/common/capwap_element_80211_stationqos.c index 72e0031..03bf876 100644 --- a/src/common/capwap_element_80211_stationqos.c +++ b/src/common/capwap_element_80211_stationqos.c @@ -68,8 +68,8 @@ static void capwap_80211_stationqos_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_stationqos_ops = { - .create_message_element = capwap_80211_stationqos_element_create, - .parsing_message_element = capwap_80211_stationqos_element_parsing, - .clone_message_element = capwap_80211_stationqos_element_clone, - .free_message_element = capwap_80211_stationqos_element_free + .create = capwap_80211_stationqos_element_create, + .parse = capwap_80211_stationqos_element_parsing, + .clone = capwap_80211_stationqos_element_clone, + .free = capwap_80211_stationqos_element_free }; diff --git a/src/common/capwap_element_80211_statistics.c b/src/common/capwap_element_80211_statistics.c index 0080740..740bb12 100644 --- a/src/common/capwap_element_80211_statistics.c +++ b/src/common/capwap_element_80211_statistics.c @@ -141,8 +141,8 @@ static void capwap_80211_statistics_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_statistics_ops = { - .create_message_element = capwap_80211_statistics_element_create, - .parsing_message_element = capwap_80211_statistics_element_parsing, - .clone_message_element = capwap_80211_statistics_element_clone, - .free_message_element = capwap_80211_statistics_element_free + .create = capwap_80211_statistics_element_create, + .parse = capwap_80211_statistics_element_parsing, + .clone = capwap_80211_statistics_element_clone, + .free = capwap_80211_statistics_element_free }; diff --git a/src/common/capwap_element_80211_supportedrates.c b/src/common/capwap_element_80211_supportedrates.c index fe6a7ad..d15835d 100644 --- a/src/common/capwap_element_80211_supportedrates.c +++ b/src/common/capwap_element_80211_supportedrates.c @@ -73,8 +73,8 @@ static void capwap_80211_supportedrates_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_supportedrates_ops = { - .create_message_element = capwap_80211_supportedrates_element_create, - .parsing_message_element = capwap_80211_supportedrates_element_parsing, - .clone_message_element = capwap_80211_supportedrates_element_clone, - .free_message_element = capwap_80211_supportedrates_element_free + .create = capwap_80211_supportedrates_element_create, + .parse = capwap_80211_supportedrates_element_parsing, + .clone = capwap_80211_supportedrates_element_clone, + .free = capwap_80211_supportedrates_element_free }; diff --git a/src/common/capwap_element_80211_txpower.c b/src/common/capwap_element_80211_txpower.c index eba2edb..6eea5df 100644 --- a/src/common/capwap_element_80211_txpower.c +++ b/src/common/capwap_element_80211_txpower.c @@ -67,8 +67,8 @@ static void capwap_80211_txpower_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_txpower_ops = { - .create_message_element = capwap_80211_txpower_element_create, - .parsing_message_element = capwap_80211_txpower_element_parsing, - .clone_message_element = capwap_80211_txpower_element_clone, - .free_message_element = capwap_80211_txpower_element_free + .create = capwap_80211_txpower_element_create, + .parse = capwap_80211_txpower_element_parsing, + .clone = capwap_80211_txpower_element_clone, + .free = capwap_80211_txpower_element_free }; diff --git a/src/common/capwap_element_80211_txpowerlevel.c b/src/common/capwap_element_80211_txpowerlevel.c index e648c42..99044bd 100644 --- a/src/common/capwap_element_80211_txpowerlevel.c +++ b/src/common/capwap_element_80211_txpowerlevel.c @@ -88,8 +88,8 @@ static void capwap_80211_txpowerlevel_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_txpowerlevel_ops = { - .create_message_element = capwap_80211_txpowerlevel_element_create, - .parsing_message_element = capwap_80211_txpowerlevel_element_parsing, - .clone_message_element = capwap_80211_txpowerlevel_element_clone, - .free_message_element = capwap_80211_txpowerlevel_element_free + .create = capwap_80211_txpowerlevel_element_create, + .parse = capwap_80211_txpowerlevel_element_parsing, + .clone = capwap_80211_txpowerlevel_element_clone, + .free = capwap_80211_txpowerlevel_element_free }; diff --git a/src/common/capwap_element_80211_updatestationqos.c b/src/common/capwap_element_80211_updatestationqos.c index 43dce70..fbf253e 100644 --- a/src/common/capwap_element_80211_updatestationqos.c +++ b/src/common/capwap_element_80211_updatestationqos.c @@ -84,8 +84,8 @@ static void capwap_80211_updatestationqos_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_updatestationqos_ops = { - .create_message_element = capwap_80211_updatestationqos_element_create, - .parsing_message_element = capwap_80211_updatestationqos_element_parsing, - .clone_message_element = capwap_80211_updatestationqos_element_clone, - .free_message_element = capwap_80211_updatestationqos_element_free + .create = capwap_80211_updatestationqos_element_create, + .parse = capwap_80211_updatestationqos_element_parsing, + .clone = capwap_80211_updatestationqos_element_clone, + .free = capwap_80211_updatestationqos_element_free }; diff --git a/src/common/capwap_element_80211_updatewlan.c b/src/common/capwap_element_80211_updatewlan.c index 425ac00..54ed527 100644 --- a/src/common/capwap_element_80211_updatewlan.c +++ b/src/common/capwap_element_80211_updatewlan.c @@ -105,8 +105,8 @@ static void* capwap_80211_updatewlan_element_parsing(capwap_message_elements_han /* */ struct capwap_message_elements_ops capwap_element_80211_updatewlan_ops = { - .create_message_element = capwap_80211_updatewlan_element_create, - .parsing_message_element = capwap_80211_updatewlan_element_parsing, - .clone_message_element = capwap_80211_updatewlan_element_clone, - .free_message_element = capwap_80211_updatewlan_element_free + .create = capwap_80211_updatewlan_element_create, + .parse = capwap_80211_updatewlan_element_parsing, + .clone = capwap_80211_updatewlan_element_clone, + .free = capwap_80211_updatewlan_element_free }; diff --git a/src/common/capwap_element_80211_wtpqos.c b/src/common/capwap_element_80211_wtpqos.c index 53a8bde..47b302e 100644 --- a/src/common/capwap_element_80211_wtpqos.c +++ b/src/common/capwap_element_80211_wtpqos.c @@ -92,8 +92,8 @@ static void capwap_80211_wtpqos_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_wtpqos_ops = { - .create_message_element = capwap_80211_wtpqos_element_create, - .parsing_message_element = capwap_80211_wtpqos_element_parsing, - .clone_message_element = capwap_80211_wtpqos_element_clone, - .free_message_element = capwap_80211_wtpqos_element_free + .create = capwap_80211_wtpqos_element_create, + .parse = capwap_80211_wtpqos_element_parsing, + .clone = capwap_80211_wtpqos_element_clone, + .free = capwap_80211_wtpqos_element_free }; diff --git a/src/common/capwap_element_80211_wtpradioconf.c b/src/common/capwap_element_80211_wtpradioconf.c index f608603..b92a021 100644 --- a/src/common/capwap_element_80211_wtpradioconf.c +++ b/src/common/capwap_element_80211_wtpradioconf.c @@ -80,8 +80,8 @@ static void capwap_80211_wtpradioconf_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_wtpradioconf_ops = { - .create_message_element = capwap_80211_wtpradioconf_element_create, - .parsing_message_element = capwap_80211_wtpradioconf_element_parsing, - .clone_message_element = capwap_80211_wtpradioconf_element_clone, - .free_message_element = capwap_80211_wtpradioconf_element_free + .create = capwap_80211_wtpradioconf_element_create, + .parse = capwap_80211_wtpradioconf_element_parsing, + .clone = capwap_80211_wtpradioconf_element_clone, + .free = capwap_80211_wtpradioconf_element_free }; diff --git a/src/common/capwap_element_80211_wtpradiofailalarm.c b/src/common/capwap_element_80211_wtpradiofailalarm.c index 639a185..f5d25af 100644 --- a/src/common/capwap_element_80211_wtpradiofailalarm.c +++ b/src/common/capwap_element_80211_wtpradiofailalarm.c @@ -68,8 +68,8 @@ static void capwap_80211_wtpradiofailalarm_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_wtpradiofailalarm_ops = { - .create_message_element = capwap_80211_wtpradiofailalarm_element_create, - .parsing_message_element = capwap_80211_wtpradiofailalarm_element_parsing, - .clone_message_element = capwap_80211_wtpradiofailalarm_element_clone, - .free_message_element = capwap_80211_wtpradiofailalarm_element_free + .create = capwap_80211_wtpradiofailalarm_element_create, + .parse = capwap_80211_wtpradiofailalarm_element_parsing, + .clone = capwap_80211_wtpradiofailalarm_element_clone, + .free = capwap_80211_wtpradiofailalarm_element_free }; diff --git a/src/common/capwap_element_80211_wtpradioinformation.c b/src/common/capwap_element_80211_wtpradioinformation.c index d7528fe..88f4f26 100644 --- a/src/common/capwap_element_80211_wtpradioinformation.c +++ b/src/common/capwap_element_80211_wtpradioinformation.c @@ -67,8 +67,8 @@ static void capwap_80211_wtpradioinformation_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_80211_wtpradioinformation_ops = { - .create_message_element = capwap_80211_wtpradioinformation_element_create, - .parsing_message_element = capwap_80211_wtpradioinformation_element_parsing, - .clone_message_element = capwap_80211_wtpradioinformation_element_clone, - .free_message_element = capwap_80211_wtpradioinformation_element_free + .create = capwap_80211_wtpradioinformation_element_create, + .parse = capwap_80211_wtpradioinformation_element_parsing, + .clone = capwap_80211_wtpradioinformation_element_clone, + .free = capwap_80211_wtpradioinformation_element_free }; diff --git a/src/common/capwap_element_80211n_radioconf.c b/src/common/capwap_element_80211n_radioconf.c index b7bda07..2d33b81 100644 --- a/src/common/capwap_element_80211n_radioconf.c +++ b/src/common/capwap_element_80211n_radioconf.c @@ -85,8 +85,8 @@ capwap_80211n_radioconf_element_free(void* data) /* */ struct capwap_message_elements_ops capwap_element_80211n_radioconf_ops = { - .create_message_element = capwap_80211n_radioconf_element_create, - .parsing_message_element = capwap_80211n_radioconf_element_parsing, - .clone_message_element = capwap_80211n_radioconf_element_clone, - .free_message_element = capwap_80211n_radioconf_element_free + .create = capwap_80211n_radioconf_element_create, + .parse = capwap_80211n_radioconf_element_parsing, + .clone = capwap_80211n_radioconf_element_clone, + .free = capwap_80211n_radioconf_element_free }; diff --git a/src/common/capwap_element_80211n_station_information.c b/src/common/capwap_element_80211n_station_information.c index 02007bb..712f7cd 100644 --- a/src/common/capwap_element_80211n_station_information.c +++ b/src/common/capwap_element_80211n_station_information.c @@ -95,8 +95,8 @@ capwap_80211n_station_info_element_free(void* data) /* */ struct capwap_message_elements_ops capwap_element_80211n_station_info_ops = { - .create_message_element = capwap_80211n_station_info_element_create, - .parsing_message_element = capwap_80211n_station_info_element_parsing, - .clone_message_element = capwap_80211n_station_info_element_clone, - .free_message_element = capwap_80211n_station_info_element_free + .create = capwap_80211n_station_info_element_create, + .parse = capwap_80211n_station_info_element_parsing, + .clone = capwap_80211n_station_info_element_clone, + .free = capwap_80211n_station_info_element_free }; diff --git a/src/common/capwap_element_acdescriptor.c b/src/common/capwap_element_acdescriptor.c index 8cb4df2..3e89c2f 100644 --- a/src/common/capwap_element_acdescriptor.c +++ b/src/common/capwap_element_acdescriptor.c @@ -199,8 +199,8 @@ static void* capwap_acdescriptor_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_acdescriptor_ops = { - .create_message_element = capwap_acdescriptor_element_create, - .parsing_message_element = capwap_acdescriptor_element_parsing, - .clone_message_element = capwap_acdescriptor_element_clone, - .free_message_element = capwap_acdescriptor_element_free + .create = capwap_acdescriptor_element_create, + .parse = capwap_acdescriptor_element_parsing, + .clone = capwap_acdescriptor_element_clone, + .free = capwap_acdescriptor_element_free }; diff --git a/src/common/capwap_element_acipv4list.c b/src/common/capwap_element_acipv4list.c index 373f68b..aaf693b 100644 --- a/src/common/capwap_element_acipv4list.c +++ b/src/common/capwap_element_acipv4list.c @@ -83,8 +83,8 @@ static void capwap_acipv4list_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_acipv4list_ops = { - .create_message_element = capwap_acipv4list_element_create, - .parsing_message_element = capwap_acipv4list_element_parsing, - .clone_message_element = capwap_acipv4list_element_clone, - .free_message_element = capwap_acipv4list_element_free + .create = capwap_acipv4list_element_create, + .parse = capwap_acipv4list_element_parsing, + .clone = capwap_acipv4list_element_clone, + .free = capwap_acipv4list_element_free }; diff --git a/src/common/capwap_element_acipv6list.c b/src/common/capwap_element_acipv6list.c index 01229ac..8fc2696 100644 --- a/src/common/capwap_element_acipv6list.c +++ b/src/common/capwap_element_acipv6list.c @@ -89,8 +89,8 @@ static void capwap_acipv6list_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_acipv6list_ops = { - .create_message_element = capwap_acipv6list_element_create, - .parsing_message_element = capwap_acipv6list_element_parsing, - .clone_message_element = capwap_acipv6list_element_clone, - .free_message_element = capwap_acipv6list_element_free + .create = capwap_acipv6list_element_create, + .parse = capwap_acipv6list_element_parsing, + .clone = capwap_acipv6list_element_clone, + .free = capwap_acipv6list_element_free }; diff --git a/src/common/capwap_element_acname.c b/src/common/capwap_element_acname.c index 10ffe71..6c62d94 100644 --- a/src/common/capwap_element_acname.c +++ b/src/common/capwap_element_acname.c @@ -77,8 +77,8 @@ static void capwap_acname_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_acname_ops = { - .create_message_element = capwap_acname_element_create, - .parsing_message_element = capwap_acname_element_parsing, - .clone_message_element = capwap_acname_element_clone, - .free_message_element = capwap_acname_element_free + .create = capwap_acname_element_create, + .parse = capwap_acname_element_parsing, + .clone = capwap_acname_element_clone, + .free = capwap_acname_element_free }; diff --git a/src/common/capwap_element_acnamepriority.c b/src/common/capwap_element_acnamepriority.c index 25561d0..8e3ae06 100644 --- a/src/common/capwap_element_acnamepriority.c +++ b/src/common/capwap_element_acnamepriority.c @@ -78,8 +78,8 @@ static void capwap_acnamepriority_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_acnamepriority_ops = { - .create_message_element = capwap_acnamepriority_element_create, - .parsing_message_element = capwap_acnamepriority_element_parsing, - .clone_message_element = capwap_acnamepriority_element_clone, - .free_message_element = capwap_acnamepriority_element_free + .create = capwap_acnamepriority_element_create, + .parse = capwap_acnamepriority_element_parsing, + .clone = capwap_acnamepriority_element_clone, + .free = capwap_acnamepriority_element_free }; diff --git a/src/common/capwap_element_actimestamp.c b/src/common/capwap_element_actimestamp.c index 1176f15..bf3efe0 100644 --- a/src/common/capwap_element_actimestamp.c +++ b/src/common/capwap_element_actimestamp.c @@ -60,8 +60,8 @@ static void capwap_actimestamp_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_actimestamp_ops = { - .create_message_element = capwap_actimestamp_element_create, - .parsing_message_element = capwap_actimestamp_element_parsing, - .clone_message_element = capwap_actimestamp_element_clone, - .free_message_element = capwap_actimestamp_element_free + .create = capwap_actimestamp_element_create, + .parse = capwap_actimestamp_element_parsing, + .clone = capwap_actimestamp_element_clone, + .free = capwap_actimestamp_element_free }; diff --git a/src/common/capwap_element_addmacacl.c b/src/common/capwap_element_addmacacl.c index 8cbc328..2e2feaf 100644 --- a/src/common/capwap_element_addmacacl.c +++ b/src/common/capwap_element_addmacacl.c @@ -103,8 +103,8 @@ static void* capwap_addmacacl_element_parsing(capwap_message_elements_handle han /* */ struct capwap_message_elements_ops capwap_element_addmacacl_ops = { - .create_message_element = capwap_addmacacl_element_create, - .parsing_message_element = capwap_addmacacl_element_parsing, - .clone_message_element = capwap_addmacacl_element_clone, - .free_message_element = capwap_addmacacl_element_free + .create = capwap_addmacacl_element_create, + .parse = capwap_addmacacl_element_parsing, + .clone = capwap_addmacacl_element_clone, + .free = capwap_addmacacl_element_free }; diff --git a/src/common/capwap_element_addstation.c b/src/common/capwap_element_addstation.c index c77dfc7..92d3ffe 100644 --- a/src/common/capwap_element_addstation.c +++ b/src/common/capwap_element_addstation.c @@ -127,8 +127,8 @@ static void* capwap_addstation_element_parsing(capwap_message_elements_handle ha /* */ struct capwap_message_elements_ops capwap_element_addstation_ops = { - .create_message_element = capwap_addstation_element_create, - .parsing_message_element = capwap_addstation_element_parsing, - .clone_message_element = capwap_addstation_element_clone, - .free_message_element = capwap_addstation_element_free + .create = capwap_addstation_element_create, + .parse = capwap_addstation_element_parsing, + .clone = capwap_addstation_element_clone, + .free = capwap_addstation_element_free }; diff --git a/src/common/capwap_element_controlipv4.c b/src/common/capwap_element_controlipv4.c index 715f4c7..a00abd6 100644 --- a/src/common/capwap_element_controlipv4.c +++ b/src/common/capwap_element_controlipv4.c @@ -64,8 +64,8 @@ static void capwap_controlipv4_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_controlipv4_ops = { - .create_message_element = capwap_controlipv4_element_create, - .parsing_message_element = capwap_controlipv4_element_parsing, - .clone_message_element = capwap_controlipv4_element_clone, - .free_message_element = capwap_controlipv4_element_free + .create = capwap_controlipv4_element_create, + .parse = capwap_controlipv4_element_parsing, + .clone = capwap_controlipv4_element_clone, + .free = capwap_controlipv4_element_free }; diff --git a/src/common/capwap_element_controlipv6.c b/src/common/capwap_element_controlipv6.c index 64fd2db..31c59ce 100644 --- a/src/common/capwap_element_controlipv6.c +++ b/src/common/capwap_element_controlipv6.c @@ -70,8 +70,8 @@ static void capwap_controlipv6_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_controlipv6_ops = { - .create_message_element = capwap_controlipv6_element_create, - .parsing_message_element = capwap_controlipv6_element_parsing, - .clone_message_element = capwap_controlipv6_element_clone, - .free_message_element = capwap_controlipv6_element_free + .create = capwap_controlipv6_element_create, + .parse = capwap_controlipv6_element_parsing, + .clone = capwap_controlipv6_element_clone, + .free = capwap_controlipv6_element_free }; diff --git a/src/common/capwap_element_datatransferdata.c b/src/common/capwap_element_datatransferdata.c index 50a345a..337fb60 100644 --- a/src/common/capwap_element_datatransferdata.c +++ b/src/common/capwap_element_datatransferdata.c @@ -106,8 +106,8 @@ static void* capwap_datatransferdata_element_parsing(capwap_message_elements_han /* */ struct capwap_message_elements_ops capwap_element_datatransferdata_ops = { - .create_message_element = capwap_datatransferdata_element_create, - .parsing_message_element = capwap_datatransferdata_element_parsing, - .clone_message_element = capwap_datatransferdata_element_clone, - .free_message_element = capwap_datatransferdata_element_free + .create = capwap_datatransferdata_element_create, + .parse = capwap_datatransferdata_element_parsing, + .clone = capwap_datatransferdata_element_clone, + .free = capwap_datatransferdata_element_free }; diff --git a/src/common/capwap_element_datatransfermode.c b/src/common/capwap_element_datatransfermode.c index 439ea2d..e187743 100644 --- a/src/common/capwap_element_datatransfermode.c +++ b/src/common/capwap_element_datatransfermode.c @@ -66,8 +66,8 @@ static void* capwap_datatransfermode_element_parsing(capwap_message_elements_han /* */ struct capwap_message_elements_ops capwap_element_datatransfermode_ops = { - .create_message_element = capwap_datatransfermode_element_create, - .parsing_message_element = capwap_datatransfermode_element_parsing, - .clone_message_element = capwap_datatransfermode_element_clone, - .free_message_element = capwap_datatransfermode_element_free + .create = capwap_datatransfermode_element_create, + .parse = capwap_datatransfermode_element_parsing, + .clone = capwap_datatransfermode_element_clone, + .free = capwap_datatransfermode_element_free }; diff --git a/src/common/capwap_element_decrypterrorreport.c b/src/common/capwap_element_decrypterrorreport.c index d84b6eb..8054413 100644 --- a/src/common/capwap_element_decrypterrorreport.c +++ b/src/common/capwap_element_decrypterrorreport.c @@ -110,8 +110,8 @@ static void* capwap_decrypterrorreport_element_parsing(capwap_message_elements_h /* */ struct capwap_message_elements_ops capwap_element_decrypterrorreport_ops = { - .create_message_element = capwap_decrypterrorreport_element_create, - .parsing_message_element = capwap_decrypterrorreport_element_parsing, - .clone_message_element = capwap_decrypterrorreport_element_clone, - .free_message_element = capwap_decrypterrorreport_element_free + .create = capwap_decrypterrorreport_element_create, + .parse = capwap_decrypterrorreport_element_parsing, + .clone = capwap_decrypterrorreport_element_clone, + .free = capwap_decrypterrorreport_element_free }; diff --git a/src/common/capwap_element_decrypterrorreportperiod.c b/src/common/capwap_element_decrypterrorreportperiod.c index f7fff7e..7dc044c 100644 --- a/src/common/capwap_element_decrypterrorreportperiod.c +++ b/src/common/capwap_element_decrypterrorreportperiod.c @@ -69,8 +69,8 @@ static void* capwap_decrypterrorreportperiod_element_parsing(capwap_message_elem /* */ struct capwap_message_elements_ops capwap_element_decrypterrorreportperiod_ops = { - .create_message_element = capwap_decrypterrorreportperiod_element_create, - .parsing_message_element = capwap_decrypterrorreportperiod_element_parsing, - .clone_message_element = capwap_decrypterrorreportperiod_element_clone, - .free_message_element = capwap_decrypterrorreportperiod_element_free + .create = capwap_decrypterrorreportperiod_element_create, + .parse = capwap_decrypterrorreportperiod_element_parsing, + .clone = capwap_decrypterrorreportperiod_element_clone, + .free = capwap_decrypterrorreportperiod_element_free }; diff --git a/src/common/capwap_element_deletemacacl.c b/src/common/capwap_element_deletemacacl.c index 1c1a76a..f62649d 100644 --- a/src/common/capwap_element_deletemacacl.c +++ b/src/common/capwap_element_deletemacacl.c @@ -103,8 +103,8 @@ static void* capwap_deletemacacl_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_deletemacacl_ops = { - .create_message_element = capwap_deletemacacl_element_create, - .parsing_message_element = capwap_deletemacacl_element_parsing, - .clone_message_element = capwap_deletemacacl_element_clone, - .free_message_element = capwap_deletemacacl_element_free + .create = capwap_deletemacacl_element_create, + .parse = capwap_deletemacacl_element_parsing, + .clone = capwap_deletemacacl_element_clone, + .free = capwap_deletemacacl_element_free }; diff --git a/src/common/capwap_element_deletestation.c b/src/common/capwap_element_deletestation.c index 518fbe6..928318f 100644 --- a/src/common/capwap_element_deletestation.c +++ b/src/common/capwap_element_deletestation.c @@ -97,8 +97,8 @@ static void* capwap_deletestation_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_deletestation_ops = { - .create_message_element = capwap_deletestation_element_create, - .parsing_message_element = capwap_deletestation_element_parsing, - .clone_message_element = capwap_deletestation_element_clone, - .free_message_element = capwap_deletestation_element_free + .create = capwap_deletestation_element_create, + .parse = capwap_deletestation_element_parsing, + .clone = capwap_deletestation_element_clone, + .free = capwap_deletestation_element_free }; diff --git a/src/common/capwap_element_discoverytype.c b/src/common/capwap_element_discoverytype.c index 2e947f4..f2b032b 100644 --- a/src/common/capwap_element_discoverytype.c +++ b/src/common/capwap_element_discoverytype.c @@ -70,8 +70,8 @@ static void* capwap_discoverytype_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_discoverytype_ops = { - .create_message_element = capwap_discoverytype_element_create, - .parsing_message_element = capwap_discoverytype_element_parsing, - .clone_message_element = capwap_discoverytype_element_clone, - .free_message_element = capwap_discoverytype_element_free + .create = capwap_discoverytype_element_create, + .parse = capwap_discoverytype_element_parsing, + .clone = capwap_discoverytype_element_clone, + .free = capwap_discoverytype_element_free }; diff --git a/src/common/capwap_element_duplicateipv4.c b/src/common/capwap_element_duplicateipv4.c index 2561acd..802afdd 100644 --- a/src/common/capwap_element_duplicateipv4.c +++ b/src/common/capwap_element_duplicateipv4.c @@ -101,8 +101,8 @@ static void* capwap_duplicateipv4_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_duplicateipv4_ops = { - .create_message_element = capwap_duplicateipv4_element_create, - .parsing_message_element = capwap_duplicateipv4_element_parsing, - .clone_message_element = capwap_duplicateipv4_element_clone, - .free_message_element = capwap_duplicateipv4_element_free + .create = capwap_duplicateipv4_element_create, + .parse = capwap_duplicateipv4_element_parsing, + .clone = capwap_duplicateipv4_element_clone, + .free = capwap_duplicateipv4_element_free }; diff --git a/src/common/capwap_element_duplicateipv6.c b/src/common/capwap_element_duplicateipv6.c index 8a80ff8..d062a7c 100644 --- a/src/common/capwap_element_duplicateipv6.c +++ b/src/common/capwap_element_duplicateipv6.c @@ -107,8 +107,8 @@ static void* capwap_duplicateipv6_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_duplicateipv6_ops = { - .create_message_element = capwap_duplicateipv6_element_create, - .parsing_message_element = capwap_duplicateipv6_element_parsing, - .clone_message_element = capwap_duplicateipv6_element_clone, - .free_message_element = capwap_duplicateipv6_element_free + .create = capwap_duplicateipv6_element_create, + .parse = capwap_duplicateipv6_element_parsing, + .clone = capwap_duplicateipv6_element_clone, + .free = capwap_duplicateipv6_element_free }; diff --git a/src/common/capwap_element_ecnsupport.c b/src/common/capwap_element_ecnsupport.c index 9a390af..9d0605d 100644 --- a/src/common/capwap_element_ecnsupport.c +++ b/src/common/capwap_element_ecnsupport.c @@ -67,8 +67,8 @@ static void* capwap_ecnsupport_element_parsing(capwap_message_elements_handle ha /* */ struct capwap_message_elements_ops capwap_element_ecnsupport_ops = { - .create_message_element = capwap_ecnsupport_element_create, - .parsing_message_element = capwap_ecnsupport_element_parsing, - .clone_message_element = capwap_ecnsupport_element_clone, - .free_message_element = capwap_ecnsupport_element_free + .create = capwap_ecnsupport_element_create, + .parse = capwap_ecnsupport_element_parsing, + .clone = capwap_ecnsupport_element_clone, + .free = capwap_ecnsupport_element_free }; diff --git a/src/common/capwap_element_idletimeout.c b/src/common/capwap_element_idletimeout.c index 7000723..3076183 100644 --- a/src/common/capwap_element_idletimeout.c +++ b/src/common/capwap_element_idletimeout.c @@ -59,8 +59,8 @@ static void capwap_idletimeout_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_idletimeout_ops = { - .create_message_element = capwap_idletimeout_element_create, - .parsing_message_element = capwap_idletimeout_element_parsing, - .clone_message_element = capwap_idletimeout_element_clone, - .free_message_element = capwap_idletimeout_element_free + .create = capwap_idletimeout_element_create, + .parse = capwap_idletimeout_element_parsing, + .clone = capwap_idletimeout_element_clone, + .free = capwap_idletimeout_element_free }; diff --git a/src/common/capwap_element_imagedata.c b/src/common/capwap_element_imagedata.c index 471ef5a..a99bb78 100644 --- a/src/common/capwap_element_imagedata.c +++ b/src/common/capwap_element_imagedata.c @@ -105,8 +105,8 @@ static void* capwap_imagedata_element_parsing(capwap_message_elements_handle han /* */ struct capwap_message_elements_ops capwap_element_imagedata_ops = { - .create_message_element = capwap_imagedata_element_create, - .parsing_message_element = capwap_imagedata_element_parsing, - .clone_message_element = capwap_imagedata_element_clone, - .free_message_element = capwap_imagedata_element_free + .create = capwap_imagedata_element_create, + .parse = capwap_imagedata_element_parsing, + .clone = capwap_imagedata_element_clone, + .free = capwap_imagedata_element_free }; diff --git a/src/common/capwap_element_imageidentifier.c b/src/common/capwap_element_imageidentifier.c index 99e7bb2..73052ab 100644 --- a/src/common/capwap_element_imageidentifier.c +++ b/src/common/capwap_element_imageidentifier.c @@ -88,8 +88,8 @@ static void* capwap_imageidentifier_element_parsing(capwap_message_elements_hand /* */ struct capwap_message_elements_ops capwap_element_imageidentifier_ops = { - .create_message_element = capwap_imageidentifier_element_create, - .parsing_message_element = capwap_imageidentifier_element_parsing, - .clone_message_element = capwap_imageidentifier_element_clone, - .free_message_element = capwap_imageidentifier_element_free + .create = capwap_imageidentifier_element_create, + .parse = capwap_imageidentifier_element_parsing, + .clone = capwap_imageidentifier_element_clone, + .free = capwap_imageidentifier_element_free }; diff --git a/src/common/capwap_element_imageinfo.c b/src/common/capwap_element_imageinfo.c index 0ef1b87..e932250 100644 --- a/src/common/capwap_element_imageinfo.c +++ b/src/common/capwap_element_imageinfo.c @@ -69,8 +69,8 @@ static void* capwap_imageinfo_element_parsing(capwap_message_elements_handle han /* */ struct capwap_message_elements_ops capwap_element_imageinfo_ops = { - .create_message_element = capwap_imageinfo_element_create, - .parsing_message_element = capwap_imageinfo_element_parsing, - .clone_message_element = capwap_imageinfo_element_clone, - .free_message_element = capwap_imageinfo_element_free + .create = capwap_imageinfo_element_create, + .parse = capwap_imageinfo_element_parsing, + .clone = capwap_imageinfo_element_clone, + .free = capwap_imageinfo_element_free }; diff --git a/src/common/capwap_element_initdownload.c b/src/common/capwap_element_initdownload.c index 8c1fc75..a41ca42 100644 --- a/src/common/capwap_element_initdownload.c +++ b/src/common/capwap_element_initdownload.c @@ -48,8 +48,8 @@ static void capwap_initdownload_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_initdownload_ops = { - .create_message_element = capwap_initdownload_element_create, - .parsing_message_element = capwap_initdownload_element_parsing, - .clone_message_element = capwap_initdownload_element_clone, - .free_message_element = capwap_initdownload_element_free + .create = capwap_initdownload_element_create, + .parse = capwap_initdownload_element_parsing, + .clone = capwap_initdownload_element_clone, + .free = capwap_initdownload_element_free }; diff --git a/src/common/capwap_element_localipv4.c b/src/common/capwap_element_localipv4.c index 667b7a2..3c862d7 100644 --- a/src/common/capwap_element_localipv4.c +++ b/src/common/capwap_element_localipv4.c @@ -60,8 +60,8 @@ static void capwap_localipv4_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_localipv4_ops = { - .create_message_element = capwap_localipv4_element_create, - .parsing_message_element = capwap_localipv4_element_parsing, - .clone_message_element = capwap_localipv4_element_clone, - .free_message_element = capwap_localipv4_element_free + .create = capwap_localipv4_element_create, + .parse = capwap_localipv4_element_parsing, + .clone = capwap_localipv4_element_clone, + .free = capwap_localipv4_element_free }; diff --git a/src/common/capwap_element_localipv6.c b/src/common/capwap_element_localipv6.c index f17f833..29dd2b0 100644 --- a/src/common/capwap_element_localipv6.c +++ b/src/common/capwap_element_localipv6.c @@ -65,8 +65,8 @@ static void capwap_localipv6_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_localipv6_ops = { - .create_message_element = capwap_localipv6_element_create, - .parsing_message_element = capwap_localipv6_element_parsing, - .clone_message_element = capwap_localipv6_element_clone, - .free_message_element = capwap_localipv6_element_free + .create = capwap_localipv6_element_create, + .parse = capwap_localipv6_element_parsing, + .clone = capwap_localipv6_element_clone, + .free = capwap_localipv6_element_free }; diff --git a/src/common/capwap_element_location.c b/src/common/capwap_element_location.c index 5a4b693..1cdcc19 100644 --- a/src/common/capwap_element_location.c +++ b/src/common/capwap_element_location.c @@ -78,8 +78,8 @@ static void* capwap_location_element_parsing(capwap_message_elements_handle hand /* */ struct capwap_message_elements_ops capwap_element_location_ops = { - .create_message_element = capwap_location_element_create, - .parsing_message_element = capwap_location_element_parsing, - .clone_message_element = capwap_location_element_clone, - .free_message_element = capwap_location_element_free + .create = capwap_location_element_create, + .parse = capwap_location_element_parsing, + .clone = capwap_location_element_clone, + .free = capwap_location_element_free }; diff --git a/src/common/capwap_element_maximumlength.c b/src/common/capwap_element_maximumlength.c index aea037f..6c81f64 100644 --- a/src/common/capwap_element_maximumlength.c +++ b/src/common/capwap_element_maximumlength.c @@ -60,8 +60,8 @@ static void capwap_maximumlength_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_maximumlength_ops = { - .create_message_element = capwap_maximumlength_element_create, - .parsing_message_element = capwap_maximumlength_element_parsing, - .clone_message_element = capwap_maximumlength_element_clone, - .free_message_element = capwap_maximumlength_element_free + .create = capwap_maximumlength_element_create, + .parse = capwap_maximumlength_element_parsing, + .clone = capwap_maximumlength_element_clone, + .free = capwap_maximumlength_element_free }; diff --git a/src/common/capwap_element_mtudiscovery.c b/src/common/capwap_element_mtudiscovery.c index 2f120bd..37db3dc 100644 --- a/src/common/capwap_element_mtudiscovery.c +++ b/src/common/capwap_element_mtudiscovery.c @@ -68,8 +68,8 @@ static void capwap_mtudiscovery_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_mtudiscovery_ops = { - .create_message_element = capwap_mtudiscovery_element_create, - .parsing_message_element = capwap_mtudiscovery_element_parsing, - .clone_message_element = capwap_mtudiscovery_element_clone, - .free_message_element = capwap_mtudiscovery_element_free + .create = capwap_mtudiscovery_element_create, + .parse = capwap_mtudiscovery_element_parsing, + .clone = capwap_mtudiscovery_element_clone, + .free = capwap_mtudiscovery_element_free }; diff --git a/src/common/capwap_element_radioadmstate.c b/src/common/capwap_element_radioadmstate.c index b950198..4b8331b 100644 --- a/src/common/capwap_element_radioadmstate.c +++ b/src/common/capwap_element_radioadmstate.c @@ -74,8 +74,8 @@ static void* capwap_radioadmstate_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_radioadmstate_ops = { - .create_message_element = capwap_radioadmstate_element_create, - .parsing_message_element = capwap_radioadmstate_element_parsing, - .clone_message_element = capwap_radioadmstate_element_clone, - .free_message_element = capwap_radioadmstate_element_free + .create = capwap_radioadmstate_element_create, + .parse = capwap_radioadmstate_element_parsing, + .clone = capwap_radioadmstate_element_clone, + .free = capwap_radioadmstate_element_free }; diff --git a/src/common/capwap_element_radiooprstate.c b/src/common/capwap_element_radiooprstate.c index 54c4758..2fdbfa0 100644 --- a/src/common/capwap_element_radiooprstate.c +++ b/src/common/capwap_element_radiooprstate.c @@ -85,8 +85,8 @@ static void* capwap_radiooprstate_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_radiooprstate_ops = { - .create_message_element = capwap_radiooprstate_element_create, - .parsing_message_element = capwap_radiooprstate_element_parsing, - .clone_message_element = capwap_radiooprstate_element_clone, - .free_message_element = capwap_radiooprstate_element_free + .create = capwap_radiooprstate_element_create, + .parse = capwap_radiooprstate_element_parsing, + .clone = capwap_radiooprstate_element_clone, + .free = capwap_radiooprstate_element_free }; diff --git a/src/common/capwap_element_resultcode.c b/src/common/capwap_element_resultcode.c index add2d6b..c5bb134 100644 --- a/src/common/capwap_element_resultcode.c +++ b/src/common/capwap_element_resultcode.c @@ -66,8 +66,8 @@ static void* capwap_resultcode_element_parsing(capwap_message_elements_handle ha /* */ struct capwap_message_elements_ops capwap_element_resultcode_ops = { - .create_message_element = capwap_resultcode_element_create, - .parsing_message_element = capwap_resultcode_element_parsing, - .clone_message_element = capwap_resultcode_element_clone, - .free_message_element = capwap_resultcode_element_free + .create = capwap_resultcode_element_create, + .parse = capwap_resultcode_element_parsing, + .clone = capwap_resultcode_element_clone, + .free = capwap_resultcode_element_free }; diff --git a/src/common/capwap_element_returnedmessage.c b/src/common/capwap_element_returnedmessage.c index be9230e..2189481 100644 --- a/src/common/capwap_element_returnedmessage.c +++ b/src/common/capwap_element_returnedmessage.c @@ -105,8 +105,8 @@ static void* capwap_returnedmessage_element_parsing(capwap_message_elements_hand /* */ struct capwap_message_elements_ops capwap_element_returnedmessage_ops = { - .create_message_element = capwap_returnedmessage_element_create, - .parsing_message_element = capwap_returnedmessage_element_parsing, - .clone_message_element = capwap_returnedmessage_element_clone, - .free_message_element = capwap_returnedmessage_element_free + .create = capwap_returnedmessage_element_create, + .parse = capwap_returnedmessage_element_parsing, + .clone = capwap_returnedmessage_element_clone, + .free = capwap_returnedmessage_element_free }; diff --git a/src/common/capwap_element_sessionid.c b/src/common/capwap_element_sessionid.c index 342205b..390f9fe 100644 --- a/src/common/capwap_element_sessionid.c +++ b/src/common/capwap_element_sessionid.c @@ -92,8 +92,8 @@ static void capwap_sessionid_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_sessionid_ops = { - .create_message_element = capwap_sessionid_element_create, - .parsing_message_element = capwap_sessionid_element_parsing, - .clone_message_element = capwap_sessionid_element_clone, - .free_message_element = capwap_sessionid_element_free + .create = capwap_sessionid_element_create, + .parse = capwap_sessionid_element_parsing, + .clone = capwap_sessionid_element_clone, + .free = capwap_sessionid_element_free }; diff --git a/src/common/capwap_element_statisticstimer.c b/src/common/capwap_element_statisticstimer.c index 26e7f7c..fd35efe 100644 --- a/src/common/capwap_element_statisticstimer.c +++ b/src/common/capwap_element_statisticstimer.c @@ -60,8 +60,8 @@ static void capwap_statisticstimer_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_statisticstimer_ops = { - .create_message_element = capwap_statisticstimer_element_create, - .parsing_message_element = capwap_statisticstimer_element_parsing, - .clone_message_element = capwap_statisticstimer_element_clone, - .free_message_element = capwap_statisticstimer_element_free + .create = capwap_statisticstimer_element_create, + .parse = capwap_statisticstimer_element_parsing, + .clone = capwap_statisticstimer_element_clone, + .free = capwap_statisticstimer_element_free }; diff --git a/src/common/capwap_element_timers.c b/src/common/capwap_element_timers.c index 1f4cf72..92ce573 100644 --- a/src/common/capwap_element_timers.c +++ b/src/common/capwap_element_timers.c @@ -62,8 +62,8 @@ static void capwap_timers_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_timers_ops = { - .create_message_element = capwap_timers_element_create, - .parsing_message_element = capwap_timers_element_parsing, - .clone_message_element = capwap_timers_element_clone, - .free_message_element = capwap_timers_element_free + .create = capwap_timers_element_create, + .parse = capwap_timers_element_parsing, + .clone = capwap_timers_element_clone, + .free = capwap_timers_element_free }; diff --git a/src/common/capwap_element_transport.c b/src/common/capwap_element_transport.c index 822d9d0..9f331cb 100644 --- a/src/common/capwap_element_transport.c +++ b/src/common/capwap_element_transport.c @@ -66,8 +66,8 @@ static void* capwap_transport_element_parsing(capwap_message_elements_handle han /* */ struct capwap_message_elements_ops capwap_element_transport_ops = { - .create_message_element = capwap_transport_element_create, - .parsing_message_element = capwap_transport_element_parsing, - .clone_message_element = capwap_transport_element_clone, - .free_message_element = capwap_transport_element_free + .create = capwap_transport_element_create, + .parse = capwap_transport_element_parsing, + .clone = capwap_transport_element_clone, + .free = capwap_transport_element_free }; diff --git a/src/common/capwap_element_vendorpayload.c b/src/common/capwap_element_vendorpayload.c index 2626969..b0b7be6 100644 --- a/src/common/capwap_element_vendorpayload.c +++ b/src/common/capwap_element_vendorpayload.c @@ -125,8 +125,8 @@ capwap_vendorpayload_element_parsing(capwap_message_elements_handle handle, /* */ struct capwap_message_elements_ops capwap_element_vendorpayload_ops = { - .create_message_element = capwap_vendorpayload_element_create, - .parsing_message_element = capwap_vendorpayload_element_parsing, - .clone_message_element = capwap_vendorpayload_element_clone, - .free_message_element = capwap_vendorpayload_element_free + .create = capwap_vendorpayload_element_create, + .parse = capwap_vendorpayload_element_parsing, + .clone = capwap_vendorpayload_element_clone, + .free = capwap_vendorpayload_element_free }; diff --git a/src/common/capwap_element_wtpboarddata.c b/src/common/capwap_element_wtpboarddata.c index 0508737..de60b76 100644 --- a/src/common/capwap_element_wtpboarddata.c +++ b/src/common/capwap_element_wtpboarddata.c @@ -151,10 +151,10 @@ static void* capwap_wtpboarddata_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_wtpboarddata_ops = { - .create_message_element = capwap_wtpboarddata_element_create, - .parsing_message_element = capwap_wtpboarddata_element_parsing, - .clone_message_element = capwap_wtpboarddata_element_clone, - .free_message_element = capwap_wtpboarddata_element_free + .create = capwap_wtpboarddata_element_create, + .parse = capwap_wtpboarddata_element_parsing, + .clone = capwap_wtpboarddata_element_clone, + .free = capwap_wtpboarddata_element_free }; /* */ diff --git a/src/common/capwap_element_wtpdescriptor.c b/src/common/capwap_element_wtpdescriptor.c index 45fc14f..19af8c0 100644 --- a/src/common/capwap_element_wtpdescriptor.c +++ b/src/common/capwap_element_wtpdescriptor.c @@ -229,8 +229,8 @@ static void* capwap_wtpdescriptor_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_wtpdescriptor_ops = { - .create_message_element = capwap_wtpdescriptor_element_create, - .parsing_message_element = capwap_wtpdescriptor_element_parsing, - .clone_message_element = capwap_wtpdescriptor_element_clone, - .free_message_element = capwap_wtpdescriptor_element_free + .create = capwap_wtpdescriptor_element_create, + .parse = capwap_wtpdescriptor_element_parsing, + .clone = capwap_wtpdescriptor_element_clone, + .free = capwap_wtpdescriptor_element_free }; diff --git a/src/common/capwap_element_wtpfallback.c b/src/common/capwap_element_wtpfallback.c index 3c0472d..3259048 100644 --- a/src/common/capwap_element_wtpfallback.c +++ b/src/common/capwap_element_wtpfallback.c @@ -66,8 +66,8 @@ static void* capwap_wtpfallback_element_parsing(capwap_message_elements_handle h /* */ struct capwap_message_elements_ops capwap_element_wtpfallback_ops = { - .create_message_element = capwap_wtpfallback_element_create, - .parsing_message_element = capwap_wtpfallback_element_parsing, - .clone_message_element = capwap_wtpfallback_element_clone, - .free_message_element = capwap_wtpfallback_element_free + .create = capwap_wtpfallback_element_create, + .parse = capwap_wtpfallback_element_parsing, + .clone = capwap_wtpfallback_element_clone, + .free = capwap_wtpfallback_element_free }; diff --git a/src/common/capwap_element_wtpframetunnelmode.c b/src/common/capwap_element_wtpframetunnelmode.c index b7be7d0..3ade1a0 100644 --- a/src/common/capwap_element_wtpframetunnelmode.c +++ b/src/common/capwap_element_wtpframetunnelmode.c @@ -66,8 +66,8 @@ static void* capwap_wtpframetunnelmode_element_parsing(capwap_message_elements_h /* */ struct capwap_message_elements_ops capwap_element_wtpframetunnelmode_ops = { - .create_message_element = capwap_wtpframetunnelmode_element_create, - .parsing_message_element = capwap_wtpframetunnelmode_element_parsing, - .clone_message_element = capwap_wtpframetunnelmode_element_clone, - .free_message_element = capwap_wtpframetunnelmode_element_free + .create = capwap_wtpframetunnelmode_element_create, + .parse = capwap_wtpframetunnelmode_element_parsing, + .clone = capwap_wtpframetunnelmode_element_clone, + .free = capwap_wtpframetunnelmode_element_free }; diff --git a/src/common/capwap_element_wtpmactype.c b/src/common/capwap_element_wtpmactype.c index 4117073..544b8f6 100644 --- a/src/common/capwap_element_wtpmactype.c +++ b/src/common/capwap_element_wtpmactype.c @@ -66,8 +66,8 @@ static void* capwap_wtpmactype_element_parsing(capwap_message_elements_handle ha /* */ struct capwap_message_elements_ops capwap_element_wtpmactype_ops = { - .create_message_element = capwap_wtpmactype_element_create, - .parsing_message_element = capwap_wtpmactype_element_parsing, - .clone_message_element = capwap_wtpmactype_element_clone, - .free_message_element = capwap_wtpmactype_element_free + .create = capwap_wtpmactype_element_create, + .parse = capwap_wtpmactype_element_parsing, + .clone = capwap_wtpmactype_element_clone, + .free = capwap_wtpmactype_element_free }; diff --git a/src/common/capwap_element_wtpname.c b/src/common/capwap_element_wtpname.c index c5cbcb3..8ba3b21 100644 --- a/src/common/capwap_element_wtpname.c +++ b/src/common/capwap_element_wtpname.c @@ -80,8 +80,8 @@ static void capwap_wtpname_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_wtpname_ops = { - .create_message_element = capwap_wtpname_element_create, - .parsing_message_element = capwap_wtpname_element_parsing, - .clone_message_element = capwap_wtpname_element_clone, - .free_message_element = capwap_wtpname_element_free + .create = capwap_wtpname_element_create, + .parse = capwap_wtpname_element_parsing, + .clone = capwap_wtpname_element_clone, + .free = capwap_wtpname_element_free }; diff --git a/src/common/capwap_element_wtpradiostat.c b/src/common/capwap_element_wtpradiostat.c index 4fb3c4c..01019d8 100644 --- a/src/common/capwap_element_wtpradiostat.c +++ b/src/common/capwap_element_wtpradiostat.c @@ -95,8 +95,8 @@ static void* capwap_wtpradiostat_element_parsing(capwap_message_elements_handle /* */ struct capwap_message_elements_ops capwap_element_wtpradiostat_ops = { - .create_message_element = capwap_wtpradiostat_element_create, - .parsing_message_element = capwap_wtpradiostat_element_parsing, - .clone_message_element = capwap_wtpradiostat_element_clone, - .free_message_element = capwap_wtpradiostat_element_free + .create = capwap_wtpradiostat_element_create, + .parse = capwap_wtpradiostat_element_parsing, + .clone = capwap_wtpradiostat_element_clone, + .free = capwap_wtpradiostat_element_free }; diff --git a/src/common/capwap_element_wtprebootstat.c b/src/common/capwap_element_wtprebootstat.c index 4feede6..5c62808 100644 --- a/src/common/capwap_element_wtprebootstat.c +++ b/src/common/capwap_element_wtprebootstat.c @@ -80,8 +80,8 @@ static void capwap_wtprebootstat_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_wtprebootstat_ops = { - .create_message_element = capwap_wtprebootstat_element_create, - .parsing_message_element = capwap_wtprebootstat_element_parsing, - .clone_message_element = capwap_wtprebootstat_element_clone, - .free_message_element = capwap_wtprebootstat_element_free + .create = capwap_wtprebootstat_element_create, + .parse = capwap_wtprebootstat_element_parsing, + .clone = capwap_wtprebootstat_element_clone, + .free = capwap_wtprebootstat_element_free }; diff --git a/src/common/capwap_element_wtpstaticipaddress.c b/src/common/capwap_element_wtpstaticipaddress.c index 0648923..7988339 100644 --- a/src/common/capwap_element_wtpstaticipaddress.c +++ b/src/common/capwap_element_wtpstaticipaddress.c @@ -72,8 +72,8 @@ static void capwap_wtpstaticipaddress_element_free(void* data) { /* */ struct capwap_message_elements_ops capwap_element_wtpstaticipaddress_ops = { - .create_message_element = capwap_wtpstaticipaddress_element_create, - .parsing_message_element = capwap_wtpstaticipaddress_element_parsing, - .clone_message_element = capwap_wtpstaticipaddress_element_clone, - .free_message_element = capwap_wtpstaticipaddress_element_free + .create = capwap_wtpstaticipaddress_element_create, + .parse = capwap_wtpstaticipaddress_element_parsing, + .clone = capwap_wtpstaticipaddress_element_clone, + .free = capwap_wtpstaticipaddress_element_free }; diff --git a/src/common/capwap_protocol.c b/src/common/capwap_protocol.c index 8b5a276..9e19e93 100644 --- a/src/common/capwap_protocol.c +++ b/src/common/capwap_protocol.c @@ -496,7 +496,7 @@ void capwap_packet_txmng_add_message_element(struct capwap_packet_txmng* txmngpa /* Retrieve message element function */ func = capwap_get_message_element_ops(type); ASSERT(func != NULL); - ASSERT(func->create_message_element != NULL); + ASSERT(func->create != NULL); /* 0 1 2 3 @@ -507,19 +507,19 @@ void capwap_packet_txmng_add_message_element(struct capwap_packet_txmng* txmngpa | Value ... | +-+-+-+-+-+-+-+-+ - Type and Length is add to this function, only custom create_message_element write Value message element + Type and Length is add to this function, only custom create write Value message element */ txmngpacket->write_ops.write_u16((capwap_message_elements_handle)txmngpacket, type); - /* Length of message element is calculate after create_message_element function */ + /* Length of message element is calculate after create function */ writepos.item = txmngpacket->fragmentlist->last; writepos.pos = ((struct capwap_fragment_packet_item*)writepos.item->item)->offset; txmngpacket->write_ops.write_u16((capwap_message_elements_handle)txmngpacket, 0); txmngpacket->writerpacketsize = 0; /* Build message element */ - func->create_message_element(data, (capwap_message_elements_handle)txmngpacket, &txmngpacket->write_ops); + func->create(data, (capwap_message_elements_handle)txmngpacket, &txmngpacket->write_ops); /* Write message element length */ capwap_fragment_write_u16_from_pos((capwap_message_elements_handle)txmngpacket, txmngpacket->writerpacketsize, &writepos);