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

2
src/cw/Makefile
View File

@ -6,7 +6,6 @@ CWSRC=\
cw.c\
cw_check_missing_mand.c\
cw_clock_lap.c\
cw_dbg_elem.c\
cw_filename.c\
cw_format_dump.c\
cw_format_pkt_hdr.c\
@ -77,6 +76,7 @@ CWSRC=\
cw_in_radio_generic_struct.c\
cw_in_generic_struct.c\
cw_radio_set_admin_state.c\
cw_dbg_elem.c\
KTVSRC=\
cfg.c\

4
src/cw/cw.h
View File

@ -146,8 +146,10 @@
int cw_get_hdr_ws_len(uint8_t * th);
uint8_t *cw_get_hdr_ws_data(uint8_t * th);
int cw_get_hdr_ws_len_7(uint8_t * th);
uint8_t *cw_get_hdr_ws_data(uint8_t * th);
#define cw_get_hdr_ws_data_7(th) (cw_get_hdr_ws_data(th)+1)
#define cw_get_hdr_msg_offset(th) (4*cw_get_hdr_hlen(th))

190
src/cw/cw_format_pkt_hdr.c
View File

@ -3,105 +3,103 @@
#include "conn.h"
#include "cw.h"
/**
* @brief Format a packet header for debugging purposes
* @param dst Destination buffer
* @param incomming True if the packet is an incomming packet, otherweise 0
* @param packet packet data
* @param len length of packet data
* @param from Address from where the packet was received
* @return Number of bytes written
*/
int cw_format_pkt_hdr(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from)
#include "dot11.h"
int cw_format_dot11_fc_flags(char *dst, uint8_t *frame){
char *s = dst;
uint8_t f = frame[2];
s+=sprintf(s,"ToDS:%d ", f&1 ? 1:0);
s+=sprintf(s,"FromDS:%d ", f&2 ? 1:0);
s+=sprintf(s,"More Frgs:%d ", f&4 ? 1:0);
s+=sprintf(s,"Retry:%d ", f&8 ? 1:0);
s+=sprintf(s,"PwrMgmt:%d ", f&16 ? 1:0);
s+=sprintf(s,"More Dta:%d ", f&32 ? 1:0);
s+=sprintf(s,"Protec:%d ", f&64 ? 1:0);
s+=sprintf(s,"+HTC/:%d ", f&128 ? 1:0);
return s-dst;
}
int cw_format_dot11_rates(char *dst, const uint8_t *src, int len)
{
int i;
char * k="";
char *s=dst;
for(i=0; i<len; i++){
int rate = src[i] &0x7f;
s+=sprintf(s,"%s%0.1f",k,dot11_rate2float(rate));
k=", ";
}
return s-dst;
}
int cw_format_dot11_elem(char *dst, uint8_t id, const uint8_t *src, int len)
{
char *s = dst;
s += sprintf(s,"elem(id=%d) ",id);
switch(id){
case DOT11_ELEM_SSID:
s+=sprintf(s," ssid: %.*s",len,src);
break;
case DOT11_ELEM_SUPPORTED_RATES:
s+=sprintf(s," Supported Rates:");
s+=cw_format_dot11_rates(s,src,len);
break;
case DOT11_ELEM_EXTENDED_SUPPORTED_RATES:
s+=sprintf(s," Extended Supported Rates");
break;
case DOT11_ELEM_POWER_CAPABILITY:
s+=sprintf(s," Power Capability");
break;
case DOT11_ELEM_SUPPORTED_CHANNELS:
s+=sprintf(s," Supported Channels");
break;
case DOT11_ELEM_SUPPORTED_OPERATING_CLASSES:
s+=sprintf(s," Supported Operating Classes");
break;
case DOT11_ELEM_VENDOR_SPECIFIC:
s+=sprintf(s," Vendor Specific");
break;
default:
break;
}
s+=sprintf(s,", len=%d",len);
return s-dst;
}
int cw_format_dot11_hdr(char * dst, uint8_t * packet, int len)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
int preamble;
char *s;
int hlen, rid, wbid;
int frag_id,frag_offs;
int type = dot11_get_type_and_subtype(packet);
s = dst;
s=dst;
if (incomming){
if (cw_get_hdr_flag_f(packet)) {
s += sprintf(s, "Fragment from %s",
sock_addr2str_p(from,sock_buf));
} else {
s += sprintf(s, "From %s", sock_addr2str_p(from,sock_buf));
}
}
else{
if (cw_get_hdr_flag_f(packet)) {
s += sprintf(s, "Fragment to %s", sock_addr2str(from,sock_buf));
} else {
s += sprintf(s, "To %s", sock_addr2str(from,sock_buf));
}
}
s += sprintf(s, " l=%d: ", len);
preamble = cw_get_hdr_preamble(packet);
if (preamble == 01) {
s += sprintf(s, " (encrypted)");
return s - dst;
}
if (len < 4)
goto abort;
/*
if (cw_get_hdr_flag_f(packet)){
s+=sprintf(s," (fragmented)");
}
*/
hlen = cw_get_hdr_hlen(packet);
rid = cw_get_hdr_rid(packet);
wbid = cw_get_hdr_wbid(packet);
s += sprintf(s, " H:%d R:%02d W:%02d", hlen, rid, wbid);
s += sprintf(s, " Flgs:");
s += format_hdr_flags(s, packet);
if (len < 8)
goto abort;
frag_id = cw_get_hdr_fragid(packet);
frag_offs = cw_get_hdr_fragoffset(packet);
s += sprintf(s, " Frag/Offs:%d/%d", frag_id, frag_offs);
if (cw_get_hdr_flag_m(packet)) {
/* rmac is present, print the rmac */
int rmac_len = cw_get_hdr_rmac_len(packet);
int plen = rmac_len;
if (rmac_len + 8 > len)
plen = len - 8;
if (rmac_len > 10)
plen = 10;
s += sprintf(s, " R-MAC:");
s += format_mac(s, cw_get_hdr_rmac_data(packet), plen);
if (rmac_len > 10) {
s += sprintf(s, " ... (len=%d)", rmac_len);
}
}
if (cw_get_hdr_flag_w(packet)) {
/* print wireless specific info */
int ws_len = cw_get_hdr_ws_len(packet);
int plen = ws_len > 20 ? 20 : ws_len;
s += sprintf(s, " WS:");
s += format_hexu(s, cw_get_hdr_ws_data(packet), plen);
if (ws_len > 20) {
s += sprintf(s, " ... (len=%d)", ws_len);
}
}
return s - dst;
abort:
s += sprintf(s, " Incomplete...");
return s - dst;
s+=sprintf(s,"IEEE 802.11 - %s",dot11_get_frame_name(packet));
s+=sprintf(s," da:");
s+=format_mac(s,dot11_get_da(packet),6);
s+=sprintf(s," sa:");
s+=format_mac(s,dot11_get_sa(packet),6);
s+=sprintf(s," bssid:");
s+=format_mac(s,dot11_get_bssid(packet),6);
s+=sprintf(s," seq: %d\n",dot11_get_seq(packet));
s+=cw_format_dot11_fc_flags(s,packet);
//
/* switch (type){
case DOT11_ASSOC_REQ:
s+=sprintf(s,"\n ssid: %.*s",dot11_assoc_req_get_ssid_len(packet),
dot11_assoc_req_get_ssid(packet)
);
break;
}*/
}

