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

Work on data channel

Browse Source
This commit is contained in:
7u83
2022-09-12 00:28:58 +02:00
parent bc5dea6016
commit 259c6c5e66
22 changed files with 526 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ac/Makefile
View File

@ -9,6 +9,7 @@ OBJS = \
discovery_cache.o\
rpc.o\
statemachine.o\
hapd.o
ACTOBJS = \
act.o
@ -26,8 +27,10 @@ LIBS+=-lnettle
LIBS+=-lssl
LIBS+=-lcrypto
LIBS+=-ledit
LIBS+=-lwifi
#LIBS+=-l:libhapd.a
INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include -I../../include/hostapd -I../../include/hostapd/utils
#FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(KERNEL)/$(ARCH)"'

1
src/ac/ac.h
View File

@ -20,6 +20,7 @@ enum {
int start_rpc(cw_Cfg_t *global_cfg);
int test_shell();
void hapd_run();
#endif

35
src/ac/ac_main.c
View File

@ -211,6 +211,7 @@ return 0;
*/
static cw_Cfg_t * global_cfg = NULL;
void process_wtp_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len, int dta);
int main (int argc, char *argv[])
@ -236,6 +237,8 @@ int main (int argc, char *argv[])
goto errX;
};
hapd_run(); // init
//stop();
//const char *ttt = cw_cfg_get(global_cfg,"cisco/ssl-cipher",NULL);
//printf("CFG: %s\n",ttt);
//stop();
@ -455,7 +458,7 @@ int ac_run(cw_Cfg_t * cfg)
(struct sockaddr *) &srcaddr,
&srcaddrlen);
process_cw_data_packet (i, (struct sockaddr *) &srcaddr, buffer, len);
process_wtp_packet (i, (struct sockaddr *) &srcaddr, buffer, len,1);
}
@ -468,7 +471,7 @@ int ac_run(cw_Cfg_t * cfg)
(struct sockaddr *) &srcaddr,
&srcaddrlen);
process_ctrl_packet (i, (struct sockaddr *) &srcaddr, buffer, len);
process_wtp_packet (i, (struct sockaddr *) &srcaddr, buffer, len,0);
}
}
@ -482,14 +485,14 @@ int ac_run(cw_Cfg_t * cfg)
void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
cw_dbg (DBG_X, "There is a data packet now");
// cw_dbg (DBG_X, "There is a data packet now");
dataman_list_lock();
cw_dbg (DBG_X, "Dataman list locked, now getting");
// cw_dbg (DBG_X, "Dataman list locked, now getting");
struct dataman * dm = dataman_list_get (socklist[index].data_sockfd, addr);
cw_dbg (DBG_X, "Dataman list locked, now gotted");
// cw_dbg (DBG_X, "Dataman list locked, now gotted");
cw_dbg (DBG_INFO, "Packet for dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
// cw_dbg (DBG_INFO, "Packet for dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
if (!dm) {
cw_dbg (DBG_INFO, "No dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
@ -501,10 +504,7 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
}
dataman_list_add (dm);
dataman_start (dm);
}
dataman_list_unlock();
@ -532,7 +532,7 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
}
void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len)
void process_wtp_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len, int dta)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
@ -552,6 +552,10 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
if (!wtpman) {
if (dta){
cw_dbg(DBG_PKT_ERR,"Data packet w/o wtpman received, ignoring");
return;
}
wtpman = wtpman_create (index, addr, preamble & 0xf, global_cfg);
@ -573,9 +577,12 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
wtpman_start (wtpman, preamble & 0xf);
}
//printf("Got Packet with len: %d\n",len);
wtpman_addpacket (wtpman, buffer, len);
if(!dta)
wtpman_addpacket (wtpman, buffer, len);
else{
// cw_dbg(DBG_X,"Data packet received");
wtpman_datapacket (wtpman, buffer, len);
}
wtplist_unlock();
}
@ -646,7 +653,7 @@ void process_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, in
{
switch (socklist[index].ac_proto) {
case AC_PROTO_CAPWAP:
process_cw_ctrl_packet (index, addr, buffer, len);
// process_cw_ctrl_packet (index, addr, buffer, len);
return;
/*case AC_PROTO_LWAPP:

70
src/ac/dataman.c
View File

@ -80,7 +80,7 @@ struct dataman *dataman_list_get(int sock, struct sockaddr *addr)
struct dataman *dm = mavl_get(dataman_list, &search_dm);
cw_dbg(DBG_X,"Getting dataman %p",dm);
// cw_dbg(DBG_X,"Getting dataman %p",dm);
return dm;
}
@ -169,6 +169,8 @@ int dataman_process_keep_alive(struct cw_Conn *nc, uint8_t *rawmsg, int len)
return -1;
}
#include <libwifi.h>
int dataman_process_message0(struct cw_Conn *nc, uint8_t * rawmsg, int len,
struct sockaddr *from)
{
@ -178,20 +180,75 @@ int dataman_process_message0(struct cw_Conn *nc, uint8_t * rawmsg, int len,
sprintf(fn,"wificap-%03d",c++);
/// cw_save_file(fn,(char*)rawmsg,len);
/// cw_dbg(DBG_X,"saving %d bytes",len);
int offs = cw_get_hdr_msg_offset(rawmsg);
int rc;
uint8_t * dot11frame = rawmsg + offs;
int dot11len = len-offs;
// cw_dbg(DBG_X,"802.11 - %s",dot11_get_frame_name(dot11frame));
// extern void ppacket(uint8_t * p, int len);
// ppacket (dot11frame,len-cw_get_hdr_msg_offset(rawmsg));
struct libwifi_frame frame = {0};
struct libwifi_frame resp={0};
// cw_dbg(DBG_X,"802.11 - %s",dot11_get_frame_name(dot11frame));
// cw_dbg(DBG_X,"802.11 - T&S: %d %d",dot11_get_type(dot11frame),dot11_get_subtype(dot11frame));
rc = libwifi_get_wifi_frame(&frame, (unsigned char*)(dot11frame+1), dot11len-1, 0);
// cw_dbg(DBG_X,"Frame CTL:%d,%d",frame.frame_control.type, frame.frame_control.subtype);
// cw_dbg(DBG_X,"CMP???CTL:%d,%d (%d,%d)",frame.frame_control.type, frame.frame_control.subtype,
// TYPE_MANAGEMENT,SUBTYPE_ASSOC_REQ);
// char ffr[1024];
// cw_format_dot11_hdr(ffr,dot11frame,dot11len);
// cw_dbg(DBG_X,ffr);
//
//
if (frame.frame_control.type == TYPE_MANAGEMENT &&
frame.frame_control.subtype == SUBTYPE_ASSOC_REQ){
// cw_dbg(DBG_X,"ASSOC REQ RECEIVED");
/* libwifi_create_assoc_resp(&resp,
frame.frame_control.transmitter,
frame.frame_control.receiver,
frame.frame_control.transmitter,
1
);*/
// stop();
}
uint8_t * dot11frame = rawmsg + cw_get_hdr_msg_offset(rawmsg);
cw_dbg(DBG_X,"802.11 - %s",dot11_get_frame_name(dot11frame));
/* The very first data message MUST be a keep-alive message */
if (!cw_get_hdr_flag_k(rawmsg)){
cw_dbg(DBG_X,"No K Flag founde");
// cw_dbg(DBG_X,"No K Flag founde");
errno = EAGAIN;
return -1;
}
cw_dbg(DBG_X, "Goto Keep Alive Pack");
// cw_dbg(DBG_X, "Goto Keep Alive Pack");
return dataman_process_keep_alive(nc,rawmsg,len);
}
@ -207,6 +264,9 @@ int dataman_process_message(struct cw_Conn *nc, uint8_t * rawmsg, int len,
sprintf(fn,"wificap-%03d",c++);
cw_save_file(fn,(char*)rawmsg,len);
extern void ppacket(uint8_t * p, int len);
ppacket (rawmsg,len);
cw_dbg(DBG_X,"There was someting else than dataman");

57
src/ac/wtpman.c
View File

@ -310,6 +310,36 @@ int run_update(struct wtpman *wtpman)
return rc;
}
static int dataman_process_msg(struct cw_Conn *nc, uint8_t * rawmsg, int len,
struct sockaddr *from)
{
int offs = cw_get_hdr_msg_offset(rawmsg);
uint8_t * dot11frame = rawmsg + offs;
int dot11len = len-offs;
cw_dbg_dot11_frame(dot11frame,dot11len);
return 0;
}
static void *wtpman_data_main(void *arg)
{
struct wtpman * wtpman = arg;
struct cw_Conn * nc = wtpman->dconn;
nc->process_packet=conn_process_packet;
nc->process_message=dataman_process_msg;
while (1){
time_t timer = cw_timer_start(2);
while (!cw_timer_timeout(timer)){
cw_read_messages(nc);
}
}
}
static void *wtpman_main(void *arg)
{
//mavl_t r;
@ -560,7 +590,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
{
struct sockaddr dbgaddr;
socklen_t dbgaddrl;
int sockfd, replyfd;
int sockfd, replyfd, data_sockfd,data_replyfd;
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman;
@ -574,6 +604,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
int port = sock_getport(&socklist[socklistindex].addr);
replyfd = socklist_find_reply_socket(srcaddr, port);
data_replyfd=replyfd;
if (replyfd == -1) {
cw_log(LOG_ERR,
@ -584,10 +615,11 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
}
} else {
replyfd = socklist[socklistindex].sockfd;
data_replyfd = socklist[socklistindex].data_sockfd;
}
sockfd = replyfd; /*//socklist[socklistindex].reply_sockfd; */
data_sockfd = data_replyfd;
dbgaddrl = sizeof(dbgaddr);
getsockname(sockfd, &dbgaddr, &dbgaddrl);
@ -606,6 +638,15 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
return NULL;
}
wtpman->dconn = cw_conn_create(data_sockfd, srcaddr, 100);
if (!wtpman->dconn) {
wtpman_destroy(wtpman);
return NULL;
}
cw_conn_register_msg_cb(wtpman->conn,
CAPWAP_MSG_DISCOVERY_REQUEST,
discovery_cb);
@ -618,6 +659,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
wtpman->conn->role = CW_ROLE_AC;
wtpman->conn->data=wtpman;
wtpman->dconn->data=wtpman;
wtpman->conn->cfg_list[0]=wtpman->conn->update_cfg;
wtpman->conn->cfg_list[1]=wtpman->conn->remote_cfg;
@ -663,6 +705,8 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
cmod->name, bmod->name);
wtpman->conn->msgset =
cw_mod_get_msg_set(wtpman->conn, cmod, bmod);
wtpman->dconn->msgset=wtpman->conn->msgset;
wtpman->conn->detected = 1;
cmod->setup_cfg(wtpman->conn);
// if (wtpman->conn->setup_complete)
@ -708,5 +752,14 @@ void wtpman_start(struct wtpman *wtpman, int dtlsmode)
cw_dbg(DBG_INFO, "Starting wtpman, DTLS mode = %d", dtlsmode);
wtpman->dtlsmode = dtlsmode;
pthread_create(&wtpman->thread, NULL, wtpman_main, (void *) wtpman);
pthread_create(&wtpman->thread, NULL, wtpman_data_main, (void *) wtpman);
return;
}
void wtpman_datapacket(struct wtpman *wtpman, uint8_t * packet, int len)
{
conn_q_add_packet(wtpman->dconn, packet, len);
}

2
src/ac/wtpman.h
View File

@ -17,6 +17,7 @@ struct wtpman {
pthread_t thread;
struct cw_Conn *conn;
struct cw_Conn *dconn;
/* wtp data */
@ -67,6 +68,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
extern void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len);
extern void wtpman_destroy(struct wtpman *wtpman);
extern void wtpman_start(struct wtpman *wtpman, int dtlsmode);
void wtpman_datapacket(struct wtpman *wtpman, uint8_t * packet, int len);