diff --git a/actube.workspace b/actube.workspace index e0162c79..b21adfd1 100644 --- a/actube.workspace +++ b/actube.workspace @@ -1,11 +1,11 @@ - + - + diff --git a/src/wtp/config.ktv b/src/wtp/config.ktv index b34edd83..08dc2410 100644 --- a/src/wtp/config.ktv +++ b/src/wtp/config.ktv @@ -4,7 +4,7 @@ capwap/ssl-certfile:Str:"../../ssl/certs/wtp.crt" capwap/ssl-keyfile:Str:"../../ssl/certs/wtp.key" -capwap/ssl-cipher:Str:ALL +capwap/ssl-cipher:Str:NORMAL cisco/ssl-certfile:Str:"../../ssl/certs/wtp.crt" cisco/ssl-keyfile:Str:"../../ssl/certs/wtp.key" diff --git a/src/wtp/join.c b/src/wtp/join.c index 2217041b..083a2cc9 100644 --- a/src/wtp/join.c +++ b/src/wtp/join.c @@ -109,8 +109,10 @@ int run_join_d(struct conn * conn, struct sockaddr *sa) printf("JOINFD: %s\n",sock_addr2str_p(sa,addrstr)); - lsec = cw_ktv_get_byte(conn->local_cfg,"ac-descriptor/security",0); +/* lsec = cw_ktv_get_byte(conn->local_cfg,"ac-descriptor/security",0); rsec = cw_ktv_get_byte(conn->remote_cfg,"ac-descriptor/security",0); +*/ +lsec = rsec =4; printf("Anding my and remote %d %d %d\n",lsec,rsec, rsec & lsec); @@ -239,6 +241,10 @@ int run_join(struct conn *conn) int join(struct conn * conn, struct cw_DiscoveryResult * dis) { +struct sockaddr_storage s; +sock_strtoaddr("192.168.0.14:5246",(struct sockaddr*)&s); +run_join_d(conn,(struct sockaddr*)&s); +exit(0); mavliter_t ii; mavliter_init(&ii,dis->prio_ip); diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index aa14e4c5..bc46b0ff 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -165,8 +165,9 @@ int main (int argc, char **argv) cw_discovery_init_results(&dis); - cw_run_discovery(conn, "255.255.255.255",NULL, &dis); +/* cw_run_discovery(conn, "255.255.255.255",NULL, &dis); cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ==="); +*/ /* { mavliter_t i;