19
src/cw/cw_inline.c
View File

@ -15,6 +15,25 @@ int cw_get_hdr_ws_len(uint8_t * th)
return *(th + 9 + cw_get_hdr_rmac_len(th));
}
/**
* Get length of wireless specific data for CAPWAP packet draft 7
* @param th Pointer to packet
* @return length of wireless specific data
*
* Call this function only if the W flag is set
*/
int cw_get_hdr_ws_len_7(uint8_t * th)
{
if (!cw_get_hdr_flag_m(th)){
return *(th + 9);
}
return *(th + 10 + cw_get_hdr_rmac_len(th));
}
/**
* Get pointer to wireless specific data
* @param th Pointer to packet

73
src/cw/dbg.c
View File

@ -31,6 +31,7 @@
#include "format.h"
#include "ansi_colors.h"
#include "dot11.h"
/**
*@addtogroup DBG
@ -371,16 +372,26 @@ void cw_dbg_pkt(int level, struct cw_Conn *conn, uint8_t * packet, int len,
struct sockaddr *from)
{
/* int hlen;*/
char buf[1024];
int (*fmt_pkt_hdr)(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from);
fmt_pkt_hdr = NULL;
if (conn){
if (conn->msgset)
fmt_pkt_hdr = conn->msgset->format_pkt_hdr;
}
if (fmt_pkt_hdr==NULL){
fmt_pkt_hdr = cw_format_pkt_hdr;
}
if (!cw_dbg_is_level(level))
return;
if (level == DBG_PKT_IN)
cw_format_pkt_hdr(buf, 1, packet, len, from);
fmt_pkt_hdr(buf, 1, packet, len, from);
else
cw_format_pkt_hdr(buf, 0, packet, len, from);
fmt_pkt_hdr(buf, 0, packet, len, from);
/* hlen = cw_get_hdr_msg_offset(packet);*/
@ -638,6 +649,9 @@ int cw_dbg_set_level_from_str(const char *level)
return cw_dbg_set_level_from_str0(slevel,on);
}
void cw_dbg_print_help(FILE *out, const char * prefix)
{
struct cw_DbgStr *s;
@ -656,32 +670,45 @@ void cw_dbg_print_help(FILE *out, const char * prefix)
}
fprintf(out,"\n");
}
}
/*
void dbg_istore_dmp(mbag_t s)
void cw_dbg_dot11_elems(const uint8_t *src,int len)
{
DEFINE_AVLITER(it,s);
avliter_foreach(&it) {
mbag_item_t *i = avliter_get(&it);
char buffer[1000];
struct cw_str * strings = cw_item_strings;
const char * in = cw_strlist_get_str(strings,i->id);
cw_format_item(buffer,i);
printf("Item ID %d-%s: %s\n",i->id,in,buffer);
uint8_t id,l;
int p;
char str[1024];
for(p=0; p<len; p+=l+2){
if (len-p<3){
cw_dbg(DBG_X,"Error in dot11 element");
return;
}
id=src[p];
l=src[p+1];
cw_format_dot11_elem(str,id,src+p+2,l);
cw_dbg_dmp(DBG_X,src+p+2,l,"");
cw_dbg(DBG_X,str);
}
}
*/
void cw_dbg_dot11_frame(uint8_t * frame,int len)
{
char hdr[1024];
cw_format_dot11_hdr(hdr, frame, len);
cw_dbg(DBG_X,"%s",hdr);
int type =dot11_get_type_and_subtype(frame);
switch (type){
case DOT11_ASSOC_REQ:
cw_dbg_dot11_elems(frame+28,len-28);
break;
}
}
/**@}*/

