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

Refactoring ...

Browse Source 
a# Please enter the commit message for your changes. Lines starting

FossilOrigin-Name: c126f130f351f7103d1594a42255a1affd24061a75cf0cfeb129a92a8d2fb2a1
This commit is contained in:
7u83@mail.ru
2018-03-26 11:22:55 +00:00
parent 00b51bacf9
commit 5f5fccb14f
14 changed files with 46 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cw/capwap80211.h
View File

@ -84,7 +84,7 @@ enum radioelems {
/** IEEE 802.11 WTP Radio Fail Alarm Indication */
CW_ELEM80211_WTP_RADIO_FAIL_ALARM_IDICATION=1047,
/** IEEE 802.11 Radio Information Message Element */
CW_ELEM80211_WTP_RADIO_INFORMATION = 1048
CAPWAP80211_ELEM_WTP_RADIO_INFORMATION = 1048
};
/**

2
src/cw/capwap_strings_elem80211.c
View File

@ -9,7 +9,7 @@ struct cw_StrListElem capwap_strings_elem80211[] = {
{CW_ELEM80211_RATE_SET, "802.11 Rate Set"},
{CW_ELEM80211_SUPPORTED_RATES,"802.11 Supported Rates"},
{CW_ELEM80211_WTP_RADIO_INFORMATION, " 802.11 WTP Radio Information"},
{CAPWAP80211_ELEM_WTP_RADIO_INFORMATION, " 802.11 WTP Radio Information"},
{CW_STR_STOP, " Unknown "}
};

18
src/cw/netconn.c
View File

@ -190,7 +190,7 @@ int netconn_send_packet(struct netconn *nc, const uint8_t * buffer, int len)
int netconn_send_capwap_msg(struct netconn * nc, uint8_t *rawmsg, int msglen)
{
// int msglen = cw_get_hdr_msg_total_len(rawmsg);
/* int msglen = cw_get_hdr_msg_total_len(rawmsg);*/
uint8_t * ptr = rawmsg;
@ -199,15 +199,15 @@ int netconn_send_capwap_msg(struct netconn * nc, uint8_t *rawmsg, int msglen)
int hlen = cw_get_hdr_hlen(rawmsg)*4;
// int mtu = nc->mtu;
/* int mtu = nc->mtu; */
int mtu = 1400;
while (msglen>mtu){
cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,1);
cw_put_dword(ptr+4, nc->fragid<<16 | fragoffset<<3 );
cw_set_dword(ptr+4, nc->fragid<<16 | fragoffset<<3 );
// cw_dbg_pkt_nc(DBG_PKT_OUT,nc,ptr,mtu,(struct sockaddr*)&nc->addr);
/*/// cw_dbg_pkt_nc(DBG_PKT_OUT,nc,ptr,mtu,(struct sockaddr*)&nc->addr);*/
if (nc->write(nc,ptr,mtu)<0)
return -1;
@ -225,9 +225,9 @@ int netconn_send_capwap_msg(struct netconn * nc, uint8_t *rawmsg, int msglen)
else
cw_set_hdr_flags(rawmsg,CAPWAP_FLAG_HDR_F,0);
cw_put_dword(ptr+4, nc->fragid<<16 | fragoffset<<3 );
cw_set_dword(ptr+4, nc->fragid<<16 | fragoffset<<3 );
// cw_dbg_pkt_nc(DBG_PKT_OUT,nc,ptr,msglen,(struct sockaddr*)&nc->addr);
/*// cw_dbg_pkt_nc(DBG_PKT_OUT,nc,ptr,msglen,(struct sockaddr*)&nc->addr);*/
return nc->write(nc,ptr,msglen-0);
}
@ -239,7 +239,7 @@ int netconn_process_packet(struct netconn *nc, uint8_t * packet, int len,
{
char sock_buf[SOCK_ADDR_BUFSIZE];
// cw_dbg_pkt_nc(DBG_PKT_IN, nc, packet, len, from);
/*// cw_dbg_pkt_nc(DBG_PKT_IN, nc, packet, len, from);*/
if (len < 8) {
/* packet too short */
cw_dbg(DBG_PKT_ERR,
@ -309,10 +309,10 @@ int netconn_process_packet(struct netconn *nc, uint8_t * packet, int len,
}
// cw_dbg_pkt_nc(DBG_PKT_IN, nc, f + 4, *(uint32_t *) f, from);
/*// cw_dbg_pkt_nc(DBG_PKT_IN, nc, f + 4, *(uint32_t *) f, from);
// XXX: Modify fragman to not throw away CAPWAP headers
*/
int rc = nc->process_message(nc, f + 4, *(uint32_t *) f, from);
free(f);