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

Work on tls

Browse Source 
FossilOrigin-Name: 2286672aca872a4f9a56df10e68669c21a2bfa3ab9d3f321a59a94b7eba8ed36
This commit is contained in:
7u83@mail.ru
2018-04-02 06:17:36 +00:00
parent fb7331173e
commit 284c81f1a8
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actube.workspace
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="actube" Database=""> <CodeLite_Workspace Name="actube" Database="">
<Project Name="ac" Path="ac.project" Active="No"/> <Project Name="ac" Path="ac.project" Active="Yes"/>
<Project Name="wtp" Path="wtp.project" Active="No"/> <Project Name="wtp" Path="wtp.project" Active="No"/>
<Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/> <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
<Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/> <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
<Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/> <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
<Project Name="libcw" Path="libcw.project" Active="Yes"/> <Project Name="libcw" Path="libcw.project" Active="No"/>
<Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/> <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
<Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/> <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
<BuildMatrix> <BuildMatrix>

2
src/wtp/config.ktv
View File

@ -4,7 +4,7 @@
capwap/ssl-certfile:Str:"../../ssl/certs/wtp.crt" capwap/ssl-certfile:Str:"../../ssl/certs/wtp.crt"
capwap/ssl-keyfile:Str:"../../ssl/certs/wtp.key" 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-certfile:Str:"../../ssl/certs/wtp.crt"
cisco/ssl-keyfile:Str:"../../ssl/certs/wtp.key" cisco/ssl-keyfile:Str:"../../ssl/certs/wtp.key"

8
src/wtp/join.c
View File

@ -109,8 +109,10 @@ int run_join_d(struct conn * conn, struct sockaddr *sa)
printf("JOINFD: %s\n",sock_addr2str_p(sa,addrstr)); 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); 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); 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) 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_t ii;
mavliter_init(&ii,dis->prio_ip); mavliter_init(&ii,dis->prio_ip);

3
src/wtp/wtp_main.c
View File

@ -165,8 +165,9 @@ int main (int argc, char **argv)
cw_discovery_init_results(&dis); 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 ==="); cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ===");
*/
/* /*
{ {
mavliter_t i; mavliter_t i;