2
src/cw/dbg.h
View File

@ -244,6 +244,8 @@ void cw_dbg_ktv_dump(mavl_t ktv, uint32_t dbglevel,
int cw_dbg_is_level(int level);
void cw_dbg_print_help(FILE *out, const char * prefix);
void cw_dbg_dot11_frame(uint8_t * frame,int len);
#define stop() printf("STOP IN %s:%d - %s\n", __FILE__, __LINE__, __FUNCTION__); exit(1)

4
src/cw/dot11.c
View File

@ -59,4 +59,8 @@ struct cw_StrListElem dot11_names[]={
};
int dot11_init_assoc_resp(uint8_t * dst)
{
dst[0]=0;
}

45
src/cw/dot11.h
View File

@ -110,11 +110,19 @@
* @defgroup DOT11_ELEMS
* @{
*/
#define DOT11_ELEM_SSID 0
#define DOT11_ELEM_SUPPORTED_RATES 1
#define DOT11_ELEM_FH_PARAM_SET 2
#define DOT11_ELEM_DSSS_PARAM_SET 3
#define DOT11_ELEM_CF_PARAM_SET 4
#define DOT11_ELEM_SSID 0
#define DOT11_ELEM_SUPPORTED_RATES 1
#define DOT11_ELEM_FH_PARAM_SET 2
#define DOT11_ELEM_DSSS_PARAM_SET 3
#define DOT11_ELEM_CF_PARAM_SET 4
#define DOT11_ELEM_POWER_CAPABILITY 33
#define DOT11_ELEM_SUPPORTED_CHANNELS 36
#define DOT11_ELEM_EXTENDED_SUPPORTED_RATES 50
#define DOT11_ELEM_AP_CHANNEL_REPORT 51
#define DOT11_ELEM_SUPPORTED_OPERATING_CLASSES 59
#define DOT11_ELEM_VENDOR_SPECIFIC 221
/**
* @}
*/
@ -131,15 +139,16 @@ extern const uint8_t dot11_tab_br[256];
#define dot11_put_dword(dst,v) ((*((uint32_t*)(dst))=htobe32(v)),4)
#define dot11_put_qword(dst,v) ((*((uint64_t*)(dst))=htobe64(v)),8)
#define dot11_set_byte(ptr,b) (*(ptr) = b)
uint16_t dot11_get_word(uint8_t * ptr);
#define cw_dot11_get_version(frame) ( (frame)[1] & 0x03)
#define cw_dot11_get_type(frame) ( ((frame)[1] & 0x0c) >> 2)
#define cw_dot11_get_subtype(frame) ( (frame)[1] >> 4 )
#define dot11_get_version(frame) ( (frame)[1] & 0x03)
#define dot11_get_type(frame) ( ((frame)[1] & 0x0c) >> 2)
#define dot11_get_subtype(frame) ( (frame)[1] >> 4 )
#define dot11_get_type_and_subtype( frame) ((frame)[1])
/**
* Get Frame Control field
@ -242,6 +251,24 @@ extern struct cw_StrListElem dot11_names[];
#define dot11_get_frame_name(data) cw_strlist_get_str(dot11_names,(data)[1])
#define dot11_get_da(frame) ((frame)+2+2)
#define dot11_get_sa(frame) ((frame)+2+2+6)
#define dot11_get_bssid(frame) ((frame)+2+2+12)
#define dot11_get_seq(frame) dot11_get_word((frame)+2+2+12+6)
#define dot11_assoc_req_get_cap(frame) \
dot11_get_word((frame)+2+2+12+6+2)
#define dot11_assoc_req_get_listen_interval(frame) \
dot11_get_word((frame)+2+2+12+6+4)
#define dot11_assoc_req_get_ssid_len(frame)\
((frame)[29])
#define dot11_assoc_req_get_ssid(frame)\
(frame+30)
/**

13
src/cw/dot11_inline.c
View File

@ -31,8 +31,6 @@ uint64_t dot11_timer_get()
return 1000000 * tv.tv_sec + tv.tv_usec - dot11_timer_offset;
}
void dot11_timer_set(uint64_t val)
{
struct timeval tv;
@ -41,11 +39,10 @@ void dot11_timer_set(uint64_t val)
}
int dot11_put_ssid(uint8_t *dst,uint8_t * ssid,int len){
dot11_put_byte(dst,DOT11_ELEM_SSID);
dot11_put_byte(dst+1,len);
dot11_set_byte(dst,DOT11_ELEM_SSID);
dot11_set_byte(dst+1,len);
memcpy(dst+2,ssid,len);
return len;
}
int dot11_put_supported_rates(uint8_t *dst, float *basic, float *rates){
@ -67,9 +64,9 @@ int dot11_put_supported_rates(uint8_t *dst, float *basic, float *rates){
int dot11_put_dsss_param_set(uint8_t *dst,int ch) {
dot11_put_byte(dst,DOT11_ELEM_DSSS_PARAM_SET);
dot11_put_byte(dst+1,1);
dot11_put_byte(dst+2,ch);
dot11_set_byte(dst,DOT11_ELEM_DSSS_PARAM_SET);
dot11_set_byte(dst+1,1);
dot11_set_byte(dst+2,ch);
return 3;
}

129
src/cw/format.c
View File

@ -27,6 +27,8 @@
#include "cw.h"
#include "format.h"
#include "capwap80211.h"
/**
@ -104,3 +106,130 @@ char * cw_format_radio_information(char * dst, int ri)
*d=0;
return dst;
}
static int cw_format_pkt_hdr0(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from, int draft7)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
int preamble;
char *s;
int hlen, rid, wbid;
int frag_id,frag_offs;
s = dst;
if (incomming){
if (cw_get_hdr_flag_f(packet)) {
s += sprintf(s, "Fragment from %s",
sock_addr2str_p(from,sock_buf));
} else {
s += sprintf(s, "From %s", sock_addr2str_p(from,sock_buf));
}
}
else{
if (cw_get_hdr_flag_f(packet)) {
s += sprintf(s, "Fragment to %s", sock_addr2str(from,sock_buf));
} else {
s += sprintf(s, "To %s", sock_addr2str(from,sock_buf));
}
}
s += sprintf(s, " l=%d: ", len);
preamble = cw_get_hdr_preamble(packet);
if (preamble == 01) {
s += sprintf(s, " (encrypted)");
return s - dst;
}
if (len < 4)
goto abort;
hlen = cw_get_hdr_hlen(packet);
rid = cw_get_hdr_rid(packet);
wbid = cw_get_hdr_wbid(packet);
s += sprintf(s, " H:%d R:%02d W:%02d", hlen, rid, wbid);
s += sprintf(s, " Flgs:");
s += format_hdr_flags(s, packet);
if (len < 8)
goto abort;
frag_id = cw_get_hdr_fragid(packet);
frag_offs = cw_get_hdr_fragoffset(packet);
s += sprintf(s, " Frag/Offs:%d/%d", frag_id, frag_offs);
if (cw_get_hdr_flag_m(packet)) {
/* rmac is present, print the rmac */
int rmac_len = cw_get_hdr_rmac_len(packet);
int plen = rmac_len;
if (rmac_len + 8 > len)
plen = len - 8;
if (rmac_len > 10)
plen = 10;
s += sprintf(s, " R-MAC:");
s += format_mac(s, cw_get_hdr_rmac_data(packet), plen);
if (rmac_len > 10) {
s += sprintf(s, " ... (len=%d)", rmac_len);
}
}
if (cw_get_hdr_flag_w(packet)) {
if (!draft7){
/* print wireless specific info */
int ws_len = cw_get_hdr_ws_len(packet);
int plen = ws_len > 20 ? 20 : ws_len;
s += sprintf(s, " WS:");
s += format_hexu(s, cw_get_hdr_ws_data(packet), plen);
if (ws_len > 20) {
s += sprintf(s, " ... (len=%d)", ws_len);
}
}
else {
int ws_len = cw_get_hdr_ws_len_7(packet);
int plen = ws_len > 20 ? 20 : ws_len;
s += sprintf(s, " WS:");
s += format_hexu(s, cw_get_hdr_ws_data_7(packet), plen);
if (ws_len > 20) {
s += sprintf(s, " ... (len=%d)", ws_len);
}
}
}
return s - dst;
abort:
s += sprintf(s, " Incomplete...");
return s - dst;
}
/**
* @brief Format a packet header for debugging purposes
* @param dst Destination buffer
* @param incomming True if the packet is an incomming packet, otherweise 0
* @param packet packet data
* @param len length of packet data
* @param from Address from where the packet was received
* @return Number of bytes written
*/
int cw_format_pkt_hdr(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from)
{
return cw_format_pkt_hdr0(dst, incomming, packet, len,
from, 0);
}
int cw_format_pkt_hdr_7(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from)
{
return cw_format_pkt_hdr0(dst, incomming, packet, len,
from, 1);
}

5
src/cw/format.h
View File

@ -109,9 +109,14 @@ char *cw_format_dump(const uint8_t * data, int len,
void cw_format_get_dump_defaults(struct cw_FormatDumpSettings * settings);
int cw_format_pkt_hdr(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from);
int cw_format_pkt_hdr_7(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from);
int cw_format_version(char *s, const uint8_t * version, int len);
char * cw_format_radio_information(char * dst, int ri);
int cw_format_dot11_hdr(char * dst, uint8_t *packet, int len);
int cw_format_dot11_elem(char *dst, uint8_t id, const uint8_t *src, int len);
/**@}*/

3
src/cw/msgset.h
View File

@ -72,6 +72,9 @@ struct cw_MsgSet {
mavl_t statemachine_states;
int (*write_header)(struct cw_ElemHandler * handler, uint8_t * dst, int len);
int (*header_len)(struct cw_ElemHandler *handler);
int (*format_pkt_hdr)(char *dst, int incomming, uint8_t * packet, int len,
struct sockaddr *from);
};