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

Fix management controlip message element into discovery state

Browse Source
This commit is contained in:
vemax78 2013-06-09 21:46:38 +02:00
parent 794a8e72d2
commit 00cd4f8511
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ac/ac_discovery.c
View File

@ -203,6 +203,9 @@ static void ac_discovery_run(void) {
if (!capwap_validate_parsed_packet(&packet, NULL)) {
struct capwap_packet_txmng* txmngpacket;
/* */
capwap_logging_debug("Receive discovery request packet");
/* Creare discovery response */
txmngpacket = ac_create_discovery_response(&packet);
if (txmngpacket) {

8
src/wtp/wtp_dfa_discovery.c
View File

@ -36,10 +36,13 @@ int wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout_
int i;
struct wtp_discovery_response* response = (struct wtp_discovery_response*)capwap_array_get_item_pointer(g_wtp.acdiscoveryresponse, g_wtp.acdiscoveryresponse->count);
/* */
response->controlipv4 = capwap_array_create(sizeof(struct capwap_controlipv4_element), 0, 0);
response->controlipv6 = capwap_array_create(sizeof(struct capwap_controlipv6_element), 0, 0);
/* Create controlipv4 */
controlip = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_CONTROLIPV4);
if (controlip) {
response->controlipv4 = capwap_array_create(sizeof(struct capwap_controlipv4_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);
@ -51,7 +54,6 @@ int wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout_
/* Create controlipv6 */
controlip = (struct capwap_array*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_CONTROLIPV6);
if (controlip) {
response->controlipv6 = capwap_array_create(sizeof(struct capwap_controlipv6_element), 0, 0);
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* dst = (struct capwap_controlipv6_element*)capwap_array_get_item_pointer(response->controlipv6, i);
@ -82,6 +84,7 @@ int wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout_
struct capwap_controlipv4_element* controlipv4 = (struct capwap_controlipv4_element*)capwap_array_get_item_pointer(response->controlipv4, w);
/* Create IPv4 address */
memset(&checkaddr, 0, sizeof(struct sockaddr_storage));
checkaddripv4 = (struct sockaddr_in*)&checkaddr;
checkaddripv4->sin_family = AF_INET;
checkaddripv4->sin_port = htons(CAPWAP_CONTROL_PORT);
@ -118,6 +121,7 @@ int wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout_
struct capwap_controlipv6_element* controlipv6 = (struct capwap_controlipv6_element*)capwap_array_get_item_pointer(response->controlipv6, w);
/* Create IPv6 address */
memset(&checkaddr, 0, sizeof(struct sockaddr_storage));
checkaddripv6 = (struct sockaddr_in6*)&checkaddr;
checkaddripv6->sin6_family = AF_INET6;
checkaddripv6->sin6_port = htons(CAPWAP_CONTROL_PORT);