7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix capwap protocol and optional wireless information header.

Browse Source 
Complete IEEE802.11 frames tunnel WTP side.
Now WTP can send data packets to the AC.
This commit is contained in:
vemax78
2014-06-09 22:30:04 +02:00
parent 67daa8dcbb
commit 089a044f3f
16 changed files with 405 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/capwap_protocol.c
View File

@ -202,7 +202,7 @@ void capwap_header_init(struct capwap_header_data* data, unsigned short radioid,
}
/* */
void capwap_header_set_radio_macaddress(struct capwap_header_data* data, int radiotype, char* macaddress) {
void capwap_header_set_radio_macaddress(struct capwap_header_data* data, int radiotype, const uint8_t* macaddress) {
struct capwap_header* header;
ASSERT(data != NULL);
@ -288,6 +288,7 @@ void capwap_header_set_wireless_information(struct capwap_header_data* data, voi
/* Remove old wireless information */
if (IS_FLAG_W_HEADER(header)) {
SET_FLAG_W_HEADER(header, 0);
SET_HLEN_HEADER(header, size);
}
@ -308,6 +309,7 @@ void capwap_header_set_wireless_information(struct capwap_header_data* data, voi
/* Update size */
size += lengthpadded;
SET_FLAG_W_HEADER(header, 1);
SET_HLEN_HEADER(header, size);
}
}

2
src/common/capwap_protocol.h
View File

@ -31,7 +31,7 @@ struct capwap_header_data {
};
void capwap_header_init(struct capwap_header_data* data, unsigned short radioid, unsigned short binding);
void capwap_header_set_radio_macaddress(struct capwap_header_data* data, int radiotype, char* macaddress);
void capwap_header_set_radio_macaddress(struct capwap_header_data* data, int radiotype, const uint8_t* macaddress);
void capwap_header_set_wireless_information(struct capwap_header_data* data, void* buffer, unsigned char length);
void capwap_header_set_keepalive_flag(struct capwap_header_data* data, int enable);
void capwap_header_set_nativeframe_flag(struct capwap_header_data* data, int enable);

25
src/common/capwap_rfc.h
View File

@ -71,20 +71,27 @@ struct capwap_header {
/* Mac Address */
struct capwap_mac_address {
uint8_t length;
int8_t address[0];
uint8_t address[0];
} STRUCT_PACKED;
/* Wireless Information */
struct capwap_wireless_information {
uint8_t length;
int8_t data[0];
uint8_t data[0];
} STRUCT_PACKED;
/* IEEE802.11 Wireless Information */
struct capwap_ieee80211_frame_info {
uint8_t rssi;
uint8_t snr;
uint16_t rate;
} STRUCT_PACKED;
/* Message element */
struct capwap_message_element {
uint16_t type;
uint16_t length;
int8_t data[0];
uint8_t data[0];
} STRUCT_PACKED;
/* Control Message Type */
@ -132,7 +139,7 @@ struct capwap_control_message {
uint8_t seq;
uint16_t length;
uint8_t flags;
int8_t elements[0];
uint8_t elements[0];
} STRUCT_PACKED;
/* Data Message Keep-Alive*/
@ -140,11 +147,11 @@ struct capwap_control_message {
struct capwap_data_message {
uint16_t length;
int8_t elements[0];
uint8_t elements[0];
} STRUCT_PACKED;
/* Capwap dtls header helper */
#define GET_DTLS_BODY(x) (void*)(((int8_t*)(x)) + sizeof(struct capwap_dtls_header))
#define GET_DTLS_BODY(x) (void*)(((uint8_t*)(x)) + sizeof(struct capwap_dtls_header))
/* Capwap header helper */
#define GET_VERSION_HEADER(x) ((x)->preamble.version)
@ -182,9 +189,9 @@ struct capwap_data_message {
#define GET_FRAGMENT_OFFSET_HEADER(x) (ntohs((x)->frag_off) & FRAGMENT_OFFSET_MASK)
#define SET_FRAGMENT_OFFSET_HEADER(x, y) ((x)->frag_off &= ~FRAGMENT_OFFSET_MASK, (x)->frag_off |= htons((uint16_t)(y) & FRAGMENT_OFFSET_MASK))
#define GET_RADIO_MAC_ADDRESS_STRUCT(x) ((struct capwap_mac_address*)(((int8_t*)(x)) + sizeof(struct capwap_header)))
#define GET_WIRELESS_INFORMATION_STRUCT(x) ((struct capwap_wireless_information*)(((int8_t*)(x)) + sizeof(struct capwap_header) + (IS_FLAG_M_HEADER(x) ? (((GET_RADIO_MAC_ADDRESS_STRUCT(x)->length + sizeof(struct capwap_mac_address)) + 3) / 4) * 4 : 0)))
#define GET_PAYLOAD_HEADER(x) ((void*)(((int8_t*)(x)) + GET_HLEN_HEADER(x) * 4))
#define GET_RADIO_MAC_ADDRESS_STRUCT(x) ((struct capwap_mac_address*)(((uint8_t*)(x)) + sizeof(struct capwap_header)))
#define GET_WIRELESS_INFORMATION_STRUCT(x) ((struct capwap_wireless_information*)(((uint8_t*)(x)) + sizeof(struct capwap_header) + (IS_FLAG_M_HEADER(x) ? (((GET_RADIO_MAC_ADDRESS_STRUCT(x)->length + sizeof(struct capwap_mac_address)) + 3) / 4) * 4 : 0)))
#define GET_PAYLOAD_HEADER(x) ((void*)(((uint8_t*)(x)) + GET_HLEN_HEADER(x) * 4))
#define IS_SEQUENCE_SMALLER(s1, s2) (((((s1) < (s2)) && (((s2) - (s1)) < 128)) || (((s1) > (s2)) && (((s1) - (s2)) > 128))) ? 1 : 0)