planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New Msg elements.

Browse Source 
FossilOrigin-Name: da49daaf31e87aedf07df5cbb40ec0ebdb7c2c4d4ea4370b84cfe2d5a86306b7
This commit is contained in:
7u83@mail.ru
2015-04-26 21:52:11 +00:00
parent fef05e5f37
commit d6aa56ded4
15 changed files with 287 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ac/ac_main.c
View File

@ -165,9 +165,11 @@ int main (int argc, const char * argv[])
/* Locad CAPWAP base protocol */
if (conf_capwap_mode==CW_MODE_CIPWAP){
cw_dbg(DBG_INFO,"Locading CIPWAP Aactions");
cw_register_actions_cipwap_ac(&capwap_actions);
}
else {
cw_dbg(DBG_INFO,"Locading standard CAPWAP Aactions");
cw_register_actions_capwap_ac(&capwap_actions);
}

2
src/ac/conf.c
View File

@ -36,7 +36,7 @@ uint8_t conf_macaddress_len=0;
long conf_strict_capwap=1;
long conf_strict_headers=1;
long conf_strict_headers=0;
char * conf_capwap_mode_str=NULL;
int conf_capwap_mode=CW_MODE_STD;

15
src/ac/wtpman.c
View File

@ -110,9 +110,8 @@ static void wtpman_run_discovery(void *arg)
struct conn * conn = wtpman->conn;
conn->capwap_mode=CW_MODE_CIPWAP;
conn->config = mbag_create();
conn->radios = mbag_create();
//conn->config = mbag_create();
//conn->radios = mbag_create();
time_t timer = cw_timer_start(10);
@ -129,7 +128,6 @@ conn->radios = mbag_create();
*/
wtpman->conn->local = ac_config;
wtpman->conn->outgoing = mbag_create();
wtpman->conn->incomming = mbag_create();
@ -226,7 +224,7 @@ static int wtpman_join(void *arg, time_t timer)
wtpman->conn->outgoing = mbag_create();
wtpman->conn->incomming = mbag_create();
wtpman->conn->local = ac_config;
// wtpman->conn->local = ac_config;
mbag_set_str(conn->local,CW_ITEM_AC_NAME,conf_acname);
@ -440,8 +438,7 @@ static void wtpman_run(void *arg)
conn->capwap_state=CW_STATE_RUN;
rc = 0;
while (!cw_timer_timeout(timer)
&& wtpman->conn->capwap_state == CW_STATE_RUN) {
while (wtpman->conn->capwap_state == CW_STATE_RUN) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno != EAGAIN)
@ -485,6 +482,10 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr)
wtpman->conn->strict_capwap = conf_strict_capwap;
wtpman->conn->strict_hdr = conf_strict_headers;
wtpman->conn->radios=mbag_create();
wtpman->conn->local = ac_config;
wtpman->conn->capwap_mode=0; //CW_MODE_STD; //CISCO;
wtpman->conn->capwap_mode=CW_MODE_CISCO;
//wtpman->conn->strict_capwap_hdr=0;
return wtpman;
}