diff --git a/src/ac/config.ckv b/src/ac/config.ckv index 91775fec..cc92e684 100644 --- a/src/ac/config.ckv +++ b/src/ac/config.ckv @@ -15,11 +15,15 @@ capwap/ssl-dhbits: 1024 capwap/ssl-keyfile: "../../ssl/intermediate-ca/int-ca.key" capwap/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt" -cisco/ssl-keyfile: "../../ssl/intermediate-ca/int-ca.key" -cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt" +#mod/cisco/ssl-keyfile: "../../ssl/intermediate-ca/int-ca.key" +#mod/cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt" +# +mod/cisco/ssl-keyfile: "../../ssl/certs/ac-cisco.key" +mod/cisco/ssl-certfile: "../../ssl/certs/ac-cisco.pem" + #cisco/ssl-cipher: DEFAULT -cisco/ssl-cipher: RSA -cisco/ssl-dhbits: 2048 +mod/cisco/ssl-cipher: RSA +mod/cisco/ssl-dhbits: 2048 @@ -112,7 +116,7 @@ radio-cfg-a/cisco/direct-sequence-control/current-channel: 1 radio-cfg-a/cisco/direct-sequence-control/energy-detect-threshold: -50 #mode-802.11g support -radio-cfg-a/cisco/direct-sequence-control/unknown: 1 +#radio-cfg-a/cisco/direct-sequence-control/unknown: 1 radio-cfg-a/cisco/mac-operation/fragmentation-threshold: 2346 diff --git a/src/mod/cisco/mod_cisco.c b/src/mod/cisco/mod_cisco.c index 4887bb49..e938b4d3 100644 --- a/src/mod/cisco/mod_cisco.c +++ b/src/mod/cisco/mod_cisco.c @@ -388,7 +388,7 @@ static cw_ValStruct_t cisco_direct_sequence_control70[]={ {CW_TYPE_BYTE,"current-channel",1,-1}, {CW_TYPE_BYTE,"current-cca-mode",1,-1}, {CW_TYPE_DWORD,"energy-detect-threshold",4,-1}, - {CW_TYPE_BYTE,"unknown",1,-1}, + {CW_TYPE_BOOL,"802.11g-support",1,-1}, {NULL,NULL,0,0} }; @@ -3329,8 +3329,6 @@ static int copy_diff_cfg(cw_Cfg_t * new, cw_Cfg_t *old , cw_Cfg_t *dst) struct cw_Cfg_iter cfi; struct cw_Cfg_entry *e; - cw_cfg_dump(new); - cw_cfg_iter_init(new, &cfi, NULL); while ((e = cw_cfg_iter_next(&cfi, NULL))!=NULL){ const char * r; @@ -3432,15 +3430,8 @@ static int status_cb_ac(struct cw_ElemHandlerParams *params, struct cw_MsgCb_dat } - printf("----\n"); - cw_cfg_dump(tmp_cfg); - printf("----\n"); -// stop(); - copy_diff_cfg(tmp_cfg,params->conn->remote_cfg, params->conn->update_cfg); - cw_cfg_dump(params->conn->update_cfg); - cw_cfg_destroy(tmp_cfg); @@ -3458,7 +3449,7 @@ static int setup_cfg(struct cw_Conn * conn) { int security; - security = cw_setup_dtls(conn,conn->global_cfg,"cisco",CAPWAP_CIPHER); + security = cw_setup_dtls(conn,conn->global_cfg,"mod/cisco",CAPWAP_CIPHER); if (conn->role == CW_ROLE_AC){ cw_cfg_set_int(conn->local_cfg,"capwap/ac-descriptor/security",security);