Added the code that handles the result code of a request.
This commit is contained in:
parent
b15e0148b2
commit
7ddb32d217
@ -2,11 +2,153 @@
|
|||||||
#include "capwap_dfa.h"
|
#include "capwap_dfa.h"
|
||||||
#include "capwap_array.h"
|
#include "capwap_array.h"
|
||||||
#include "ac_session.h"
|
#include "ac_session.h"
|
||||||
|
#include <json/json.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
|
/* */
|
||||||
|
static struct ac_soap_response* ac_dfa_state_configure_parsing_request(struct ac_session_t* session, struct capwap_parsed_packet* packet) {
|
||||||
|
int i;
|
||||||
|
const char* jsonmessage;
|
||||||
|
char* base64confstatus;
|
||||||
|
struct json_object* jarray;
|
||||||
|
struct json_object* jsonparam;
|
||||||
|
struct json_object* jhash;
|
||||||
|
struct capwap_array* elemarray;
|
||||||
|
struct capwap_statisticstimer_element* statisticstimer;
|
||||||
|
struct capwap_wtprebootstat_element* wtprebootstat;
|
||||||
|
struct capwap_wtpstaticipaddress_element* wtpstaticipaddress;
|
||||||
|
struct ac_soap_response* response;
|
||||||
|
|
||||||
|
/* Create SOAP request with JSON param
|
||||||
|
{
|
||||||
|
RadioAdministrativeState: [
|
||||||
|
{
|
||||||
|
RadioID: [int],
|
||||||
|
AdminState: [int]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
StatisticsTimer: {
|
||||||
|
StatisticsTimer: [int]
|
||||||
|
},
|
||||||
|
WTPRebootStatistics: {
|
||||||
|
RebootCount: [int],
|
||||||
|
ACInitiatedCount: [int],
|
||||||
|
LinkFailureCount: [int],
|
||||||
|
SWFailureCount: [int],
|
||||||
|
HWFailureCount: [int],
|
||||||
|
OtherFailureCount: [int],
|
||||||
|
UnknownFailureCount: [int],
|
||||||
|
LastFailureType: [int]
|
||||||
|
},
|
||||||
|
ACNamePriority: [
|
||||||
|
{
|
||||||
|
Priority: [int],
|
||||||
|
ACName: [string]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
WTPStaticIPAddressInformation: {
|
||||||
|
IPAddress: [string],
|
||||||
|
Netmask: [string],
|
||||||
|
Gateway: [string],
|
||||||
|
Static: [int]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* */
|
||||||
|
jsonparam = json_object_new_object();
|
||||||
|
|
||||||
|
/* RadioAdministrativeState */
|
||||||
|
jarray = json_object_new_array();
|
||||||
|
elemarray = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RADIOADMSTATE);
|
||||||
|
for (i = 0; i < elemarray->count; i++) {
|
||||||
|
json_object* jradioadm;
|
||||||
|
struct capwap_radioadmstate_element* radioadm = *(struct capwap_radioadmstate_element**)capwap_array_get_item_pointer(elemarray, i);
|
||||||
|
|
||||||
|
/* */
|
||||||
|
jradioadm = json_object_new_object();
|
||||||
|
json_object_object_add(jradioadm, "RadioID", json_object_new_int((int)radioadm->radioid));
|
||||||
|
json_object_object_add(jradioadm, "AdminState", json_object_new_int((int)radioadm->state));
|
||||||
|
json_object_array_add(jarray, jradioadm);
|
||||||
|
}
|
||||||
|
|
||||||
|
json_object_object_add(jsonparam, "RadioAdministrativeState", jarray);
|
||||||
|
|
||||||
|
/* StatisticsTimer */
|
||||||
|
statisticstimer = (struct capwap_statisticstimer_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_STATISTICSTIMER);
|
||||||
|
|
||||||
|
jhash = json_object_new_object();
|
||||||
|
json_object_object_add(jhash, "StatisticsTimer", json_object_new_int((int)statisticstimer->timer));
|
||||||
|
json_object_object_add(jsonparam, "StatisticsTimer", jhash);
|
||||||
|
|
||||||
|
/* WTPRebootStatistics */
|
||||||
|
wtprebootstat = (struct capwap_wtprebootstat_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_WTPREBOOTSTAT);
|
||||||
|
|
||||||
|
jhash = json_object_new_object();
|
||||||
|
json_object_object_add(jhash, "RebootCount", json_object_new_int((int)wtprebootstat->rebootcount));
|
||||||
|
json_object_object_add(jhash, "ACInitiatedCount", json_object_new_int((int)wtprebootstat->acinitiatedcount));
|
||||||
|
json_object_object_add(jhash, "LinkFailureCount", json_object_new_int((int)wtprebootstat->linkfailurecount));
|
||||||
|
json_object_object_add(jhash, "SWFailureCount", json_object_new_int((int)wtprebootstat->swfailurecount));
|
||||||
|
json_object_object_add(jhash, "HWFailureCount", json_object_new_int((int)wtprebootstat->hwfailurecount));
|
||||||
|
json_object_object_add(jhash, "OtherFailureCount", json_object_new_int((int)wtprebootstat->otherfailurecount));
|
||||||
|
json_object_object_add(jhash, "UnknownFailureCount", json_object_new_int((int)wtprebootstat->unknownfailurecount));
|
||||||
|
json_object_object_add(jhash, "LastFailureType", json_object_new_int((int)wtprebootstat->lastfailuretype));
|
||||||
|
json_object_object_add(jsonparam, "WTPRebootStatistics", jhash);
|
||||||
|
|
||||||
|
/* ACNamePriority */
|
||||||
|
elemarray = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_ACNAMEPRIORITY);
|
||||||
|
if (elemarray && elemarray->count) {
|
||||||
|
jarray = json_object_new_array();
|
||||||
|
for (i = 0; i < elemarray->count; i++) {
|
||||||
|
json_object* jacname;
|
||||||
|
struct capwap_acnamepriority_element* acname = *(struct capwap_acnamepriority_element**)capwap_array_get_item_pointer(elemarray, i);
|
||||||
|
|
||||||
|
/* */
|
||||||
|
jacname = json_object_new_object();
|
||||||
|
json_object_object_add(jacname, "Priority", json_object_new_int((int)acname->priority));
|
||||||
|
json_object_object_add(jacname, "ACName", json_object_new_string((char*)acname->name));
|
||||||
|
json_object_array_add(jarray, jacname);
|
||||||
|
}
|
||||||
|
|
||||||
|
json_object_object_add(jsonparam, "ACNamePriority", jarray);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* WTPStaticIPAddressInformation */
|
||||||
|
wtpstaticipaddress = (struct capwap_wtpstaticipaddress_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_WTPSTATICIPADDRESS);
|
||||||
|
if (wtpstaticipaddress) {
|
||||||
|
char ipbuffer[INET_ADDRSTRLEN];
|
||||||
|
|
||||||
|
/* */
|
||||||
|
jhash = json_object_new_object();
|
||||||
|
json_object_object_add(jhash, "IPAddress", json_object_new_string(inet_ntop(AF_INET, (void*)&wtpstaticipaddress->address, ipbuffer, INET_ADDRSTRLEN)));
|
||||||
|
json_object_object_add(jhash, "Netmask", json_object_new_string(inet_ntop(AF_INET, (void*)&wtpstaticipaddress->netmask, ipbuffer, INET_ADDRSTRLEN)));
|
||||||
|
json_object_object_add(jhash, "Gateway", json_object_new_string(inet_ntop(AF_INET, (void*)&wtpstaticipaddress->gateway, ipbuffer, INET_ADDRSTRLEN)));
|
||||||
|
json_object_object_add(jhash, "Static", json_object_new_int((int)wtpstaticipaddress->staticip));
|
||||||
|
json_object_object_add(jsonparam, "WTPStaticIPAddressInformation", jhash);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Get JSON param and convert base64 */
|
||||||
|
jsonmessage = json_object_to_json_string(jsonparam);
|
||||||
|
base64confstatus = capwap_alloc(AC_BASE64_ENCODE_LENGTH(strlen(jsonmessage)));
|
||||||
|
if (!base64confstatus) {
|
||||||
|
capwap_outofmemory();
|
||||||
|
}
|
||||||
|
|
||||||
|
ac_base64_string_encode(jsonmessage, base64confstatus);
|
||||||
|
|
||||||
|
/* Send message */
|
||||||
|
response = ac_soap_configureStatus(session, session->wtpid, base64confstatus);
|
||||||
|
|
||||||
|
/* Free JSON */
|
||||||
|
json_object_put(jsonparam);
|
||||||
|
capwap_free(base64confstatus);
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
int ac_dfa_state_configure(struct ac_session_t* session, struct capwap_parsed_packet* packet) {
|
int ac_dfa_state_configure(struct ac_session_t* session, struct capwap_parsed_packet* packet) {
|
||||||
unsigned long i;
|
unsigned long i;
|
||||||
unsigned short binding;
|
|
||||||
struct capwap_array* radioadmstate;
|
struct capwap_array* radioadmstate;
|
||||||
struct capwap_header_data capwapheader;
|
struct capwap_header_data capwapheader;
|
||||||
struct capwap_packet_txmng* txmngpacket;
|
struct capwap_packet_txmng* txmngpacket;
|
||||||
@ -15,64 +157,71 @@ int ac_dfa_state_configure(struct ac_session_t* session, struct capwap_parsed_pa
|
|||||||
ASSERT(session != NULL);
|
ASSERT(session != NULL);
|
||||||
|
|
||||||
if (packet) {
|
if (packet) {
|
||||||
binding = GET_WBID_HEADER(packet->rxmngpacket->header);
|
/* Parsing request */
|
||||||
/* TODO: gestione richiesta */
|
struct ac_soap_response* response = ac_dfa_state_configure_parsing_request(session, packet);
|
||||||
|
if (response) {
|
||||||
|
/* Create response */
|
||||||
|
capwap_header_init(&capwapheader, CAPWAP_RADIOID_NONE, GET_WBID_HEADER(packet->rxmngpacket->header));
|
||||||
|
txmngpacket = capwap_packet_txmng_create_ctrl_message(&capwapheader, CAPWAP_CONFIGURATION_STATUS_RESPONSE, packet->rxmngpacket->ctrlmsg.seq, session->mtu);
|
||||||
|
|
||||||
/* Create response */
|
/* Add message element */
|
||||||
capwap_header_init(&capwapheader, CAPWAP_RADIOID_NONE, binding);
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_TIMERS, &session->dfa.timers);
|
||||||
txmngpacket = capwap_packet_txmng_create_ctrl_message(&capwapheader, CAPWAP_CONFIGURATION_STATUS_RESPONSE, packet->rxmngpacket->ctrlmsg.seq, session->mtu);
|
|
||||||
|
|
||||||
/* Add message element */
|
radioadmstate = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RADIOADMSTATE);
|
||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_TIMERS, &session->dfa.timers);
|
for (i = 0; i < radioadmstate->count; i++) {
|
||||||
|
struct capwap_decrypterrorreportperiod_element report;
|
||||||
|
struct capwap_radioadmstate_element* radioadm = *(struct capwap_radioadmstate_element**)capwap_array_get_item_pointer(radioadmstate, i);
|
||||||
|
|
||||||
radioadmstate = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RADIOADMSTATE);
|
report.radioid = radioadm->radioid;
|
||||||
for (i = 0; i < radioadmstate->count; i++) {
|
report.interval = session->dfa.decrypterrorreport_interval;
|
||||||
struct capwap_decrypterrorreportperiod_element report;
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_DECRYPTERRORREPORTPERIOD, &report);
|
||||||
struct capwap_radioadmstate_element* radioadm = *(struct capwap_radioadmstate_element**)capwap_array_get_item_pointer(radioadmstate, i);
|
}
|
||||||
|
|
||||||
report.radioid = radioadm->radioid;
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_IDLETIMEOUT, &session->dfa.idletimeout);
|
||||||
report.interval = session->dfa.decrypterrorreport_interval;
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_WTPFALLBACK, &session->dfa.wtpfallback);
|
||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_DECRYPTERRORREPORTPERIOD, &report);
|
|
||||||
|
if (session->dfa.acipv4list.addresses->count > 0) {
|
||||||
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_ACIPV4LIST, &session->dfa.acipv4list);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session->dfa.acipv6list.addresses->count > 0) {
|
||||||
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_ACIPV6LIST, &session->dfa.acipv6list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* CAPWAP_CREATE_RADIOOPRSTATE_ELEMENT */ /* TODO */
|
||||||
|
/* CAPWAP_CREATE_WTPSTATICIPADDRESS_ELEMENT */ /* TODO */
|
||||||
|
/* CAPWAP_CREATE_VENDORSPECIFICPAYLOAD_ELEMENT */ /* TODO */
|
||||||
|
|
||||||
|
/* */
|
||||||
|
ac_soapclient_free_response(response);
|
||||||
|
|
||||||
|
/* Configure response complete, get fragment packets */
|
||||||
|
ac_free_reference_last_response(session);
|
||||||
|
capwap_packet_txmng_get_fragment_packets(txmngpacket, session->responsefragmentpacket, session->fragmentid);
|
||||||
|
if (session->responsefragmentpacket->count > 1) {
|
||||||
|
session->fragmentid++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free packets manager */
|
||||||
|
capwap_packet_txmng_free(txmngpacket);
|
||||||
|
|
||||||
|
/* Save remote sequence number */
|
||||||
|
session->remoteseqnumber = packet->rxmngpacket->ctrlmsg.seq;
|
||||||
|
capwap_get_packet_digest(packet->rxmngpacket, packet->connection, session->lastrecvpackethash);
|
||||||
|
|
||||||
|
/* Send Configure response to WTP */
|
||||||
|
if (!capwap_crypt_sendto_fragmentpacket(&session->ctrldtls, session->ctrlsocket.socket[session->ctrlsocket.type], session->responsefragmentpacket, &session->acctrladdress, &session->wtpctrladdress)) {
|
||||||
|
/* Response is already created and saved. When receive a re-request, DFA autoresponse */
|
||||||
|
capwap_logging_debug("Warning: error to send configuration status response packet");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Change state */
|
||||||
|
ac_dfa_change_state(session, CAPWAP_DATA_CHECK_STATE);
|
||||||
|
capwap_set_timeout(session->dfa.rfcChangeStatePendingTimer, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION);
|
||||||
|
} else {
|
||||||
|
ac_dfa_change_state(session, CAPWAP_CONFIGURE_TO_DTLS_TEARDOWN_STATE);
|
||||||
|
status = AC_DFA_NO_PACKET;
|
||||||
}
|
}
|
||||||
|
|
||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_IDLETIMEOUT, &session->dfa.idletimeout);
|
|
||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_WTPFALLBACK, &session->dfa.wtpfallback);
|
|
||||||
|
|
||||||
if (session->dfa.acipv4list.addresses->count > 0) {
|
|
||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_ACIPV4LIST, &session->dfa.acipv4list);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (session->dfa.acipv6list.addresses->count > 0) {
|
|
||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_ACIPV6LIST, &session->dfa.acipv6list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* CAPWAP_CREATE_RADIOOPRSTATE_ELEMENT */ /* TODO */
|
|
||||||
/* CAPWAP_CREATE_WTPSTATICIPADDRESS_ELEMENT */ /* TODO */
|
|
||||||
/* CAPWAP_CREATE_VENDORSPECIFICPAYLOAD_ELEMENT */ /* TODO */
|
|
||||||
|
|
||||||
/* Configure response complete, get fragment packets */
|
|
||||||
ac_free_reference_last_response(session);
|
|
||||||
capwap_packet_txmng_get_fragment_packets(txmngpacket, session->responsefragmentpacket, session->fragmentid);
|
|
||||||
if (session->responsefragmentpacket->count > 1) {
|
|
||||||
session->fragmentid++;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Free packets manager */
|
|
||||||
capwap_packet_txmng_free(txmngpacket);
|
|
||||||
|
|
||||||
/* Save remote sequence number */
|
|
||||||
session->remoteseqnumber = packet->rxmngpacket->ctrlmsg.seq;
|
|
||||||
capwap_get_packet_digest(packet->rxmngpacket, packet->connection, session->lastrecvpackethash);
|
|
||||||
|
|
||||||
/* Send Configure response to WTP */
|
|
||||||
if (!capwap_crypt_sendto_fragmentpacket(&session->ctrldtls, session->ctrlsocket.socket[session->ctrlsocket.type], session->responsefragmentpacket, &session->acctrladdress, &session->wtpctrladdress)) {
|
|
||||||
/* Response is already created and saved. When receive a re-request, DFA autoresponse */
|
|
||||||
capwap_logging_debug("Warning: error to send configuration status response packet");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Change state */
|
|
||||||
ac_dfa_change_state(session, CAPWAP_DATA_CHECK_STATE);
|
|
||||||
capwap_set_timeout(session->dfa.rfcChangeStatePendingTimer, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION);
|
|
||||||
} else {
|
} else {
|
||||||
/* Configure timeout */
|
/* Configure timeout */
|
||||||
ac_dfa_change_state(session, CAPWAP_CONFIGURE_TO_DTLS_TEARDOWN_STATE);
|
ac_dfa_change_state(session, CAPWAP_CONFIGURE_TO_DTLS_TEARDOWN_STATE);
|
||||||
|
@ -6,6 +6,11 @@
|
|||||||
|
|
||||||
/* */
|
/* */
|
||||||
static int ac_dfa_state_join_check_authorizejoin(struct ac_session_t* session, struct ac_soap_response* response) {
|
static int ac_dfa_state_join_check_authorizejoin(struct ac_session_t* session, struct ac_soap_response* response) {
|
||||||
|
if (response->responsecode != HTTP_RESULT_OK) {
|
||||||
|
/* TODO: check return failed code */
|
||||||
|
return CAPWAP_RESULTCODE_JOIN_FAILURE_UNKNOWN_SOURCE;
|
||||||
|
}
|
||||||
|
|
||||||
return CAPWAP_RESULTCODE_SUCCESS;
|
return CAPWAP_RESULTCODE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -44,21 +49,8 @@ int ac_dfa_state_join(struct ac_session_t* session, struct capwap_parsed_packet*
|
|||||||
/* Request authorization of Backend for complete join */
|
/* Request authorization of Backend for complete join */
|
||||||
response = ac_soap_authorizejoin(session, wtpid);
|
response = ac_soap_authorizejoin(session, wtpid);
|
||||||
if (response) {
|
if (response) {
|
||||||
/* Validate Join */
|
|
||||||
resultcode.code = ac_dfa_state_join_check_authorizejoin(session, response);
|
resultcode.code = ac_dfa_state_join_check_authorizejoin(session, response);
|
||||||
ac_soapclient_free_response(response);
|
ac_soapclient_free_response(response);
|
||||||
|
|
||||||
/* Valid WTP */
|
|
||||||
if (resultcode.code == CAPWAP_RESULTCODE_SUCCESS) {
|
|
||||||
session->wtpid = wtpid;
|
|
||||||
wtpid = NULL;
|
|
||||||
|
|
||||||
/* Session id */
|
|
||||||
memcpy(&session->sessionid, sessionid, sizeof(struct capwap_sessionid_element));
|
|
||||||
|
|
||||||
/* Binding */
|
|
||||||
session->binding = binding;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
resultcode.code = CAPWAP_RESULTCODE_JOIN_FAILURE_UNKNOWN_SOURCE;
|
resultcode.code = CAPWAP_RESULTCODE_JOIN_FAILURE_UNKNOWN_SOURCE;
|
||||||
}
|
}
|
||||||
@ -67,7 +59,11 @@ int ac_dfa_state_join(struct ac_session_t* session, struct capwap_parsed_packet*
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
if (wtpid) {
|
if (CAPWAP_RESULTCODE_OK(resultcode.code)) {
|
||||||
|
session->wtpid = wtpid;
|
||||||
|
memcpy(&session->sessionid, sessionid, sizeof(struct capwap_sessionid_element));
|
||||||
|
session->binding = binding;
|
||||||
|
} else {
|
||||||
capwap_free(wtpid);
|
capwap_free(wtpid);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -88,7 +84,7 @@ int ac_dfa_state_join(struct ac_session_t* session, struct capwap_parsed_packet*
|
|||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_RESULTCODE, &resultcode);
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_RESULTCODE, &resultcode);
|
||||||
|
|
||||||
/* Check is valid packet after parsing request */
|
/* Check is valid packet after parsing request */
|
||||||
if ((resultcode.code == CAPWAP_RESULTCODE_SUCCESS) || (resultcode.code == CAPWAP_RESULTCODE_SUCCESS_NAT_DETECTED)) {
|
if (CAPWAP_RESULTCODE_OK(resultcode.code)) {
|
||||||
struct capwap_list* controllist;
|
struct capwap_list* controllist;
|
||||||
struct capwap_list_item* item;
|
struct capwap_list_item* item;
|
||||||
|
|
||||||
@ -125,7 +121,7 @@ int ac_dfa_state_join(struct ac_session_t* session, struct capwap_parsed_packet*
|
|||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_CONTROLIPV4, &element);
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_CONTROLIPV4, &element);
|
||||||
} else if (sessioncontrol->localaddress.ss_family == AF_INET6) {
|
} else if (sessioncontrol->localaddress.ss_family == AF_INET6) {
|
||||||
struct capwap_controlipv6_element element;
|
struct capwap_controlipv6_element element;
|
||||||
|
|
||||||
memcpy(&element.address, &((struct sockaddr_in6*)&sessioncontrol->localaddress)->sin6_addr, sizeof(struct in6_addr));
|
memcpy(&element.address, &((struct sockaddr_in6*)&sessioncontrol->localaddress)->sin6_addr, sizeof(struct in6_addr));
|
||||||
element.wtpcount = sessioncontrol->count;
|
element.wtpcount = sessioncontrol->count;
|
||||||
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_CONTROLIPV6, &element);
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_CONTROLIPV6, &element);
|
||||||
@ -170,7 +166,12 @@ int ac_dfa_state_join(struct ac_session_t* session, struct capwap_parsed_packet*
|
|||||||
|
|
||||||
/* Send Join response to WTP */
|
/* Send Join response to WTP */
|
||||||
if (capwap_crypt_sendto_fragmentpacket(&session->ctrldtls, session->ctrlsocket.socket[session->ctrlsocket.type], session->responsefragmentpacket, &session->acctrladdress, &session->wtpctrladdress)) {
|
if (capwap_crypt_sendto_fragmentpacket(&session->ctrldtls, session->ctrlsocket.socket[session->ctrlsocket.type], session->responsefragmentpacket, &session->acctrladdress, &session->wtpctrladdress)) {
|
||||||
ac_dfa_change_state(session, CAPWAP_POSTJOIN_STATE);
|
if (CAPWAP_RESULTCODE_OK(resultcode.code)) {
|
||||||
|
ac_dfa_change_state(session, CAPWAP_POSTJOIN_STATE);
|
||||||
|
} else {
|
||||||
|
ac_dfa_change_state(session, CAPWAP_JOIN_TO_DTLS_TEARDOWN_STATE);
|
||||||
|
status = AC_DFA_NO_PACKET;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
/* Error to send packets */
|
/* Error to send packets */
|
||||||
capwap_logging_debug("Warning: error to send join response packet");
|
capwap_logging_debug("Warning: error to send join response packet");
|
||||||
|
@ -15,6 +15,14 @@ int ac_dfa_state_reset(struct ac_session_t* session, struct capwap_parsed_packet
|
|||||||
/* */
|
/* */
|
||||||
binding = GET_WBID_HEADER(packet->rxmngpacket->header);
|
binding = GET_WBID_HEADER(packet->rxmngpacket->header);
|
||||||
if ((binding == session->binding) && (packet->rxmngpacket->ctrlmsg.type == CAPWAP_RESET_RESPONSE) && ((session->localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) {
|
if ((binding == session->binding) && (packet->rxmngpacket->ctrlmsg.type == CAPWAP_RESET_RESPONSE) && ((session->localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) {
|
||||||
|
struct capwap_resultcode_element* resultcode;
|
||||||
|
|
||||||
|
/* Check the success of the Request */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
capwap_logging_warning("Receive Reset Response with error: %d", (int)resultcode->code);
|
||||||
|
}
|
||||||
|
|
||||||
ac_dfa_change_state(session, CAPWAP_RESET_TO_DTLS_TEARDOWN_STATE);
|
ac_dfa_change_state(session, CAPWAP_RESET_TO_DTLS_TEARDOWN_STATE);
|
||||||
status = AC_DFA_NO_PACKET;
|
status = AC_DFA_NO_PACKET;
|
||||||
}
|
}
|
||||||
|
@ -428,6 +428,47 @@ static void ac_free_packet_rxmng(struct ac_session_t* session, int isctrlmsg) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* */
|
||||||
|
static void ac_send_invalid_request(struct ac_session_t* session, struct capwap_packet_rxmng* rxmngpacket, struct capwap_connection* connection, uint32_t errorcode) {
|
||||||
|
struct capwap_header_data capwapheader;
|
||||||
|
struct capwap_packet_txmng* txmngpacket;
|
||||||
|
struct capwap_list* responsefragmentpacket;
|
||||||
|
struct capwap_fragment_packet_item* packet;
|
||||||
|
struct capwap_header* header;
|
||||||
|
struct capwap_resultcode_element resultcode = { .code = errorcode };
|
||||||
|
|
||||||
|
ASSERT(rxmngpacket != NULL);
|
||||||
|
ASSERT(rxmngpacket->fragmentlist->first != NULL);
|
||||||
|
ASSERT(connection != NULL);
|
||||||
|
|
||||||
|
/* */
|
||||||
|
packet = (struct capwap_fragment_packet_item*)rxmngpacket->fragmentlist->first->item;
|
||||||
|
header = (struct capwap_header*)packet->buffer;
|
||||||
|
|
||||||
|
/* Odd message type */
|
||||||
|
capwap_header_init(&capwapheader, CAPWAP_RADIOID_NONE, GET_WBID_HEADER(header));
|
||||||
|
txmngpacket = capwap_packet_txmng_create_ctrl_message(&capwapheader, rxmngpacket->ctrlmsg.type + 1, rxmngpacket->ctrlmsg.seq, session->mtu);
|
||||||
|
|
||||||
|
/* Add message element */
|
||||||
|
capwap_packet_txmng_add_message_element(txmngpacket, CAPWAP_ELEMENT_RESULTCODE, &resultcode);
|
||||||
|
|
||||||
|
/* Unknown response complete, get fragment packets */
|
||||||
|
responsefragmentpacket = capwap_list_create();
|
||||||
|
capwap_packet_txmng_get_fragment_packets(txmngpacket, responsefragmentpacket, session->fragmentid);
|
||||||
|
if (responsefragmentpacket->count > 1) {
|
||||||
|
session->fragmentid++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free packets manager */
|
||||||
|
capwap_packet_txmng_free(txmngpacket);
|
||||||
|
|
||||||
|
/* Send unknown response */
|
||||||
|
capwap_crypt_sendto_fragmentpacket(&session->ctrldtls, connection->socket.socket[connection->socket.type], responsefragmentpacket, &connection->localaddr, &connection->remoteaddr);
|
||||||
|
|
||||||
|
/* Don't buffering a packets sent */
|
||||||
|
capwap_list_free(responsefragmentpacket);
|
||||||
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
static void ac_session_run(struct ac_session_t* session) {
|
static void ac_session_run(struct ac_session_t* session) {
|
||||||
int res;
|
int res;
|
||||||
@ -491,7 +532,8 @@ static void ac_session_run(struct ac_session_t* session) {
|
|||||||
res = capwap_check_message_type(rxmngpacket);
|
res = capwap_check_message_type(rxmngpacket);
|
||||||
if (res != VALID_MESSAGE_TYPE) {
|
if (res != VALID_MESSAGE_TYPE) {
|
||||||
if (res == INVALID_REQUEST_MESSAGE_TYPE) {
|
if (res == INVALID_REQUEST_MESSAGE_TYPE) {
|
||||||
/*TODO wtp_send_invalid_request(rxmngpacket, &connection);*/
|
capwap_logging_warning("Unexpected Unrecognized Request, send Response Packet with error");
|
||||||
|
ac_send_invalid_request(session, rxmngpacket, &connection, CAPWAP_RESULTCODE_MSG_UNEXPECTED_UNRECOGNIZED_REQUEST);
|
||||||
}
|
}
|
||||||
|
|
||||||
ignorepacket = 1;
|
ignorepacket = 1;
|
||||||
@ -505,14 +547,25 @@ static void ac_session_run(struct ac_session_t* session) {
|
|||||||
|
|
||||||
/* Parsing packet */
|
/* Parsing packet */
|
||||||
if (!ignorepacket) {
|
if (!ignorepacket) {
|
||||||
if (!capwap_parsing_packet(rxmngpacket, &connection, &packet)) {
|
res = capwap_parsing_packet(rxmngpacket, &connection, &packet);
|
||||||
|
if (res == PARSING_COMPLETE) {
|
||||||
/* Validate packet */
|
/* Validate packet */
|
||||||
if (capwap_validate_parsed_packet(&packet, NULL)) {
|
if (capwap_validate_parsed_packet(&packet, NULL)) {
|
||||||
/* TODO gestione errore risposta */
|
if (isctrlsocket && capwap_is_request_type(rxmngpacket->ctrlmsg.type)) {
|
||||||
|
capwap_logging_warning("Missing Mandatory Message Element, send Response Packet with error");
|
||||||
|
ac_send_invalid_request(session, rxmngpacket, &connection, CAPWAP_RESULTCODE_FAILURE_MISSING_MANDATORY_MSG_ELEMENT);
|
||||||
|
}
|
||||||
|
|
||||||
ignorepacket = 1;
|
ignorepacket = 1;
|
||||||
capwap_logging_debug("Failed validation parsed packet");
|
capwap_logging_debug("Failed validation parsed packet");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if (isctrlsocket && (res == UNRECOGNIZED_MESSAGE_ELEMENT) && capwap_is_request_type(rxmngpacket->ctrlmsg.type)) {
|
||||||
|
capwap_logging_warning("Unrecognized Message Element, send Response Packet with error");
|
||||||
|
ac_send_invalid_request(session, rxmngpacket, &connection, CAPWAP_RESULTCODE_FAILURE_UNRECOGNIZED_MESSAGE_ELEMENT);
|
||||||
|
/* TODO: add the unrecognized message element */
|
||||||
|
}
|
||||||
|
|
||||||
ignorepacket = 1;
|
ignorepacket = 1;
|
||||||
capwap_logging_debug("Failed parsing packet");
|
capwap_logging_debug("Failed parsing packet");
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,8 @@ int ac_dfa_state_dead(struct ac_session_t* session, struct capwap_parsed_packet*
|
|||||||
|
|
||||||
/* Soap function */
|
/* Soap function */
|
||||||
struct ac_soap_response* ac_session_send_soap_request(struct ac_session_t* session, char* method, int numparam, ...);
|
struct ac_soap_response* ac_session_send_soap_request(struct ac_session_t* session, char* method, int numparam, ...);
|
||||||
#define ac_soap_authorizejoin(s, wtpid) ac_session_send_soap_request((s), "authorizeJoin", 1, "xs:string", "wtpid", wtpid)
|
#define ac_soap_authorizejoin(s, wtpid) ac_session_send_soap_request((s), "authorizeJoin", 1, "xs:string", "wtpid", wtpid)
|
||||||
|
#define ac_soap_configureStatus(s, wtpid, confstatus) ac_session_send_soap_request((s), "configureStatus", 2, "xs:string", "wtpid", wtpid, "xs:base64Binary", "confstatus", confstatus)
|
||||||
|
|
||||||
|
|
||||||
#endif /* __AC_SESSION_HEADER__ */
|
#endif /* __AC_SESSION_HEADER__ */
|
||||||
|
@ -208,32 +208,32 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
|
|||||||
/* Get type and length */
|
/* Get type and length */
|
||||||
rxmngpacket->readerpacketallowed = sizeof(struct capwap_message_element);
|
rxmngpacket->readerpacketallowed = sizeof(struct capwap_message_element);
|
||||||
if (rxmngpacket->read_ops.read_u16((capwap_message_elements_handle)rxmngpacket, &type) != sizeof(uint16_t)) {
|
if (rxmngpacket->read_ops.read_u16((capwap_message_elements_handle)rxmngpacket, &type) != sizeof(uint16_t)) {
|
||||||
/* TODO */
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rxmngpacket->read_ops.read_u16((capwap_message_elements_handle)rxmngpacket, &msglength) != sizeof(uint16_t)) {
|
/* Check type */
|
||||||
/* TODO */
|
if (!IS_VALID_MESSAGE_ELEMENTS(type)) {
|
||||||
return 1;
|
return UNRECOGNIZED_MESSAGE_ELEMENT;
|
||||||
}
|
|
||||||
|
|
||||||
/* Check length */
|
|
||||||
if (msglength > bodylength) {
|
|
||||||
/* TODO */
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check binding */
|
/* Check binding */
|
||||||
if (IS_80211_MESSAGE_ELEMENTS(type) && (binding != CAPWAP_WIRELESS_BINDING_IEEE80211)) {
|
if (IS_80211_MESSAGE_ELEMENTS(type) && (binding != CAPWAP_WIRELESS_BINDING_IEEE80211)) {
|
||||||
/* TODO */
|
return UNRECOGNIZED_MESSAGE_ELEMENT;
|
||||||
return 1;
|
}
|
||||||
|
|
||||||
|
if (rxmngpacket->read_ops.read_u16((capwap_message_elements_handle)rxmngpacket, &msglength) != sizeof(uint16_t)) {
|
||||||
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Check length */
|
||||||
|
if (msglength > bodylength) {
|
||||||
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reader function */
|
/* Reader function */
|
||||||
read_ops = capwap_get_message_element_ops(type);
|
read_ops = capwap_get_message_element_ops(type);
|
||||||
if (!read_ops) {
|
if (!read_ops) {
|
||||||
/* TODO */
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allowed to parsing only the size of message element */
|
/* Allowed to parsing only the size of message element */
|
||||||
@ -245,7 +245,7 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
|
|||||||
if (category == CAPWAP_MESSAGE_ELEMENT_SINGLE) {
|
if (category == CAPWAP_MESSAGE_ELEMENT_SINGLE) {
|
||||||
/* Check for multiple message element */
|
/* Check for multiple message element */
|
||||||
if (itemlist) {
|
if (itemlist) {
|
||||||
return 1;
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create new message element */
|
/* Create new message element */
|
||||||
@ -256,7 +256,7 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
|
|||||||
messageelement->data = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
|
messageelement->data = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
|
||||||
if (!messageelement->data) {
|
if (!messageelement->data) {
|
||||||
capwap_itemlist_free(itemlist);
|
capwap_itemlist_free(itemlist);
|
||||||
return 1;
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
@ -285,7 +285,7 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
|
|||||||
/* Get message element */
|
/* Get message element */
|
||||||
datamsgelement = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
|
datamsgelement = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
|
||||||
if (!datamsgelement) {
|
if (!datamsgelement) {
|
||||||
return 1;
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
@ -294,8 +294,7 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
|
|||||||
|
|
||||||
/* Check if read all data of message element */
|
/* Check if read all data of message element */
|
||||||
if (rxmngpacket->readerpacketallowed) {
|
if (rxmngpacket->readerpacketallowed) {
|
||||||
/* TODO */
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
@ -316,15 +315,13 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
|
|||||||
|
|
||||||
/* Check length */
|
/* Check length */
|
||||||
if ((msglength + sizeof(struct capwap_message_element)) != bodylength) {
|
if ((msglength + sizeof(struct capwap_message_element)) != bodylength) {
|
||||||
/* TODO */
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allowed to parsing only the size of message element */
|
/* Allowed to parsing only the size of message element */
|
||||||
rxmngpacket->readerpacketallowed = msglength;
|
rxmngpacket->readerpacketallowed = msglength;
|
||||||
if (type != CAPWAP_ELEMENT_SESSIONID) {
|
if (type != CAPWAP_ELEMENT_SESSIONID) {
|
||||||
/* TODO */
|
return UNRECOGNIZED_MESSAGE_ELEMENT;
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Retrieve session id */
|
/* Retrieve session id */
|
||||||
@ -336,19 +333,20 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
|
|||||||
messageelement->data = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
|
messageelement->data = read_ops->parsing_message_element((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
|
||||||
if (!messageelement->data) {
|
if (!messageelement->data) {
|
||||||
capwap_itemlist_free(itemlist);
|
capwap_itemlist_free(itemlist);
|
||||||
return 1;
|
return INVALID_MESSAGE_ELEMENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
capwap_itemlist_insert_after(packet->messages, NULL, itemlist);
|
capwap_itemlist_insert_after(packet->messages, NULL, itemlist);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return PARSING_COMPLETE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct capwap_array* returnedmessage) {
|
int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct capwap_array* returnedmessage) {
|
||||||
unsigned short binding;
|
unsigned short binding;
|
||||||
|
struct capwap_resultcode_element* resultcode;
|
||||||
|
|
||||||
ASSERT(packet != NULL);
|
ASSERT(packet != NULL);
|
||||||
ASSERT(packet->rxmngpacket != NULL);
|
ASSERT(packet->rxmngpacket != NULL);
|
||||||
@ -390,6 +388,12 @@ int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct ca
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Check if packet contains Result Code with Error Message */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -433,6 +437,12 @@ int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct ca
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Check if packet contains Result Code with Error Message */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -464,6 +474,12 @@ int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct ca
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Check if packet contains Result Code with Error Message */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -592,6 +608,12 @@ int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct ca
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Check if packet contains Result Code with Error Message */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -129,6 +129,11 @@ struct capwap_parsed_packet {
|
|||||||
struct capwap_list* messages;
|
struct capwap_list* messages;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* */
|
||||||
|
#define PARSING_COMPLETE 0
|
||||||
|
#define UNRECOGNIZED_MESSAGE_ELEMENT 1
|
||||||
|
#define INVALID_MESSAGE_ELEMENT 2
|
||||||
|
|
||||||
int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap_connection* connection, struct capwap_parsed_packet* packet);
|
int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap_connection* connection, struct capwap_parsed_packet* packet);
|
||||||
int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct capwap_array* returnedmessage);
|
int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct capwap_array* returnedmessage);
|
||||||
void capwap_free_parsed_packet(struct capwap_parsed_packet* packet);
|
void capwap_free_parsed_packet(struct capwap_parsed_packet* packet);
|
||||||
|
@ -28,7 +28,9 @@
|
|||||||
#define CAPWAP_RESULTCODE_FAILURE_UNRECOGNIZED_MESSAGE_ELEMENT 21
|
#define CAPWAP_RESULTCODE_FAILURE_UNRECOGNIZED_MESSAGE_ELEMENT 21
|
||||||
#define CAPWAP_RESULTCODE_DATA_TRANSFER_ERROR 22
|
#define CAPWAP_RESULTCODE_DATA_TRANSFER_ERROR 22
|
||||||
#define CAPWAP_RESULTCODE_LAST 22
|
#define CAPWAP_RESULTCODE_LAST 22
|
||||||
|
|
||||||
|
#define CAPWAP_RESULTCODE_OK(x) (((x) == CAPWAP_RESULTCODE_SUCCESS) || ((x) == CAPWAP_RESULTCODE_SUCCESS_NAT_DETECTED))
|
||||||
|
|
||||||
struct capwap_resultcode_element {
|
struct capwap_resultcode_element {
|
||||||
uint32_t code;
|
uint32_t code;
|
||||||
};
|
};
|
||||||
|
@ -210,4 +210,7 @@ struct capwap_macaddress_eui64 {
|
|||||||
#define CAPWAP_80211_MESSAGE_ELEMENTS_COUNT ((CAPWAP_80211_MESSAGE_ELEMENTS_STOP - CAPWAP_80211_MESSAGE_ELEMENTS_START) + 1)
|
#define CAPWAP_80211_MESSAGE_ELEMENTS_COUNT ((CAPWAP_80211_MESSAGE_ELEMENTS_STOP - CAPWAP_80211_MESSAGE_ELEMENTS_START) + 1)
|
||||||
#define IS_80211_MESSAGE_ELEMENTS(x) (((x >= CAPWAP_80211_MESSAGE_ELEMENTS_START) && (x <= CAPWAP_80211_MESSAGE_ELEMENTS_STOP)) ? 1 : 0)
|
#define IS_80211_MESSAGE_ELEMENTS(x) (((x >= CAPWAP_80211_MESSAGE_ELEMENTS_START) && (x <= CAPWAP_80211_MESSAGE_ELEMENTS_STOP)) ? 1 : 0)
|
||||||
|
|
||||||
|
/* */
|
||||||
|
#define IS_VALID_MESSAGE_ELEMENTS(x) (IS_MESSAGE_ELEMENTS(x) || IS_80211_MESSAGE_ELEMENTS(x))
|
||||||
|
|
||||||
#endif /* __CAPWAP_RFC_HEADER__ */
|
#endif /* __CAPWAP_RFC_HEADER__ */
|
||||||
|
@ -46,13 +46,13 @@ void wtp_free_packet_rxmng(int isctrlmsg) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
void wtp_send_invalid_request(struct capwap_packet_rxmng* rxmngpacket, struct capwap_connection* connection) {
|
static void wtp_send_invalid_request(struct capwap_packet_rxmng* rxmngpacket, struct capwap_connection* connection, uint32_t errorcode) {
|
||||||
struct capwap_header_data capwapheader;
|
struct capwap_header_data capwapheader;
|
||||||
struct capwap_packet_txmng* txmngpacket;
|
struct capwap_packet_txmng* txmngpacket;
|
||||||
struct capwap_list* responsefragmentpacket;
|
struct capwap_list* responsefragmentpacket;
|
||||||
struct capwap_fragment_packet_item* packet;
|
struct capwap_fragment_packet_item* packet;
|
||||||
struct capwap_header* header;
|
struct capwap_header* header;
|
||||||
struct capwap_resultcode_element resultcode = { .code = CAPWAP_RESULTCODE_MSG_UNEXPECTED_UNRECOGNIZED_REQUEST };
|
struct capwap_resultcode_element resultcode = { .code = errorcode };
|
||||||
|
|
||||||
ASSERT(rxmngpacket != NULL);
|
ASSERT(rxmngpacket != NULL);
|
||||||
ASSERT(rxmngpacket->fragmentlist->first != NULL);
|
ASSERT(rxmngpacket->fragmentlist->first != NULL);
|
||||||
@ -62,7 +62,7 @@ void wtp_send_invalid_request(struct capwap_packet_rxmng* rxmngpacket, struct ca
|
|||||||
packet = (struct capwap_fragment_packet_item*)rxmngpacket->fragmentlist->first->item;
|
packet = (struct capwap_fragment_packet_item*)rxmngpacket->fragmentlist->first->item;
|
||||||
header = (struct capwap_header*)packet->buffer;
|
header = (struct capwap_header*)packet->buffer;
|
||||||
|
|
||||||
/* Odd message type, response with "Unrecognized Request" */
|
/* Odd message type */
|
||||||
capwap_header_init(&capwapheader, CAPWAP_RADIOID_NONE, GET_WBID_HEADER(header));
|
capwap_header_init(&capwapheader, CAPWAP_RADIOID_NONE, GET_WBID_HEADER(header));
|
||||||
txmngpacket = capwap_packet_txmng_create_ctrl_message(&capwapheader, rxmngpacket->ctrlmsg.type + 1, rxmngpacket->ctrlmsg.seq, g_wtp.mtu);
|
txmngpacket = capwap_packet_txmng_create_ctrl_message(&capwapheader, rxmngpacket->ctrlmsg.type + 1, rxmngpacket->ctrlmsg.seq, g_wtp.mtu);
|
||||||
|
|
||||||
@ -521,7 +521,8 @@ int wtp_dfa_running(void) {
|
|||||||
res = capwap_check_message_type(rxmngpacket);
|
res = capwap_check_message_type(rxmngpacket);
|
||||||
if (res != VALID_MESSAGE_TYPE) {
|
if (res != VALID_MESSAGE_TYPE) {
|
||||||
if (res == INVALID_REQUEST_MESSAGE_TYPE) {
|
if (res == INVALID_REQUEST_MESSAGE_TYPE) {
|
||||||
wtp_send_invalid_request(rxmngpacket, &connection);
|
capwap_logging_warning("Unexpected Unrecognized Request, send Response Packet with error");
|
||||||
|
wtp_send_invalid_request(rxmngpacket, &connection, CAPWAP_RESULTCODE_MSG_UNEXPECTED_UNRECOGNIZED_REQUEST);
|
||||||
}
|
}
|
||||||
|
|
||||||
capwap_logging_debug("Invalid message type");
|
capwap_logging_debug("Invalid message type");
|
||||||
@ -531,7 +532,15 @@ int wtp_dfa_running(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Parsing packet */
|
/* Parsing packet */
|
||||||
if (capwap_parsing_packet(rxmngpacket, &connection, &packet)) {
|
res = capwap_parsing_packet(rxmngpacket, &connection, &packet);
|
||||||
|
if (res != PARSING_COMPLETE) {
|
||||||
|
if (socket.isctrlsocket && (res == UNRECOGNIZED_MESSAGE_ELEMENT) && capwap_is_request_type(rxmngpacket->ctrlmsg.type)) {
|
||||||
|
capwap_logging_warning("Unrecognized Message Element, send Response Packet with error");
|
||||||
|
wtp_send_invalid_request(rxmngpacket, &connection, CAPWAP_RESULTCODE_FAILURE_UNRECOGNIZED_MESSAGE_ELEMENT);
|
||||||
|
/* TODO: add the unrecognized message element */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* */
|
||||||
capwap_free_parsed_packet(&packet);
|
capwap_free_parsed_packet(&packet);
|
||||||
wtp_free_packet_rxmng(socket.isctrlsocket);
|
wtp_free_packet_rxmng(socket.isctrlsocket);
|
||||||
capwap_logging_debug("Failed parsing packet");
|
capwap_logging_debug("Failed parsing packet");
|
||||||
@ -540,7 +549,12 @@ int wtp_dfa_running(void) {
|
|||||||
|
|
||||||
/* Validate packet */
|
/* Validate packet */
|
||||||
if (capwap_validate_parsed_packet(&packet, NULL)) {
|
if (capwap_validate_parsed_packet(&packet, NULL)) {
|
||||||
/* TODO gestione errore risposta */
|
if (socket.isctrlsocket && capwap_is_request_type(rxmngpacket->ctrlmsg.type)) {
|
||||||
|
capwap_logging_warning("Missing Mandatory Message Element, send Response Packet with error");
|
||||||
|
wtp_send_invalid_request(rxmngpacket, &connection, CAPWAP_RESULTCODE_FAILURE_MISSING_MANDATORY_MSG_ELEMENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* */
|
||||||
capwap_free_parsed_packet(&packet);
|
capwap_free_parsed_packet(&packet);
|
||||||
wtp_free_packet_rxmng(socket.isctrlsocket);
|
wtp_free_packet_rxmng(socket.isctrlsocket);
|
||||||
capwap_logging_debug("Failed validation parsed packet");
|
capwap_logging_debug("Failed validation parsed packet");
|
||||||
|
@ -8,6 +8,14 @@
|
|||||||
/* */
|
/* */
|
||||||
static unsigned long wtp_configure_ac(struct capwap_parsed_packet* packet) {
|
static unsigned long wtp_configure_ac(struct capwap_parsed_packet* packet) {
|
||||||
struct capwap_timers_element* timers;
|
struct capwap_timers_element* timers;
|
||||||
|
struct capwap_resultcode_element* resultcode;
|
||||||
|
|
||||||
|
/* Check the success of the Request */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
capwap_logging_warning("Receive Configure Status Response with error: %d", (int)resultcode->code);
|
||||||
|
return CAPWAP_CONFIGURE_TO_DTLS_TEARDOWN_STATE;
|
||||||
|
}
|
||||||
|
|
||||||
/* TODO: gestione richiesta */
|
/* TODO: gestione richiesta */
|
||||||
|
|
||||||
|
@ -5,6 +5,15 @@
|
|||||||
|
|
||||||
/* */
|
/* */
|
||||||
static unsigned long wtp_datacheck_ac(struct capwap_parsed_packet* packet) {
|
static unsigned long wtp_datacheck_ac(struct capwap_parsed_packet* packet) {
|
||||||
|
struct capwap_resultcode_element* resultcode;
|
||||||
|
|
||||||
|
/* Check the success of the Request */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
capwap_logging_warning("Receive Data Check Response with error: %d", (int)resultcode->code);
|
||||||
|
return CAPWAP_DATA_CHECK_TO_DTLS_TEARDOWN_STATE;
|
||||||
|
}
|
||||||
|
|
||||||
/* TODO: gestione richiesta */
|
/* TODO: gestione richiesta */
|
||||||
|
|
||||||
return CAPWAP_DATA_CHECK_TO_RUN_STATE;
|
return CAPWAP_DATA_CHECK_TO_RUN_STATE;
|
||||||
|
@ -33,32 +33,38 @@ int wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout_
|
|||||||
/* */
|
/* */
|
||||||
binding = GET_WBID_HEADER(packet->rxmngpacket->header);
|
binding = GET_WBID_HEADER(packet->rxmngpacket->header);
|
||||||
if (packet->rxmngpacket->isctrlpacket && (binding == g_wtp.binding) && (packet->rxmngpacket->ctrlmsg.type == CAPWAP_DISCOVERY_RESPONSE) && ((g_wtp.localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) {
|
if (packet->rxmngpacket->isctrlpacket && (binding == g_wtp.binding) && (packet->rxmngpacket->ctrlmsg.type == CAPWAP_DISCOVERY_RESPONSE) && ((g_wtp.localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) {
|
||||||
int i;
|
struct capwap_resultcode_element* resultcode;
|
||||||
struct wtp_discovery_response* response = (struct wtp_discovery_response*)capwap_array_get_item_pointer(g_wtp.acdiscoveryresponse, g_wtp.acdiscoveryresponse->count);
|
|
||||||
|
|
||||||
/* */
|
/* Check the success of the Request */
|
||||||
response->controlipv4 = capwap_array_create(sizeof(struct capwap_controlipv4_element), 0, 0);
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
response->controlipv6 = capwap_array_create(sizeof(struct capwap_controlipv6_element), 0, 0);
|
if (!resultcode || CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
int i;
|
||||||
|
struct wtp_discovery_response* response = (struct wtp_discovery_response*)capwap_array_get_item_pointer(g_wtp.acdiscoveryresponse, g_wtp.acdiscoveryresponse->count);
|
||||||
|
|
||||||
/* Create controlipv4 */
|
/* */
|
||||||
controlip = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_CONTROLIPV4);
|
response->controlipv4 = capwap_array_create(sizeof(struct capwap_controlipv4_element), 0, 0);
|
||||||
if (controlip) {
|
response->controlipv6 = capwap_array_create(sizeof(struct capwap_controlipv6_element), 0, 0);
|
||||||
for (i = 0; i < controlip->count; i++) {
|
|
||||||
struct capwap_controlipv4_element* src = *(struct capwap_controlipv4_element**)capwap_array_get_item_pointer(controlip, i);
|
|
||||||
struct capwap_controlipv4_element* dst = (struct capwap_controlipv4_element*)capwap_array_get_item_pointer(response->controlipv4, i);
|
|
||||||
|
|
||||||
memcpy(dst, src, sizeof(struct capwap_controlipv4_element));
|
/* Create controlipv4 */
|
||||||
|
controlip = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_CONTROLIPV4);
|
||||||
|
if (controlip) {
|
||||||
|
for (i = 0; i < controlip->count; i++) {
|
||||||
|
struct capwap_controlipv4_element* src = *(struct capwap_controlipv4_element**)capwap_array_get_item_pointer(controlip, i);
|
||||||
|
struct capwap_controlipv4_element* dst = (struct capwap_controlipv4_element*)capwap_array_get_item_pointer(response->controlipv4, i);
|
||||||
|
|
||||||
|
memcpy(dst, src, sizeof(struct capwap_controlipv4_element));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* Create controlipv6 */
|
/* Create controlipv6 */
|
||||||
controlip = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_CONTROLIPV6);
|
controlip = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_CONTROLIPV6);
|
||||||
if (controlip) {
|
if (controlip) {
|
||||||
for (i = 0; i < (controlip)->count; i++) {
|
for (i = 0; i < (controlip)->count; i++) {
|
||||||
struct capwap_controlipv6_element* src = *(struct capwap_controlipv6_element**)capwap_array_get_item_pointer((controlip), i);
|
struct capwap_controlipv6_element* src = *(struct capwap_controlipv6_element**)capwap_array_get_item_pointer((controlip), i);
|
||||||
struct capwap_controlipv6_element* dst = (struct capwap_controlipv6_element*)capwap_array_get_item_pointer(response->controlipv6, i);
|
struct capwap_controlipv6_element* dst = (struct capwap_controlipv6_element*)capwap_array_get_item_pointer(response->controlipv6, i);
|
||||||
|
|
||||||
memcpy(dst, src, sizeof(struct capwap_controlipv6_element));
|
memcpy(dst, src, sizeof(struct capwap_controlipv6_element));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,14 @@
|
|||||||
static unsigned long wtp_join_ac(struct capwap_parsed_packet* packet) {
|
static unsigned long wtp_join_ac(struct capwap_parsed_packet* packet) {
|
||||||
struct capwap_acdescriptor_element* acdescriptor;
|
struct capwap_acdescriptor_element* acdescriptor;
|
||||||
struct capwap_acname_element* acname;
|
struct capwap_acname_element* acname;
|
||||||
|
struct capwap_resultcode_element* resultcode;
|
||||||
|
|
||||||
|
/* Check the success of the Request */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
capwap_logging_warning("Receive Join Response with error: %d", (int)resultcode->code);
|
||||||
|
return CAPWAP_JOIN_TO_DTLS_TEARDOWN_STATE;
|
||||||
|
}
|
||||||
|
|
||||||
/* TODO: gestione richiesta
|
/* TODO: gestione richiesta
|
||||||
CAPWAP_JOIN_TO_IMAGE_DATA_STATE <-> CAPWAP_JOIN_TO_CONFIGURE_STATE
|
CAPWAP_JOIN_TO_IMAGE_DATA_STATE <-> CAPWAP_JOIN_TO_CONFIGURE_STATE
|
||||||
|
@ -40,8 +40,17 @@ static int send_echo_request() {
|
|||||||
|
|
||||||
/* */
|
/* */
|
||||||
static int receive_echo_response(struct capwap_parsed_packet* packet) {
|
static int receive_echo_response(struct capwap_parsed_packet* packet) {
|
||||||
|
struct capwap_resultcode_element* resultcode;
|
||||||
|
|
||||||
ASSERT(packet != NULL);
|
ASSERT(packet != NULL);
|
||||||
|
|
||||||
|
/* Check the success of the Request */
|
||||||
|
resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE);
|
||||||
|
if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) {
|
||||||
|
capwap_logging_warning("Receive Echo Response with error: %d", (int)resultcode->code);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* Valid packet, free request packet */
|
/* Valid packet, free request packet */
|
||||||
wtp_free_reference_last_request();
|
wtp_free_reference_last_request();
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -26,6 +26,14 @@
|
|||||||
<wsdl:message name="authorizeJoinResponse"/>
|
<wsdl:message name="authorizeJoinResponse"/>
|
||||||
<wsdl:message name="waitBackendEventFault"/>
|
<wsdl:message name="waitBackendEventFault"/>
|
||||||
<wsdl:message name="authorizeJoinFault"/>
|
<wsdl:message name="authorizeJoinFault"/>
|
||||||
|
<wsdl:message name="configureStatus">
|
||||||
|
<wsdl:part name="sessionid" type="xs:string"/>
|
||||||
|
<wsdl:part name="wtpid" type="xs:string"/>
|
||||||
|
<wsdl:part name="confstatus" type="xs:base64Binary"/>
|
||||||
|
</wsdl:message>
|
||||||
|
<wsdl:message name="configureStatusResponse">
|
||||||
|
<wsdl:part name="return" type="xs:base64Binary"/>
|
||||||
|
</wsdl:message>
|
||||||
<wsdl:portType name="Presence">
|
<wsdl:portType name="Presence">
|
||||||
<wsdl:operation name="joinBackend">
|
<wsdl:operation name="joinBackend">
|
||||||
<wsdl:input message="tns:joinBackend"/>
|
<wsdl:input message="tns:joinBackend"/>
|
||||||
@ -40,14 +48,16 @@
|
|||||||
<wsdl:operation name="waitBackendEvent">
|
<wsdl:operation name="waitBackendEvent">
|
||||||
<wsdl:input message="tns:waitBackendEvent"/>
|
<wsdl:input message="tns:waitBackendEvent"/>
|
||||||
<wsdl:output message="tns:waitBackendEventResponse"/>
|
<wsdl:output message="tns:waitBackendEventResponse"/>
|
||||||
<wsdl:fault name="waitBackendEventFault" message="tns:waitBackendEventFault"/>
|
|
||||||
</wsdl:operation>
|
</wsdl:operation>
|
||||||
</wsdl:portType>
|
</wsdl:portType>
|
||||||
<wsdl:portType name="AccessController">
|
<wsdl:portType name="AccessController">
|
||||||
<wsdl:operation name="authorizeJoin">
|
<wsdl:operation name="authorizeJoin">
|
||||||
<wsdl:input message="tns:authorizeJoin"/>
|
<wsdl:input message="tns:authorizeJoin"/>
|
||||||
<wsdl:output message="tns:authorizeJoinResponse"/>
|
<wsdl:output message="tns:authorizeJoinResponse"/>
|
||||||
<wsdl:fault name="authorizeJoinFault" message="tns:authorizeJoinFault"/>
|
</wsdl:operation>
|
||||||
|
<wsdl:operation name="configureStatus">
|
||||||
|
<wsdl:input message="tns:configureStatus"/>
|
||||||
|
<wsdl:output message="tns:configureStatusResponse"/>
|
||||||
</wsdl:operation>
|
</wsdl:operation>
|
||||||
</wsdl:portType>
|
</wsdl:portType>
|
||||||
<wsdl:binding name="Presence" type="tns:Presence">
|
<wsdl:binding name="Presence" type="tns:Presence">
|
||||||
@ -81,7 +91,6 @@
|
|||||||
<wsdl:output>
|
<wsdl:output>
|
||||||
<soap:body use="literal"/>
|
<soap:body use="literal"/>
|
||||||
</wsdl:output>
|
</wsdl:output>
|
||||||
<wsdl:fault name="waitBackendEventFault"/>
|
|
||||||
</wsdl:operation>
|
</wsdl:operation>
|
||||||
</wsdl:binding>
|
</wsdl:binding>
|
||||||
<wsdl:binding name="AccessController" type="tns:AccessController">
|
<wsdl:binding name="AccessController" type="tns:AccessController">
|
||||||
@ -94,7 +103,15 @@
|
|||||||
<wsdl:output>
|
<wsdl:output>
|
||||||
<soap:body use="literal"/>
|
<soap:body use="literal"/>
|
||||||
</wsdl:output>
|
</wsdl:output>
|
||||||
<wsdl:fault name="authorizeJoinFault"/>
|
</wsdl:operation>
|
||||||
|
<wsdl:operation name="configureStatus">
|
||||||
|
<soap:operation soapAction="urn:#NewOperation"/>
|
||||||
|
<wsdl:input>
|
||||||
|
<soap:body use="literal"/>
|
||||||
|
</wsdl:input>
|
||||||
|
<wsdl:output>
|
||||||
|
<soap:body use="literal"/>
|
||||||
|
</wsdl:output>
|
||||||
</wsdl:operation>
|
</wsdl:operation>
|
||||||
</wsdl:binding>
|
</wsdl:binding>
|
||||||
<wsdl:service name="SmartCAPWAP">
|
<wsdl:service name="SmartCAPWAP">
|
||||||
|
Loading…
Reference in New Issue
Block a user