More strict capwap actube and wtp.
FossilOrigin-Name: 73d6e8e84bdf334760945de51e4f4f4b14e15a34fed5477700e3bb388aa4b727
This commit is contained in:
@ -168,12 +168,19 @@ int run_join(struct conn * conn)
|
||||
int rc = cw_send_request(conn,CW_MSG_JOIN_REQUEST);
|
||||
|
||||
if (!cw_rcok(rc) ) {
|
||||
cw_log(LOG_ERR,"Can't Join AC at %s: %d - %s.",
|
||||
if (rc>0 ){
|
||||
cw_log(LOG_ERR,"Can't Join AC at %s, AC said: %d - %s.",
|
||||
sock_addr2str(&conn->addr),rc,cw_strerror(rc));
|
||||
|
||||
}
|
||||
else{
|
||||
cw_log(LOG_ERR,"Can't Join AC at %s: %d - %s.",
|
||||
sock_addr2str(&conn->addr),errno,cw_strerror(rc));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
cw_dbg(DBG_ELEM,"Join Result: %d - %s",rc,cw_strresult(rc));
|
||||
cw_dbg(DBG_ELEM,"Joined AC at %s, Join Result: %d - %s",sock_addr2str(&conn->addr),rc,cw_strresult(rc));
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -183,7 +190,6 @@ int run_join(struct conn * conn)
|
||||
int join()
|
||||
{
|
||||
struct conn * conn = get_conn();
|
||||
conn->capwap_mode=CW_MODE_CISCO;
|
||||
|
||||
cw_aciplist_t iplist = mbag_get_avltree(conn->local,CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST);
|
||||
if (!iplist){
|
||||
|
@ -111,7 +111,7 @@ mavl_destroy(b);
|
||||
|
||||
|
||||
|
||||
cw_register_actions_cipwap_wtp(&capwap_actions);
|
||||
cw_register_actions_capwap_wtp(&capwap_actions);
|
||||
cw_register_actions_capwap_80211_wtp(&capwap_actions);
|
||||
|
||||
|
||||
@ -130,7 +130,10 @@ mavl_destroy(b);
|
||||
conn->incomming = mbag_create();
|
||||
conn->local = mbag_create();
|
||||
conn->base_rmac=get_base_rmac();
|
||||
conn->capwap_mode = CW_MODE_CISCO;
|
||||
|
||||
conn->capwap_mode = CW_MODE_STD;
|
||||
the_conn->strict_capwap=1;
|
||||
|
||||
|
||||
conn->config=mbag_create();
|
||||
|
||||
@ -168,7 +171,6 @@ cw_set_msg_end_callback(conn,CW_STATE_CONFIGURE,CW_MSG_CONFIGURATION_STATUS_RESP
|
||||
|
||||
|
||||
|
||||
the_conn->strict_capwap=1;
|
||||
if (!discovery())
|
||||
return -1;
|
||||
if (!join())
|
||||
|
Reference in New Issue
Block a user