diff --git a/src/ac/conf.h b/src/ac/conf.h index bf56a71b..594a7dcf 100644 --- a/src/ac/conf.h +++ b/src/ac/conf.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/src/ac/config.ckv b/src/ac/config.ckv index 4a49d347..7a98aec5 100644 --- a/src/ac/config.ckv +++ b/src/ac/config.ckv @@ -12,6 +12,8 @@ capwap/ssl-cipher: DHE-RSA:RSA:AES-256-CBC:AES-128-CBC:SHA1:PSK capwap/ssl-psk-enable: false capwap/ssl-psk: 123456 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" diff --git a/src/mod/capwap/mod_capwap_ac.c b/src/mod/capwap/mod_capwap_ac.c index b72b928e..bf3ab388 100644 --- a/src/mod/capwap/mod_capwap_ac.c +++ b/src/mod/capwap/mod_capwap_ac.c @@ -49,6 +49,7 @@ int static setup_cfg(struct cw_Conn * conn) int security; security = cw_setup_dtls(conn,conn->local_cfg,"capwap",CAPWAP_CIPHER); + printf ("ROLE: %d\n",conn->role); stop(); // cw_ktv_set_byte(conn->local_cfg,"ac-descriptor/security",security); diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index 235a8f84..e287f284 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -175,7 +175,8 @@ int main (int argc, char **argv) // cw_run_discovery(conn, "192.168.0.162","192.168.0.14", &dis); //cw_run_discovery(conn, "255.255.255.255","192.168.0.14", &dis); // cw_run_discovery(conn, "192.168.0.255","192.168.0.14", &dis); - results = cw_run_discovery(conn, "255.255.255.255","192.168.0.14"); + //results = cw_run_discovery(conn, "255.255.255.255","192.168.0.14"); + results = cw_run_discovery(conn, "255.255.255.255","172.16.67.119"); if (!join(conn,results)){ cw_discovery_results_destroy(results);