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

Removed old transport heder flag definitions.

Browse Source 
FossilOrigin-Name: 721d4c8c0211d39466d772b3de418c361f96ab928e85684e6e1afa752cac7015
This commit is contained in:
7u83@mail.ru
2016-03-16 06:58:45 +00:00
parent 0b8f5bbace
commit 6927bb4a59
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cw/capwap.h
View File

@ -69,17 +69,6 @@
/**@}*/ /**@}*/
/* transport header flags */
#define CWTH_FLAGS_R1 0x01 /* bit 0 reserved 1 */
#define CWTH_FLAGS_R2 0x02 /* bit 1 reserved 2 */
#define CWTH_FLAGS_R3 0x04 /* bit 2 reserved 3 */
#define CWTH_FLAGS_K 0x08 /* bit 3 Keep alive flag */
#define CWTH_FLAGS_M 0x10 /* bit 4 MAC Adress field present */
#define CWTH_FLAGS_W 0x20 /* bit 5 wireless info present */
#define CWTH_FLAGS_L 0x40 /* bit 6 last fragment */
#define CWTH_FLAGS_F 0x80 /* bit 7 fragment */
#define CWTH_FLAGS_T 0x100 /* bit 8 type of payload frame */
/** /**
* CAPWAP header flags. * CAPWAP header flags.

18
src/cw/cw.h
View File

@ -91,16 +91,16 @@
#define cw_get_hdr_rmac_size(th) cw_get_hdr_rmac_len(th) #define cw_get_hdr_rmac_size(th) cw_get_hdr_rmac_len(th)
#define cw_get_hdr_rmac_data(th) (th+9) #define cw_get_hdr_rmac_data(th) (th+9)
#define cw_get_hdr_flag_r1(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_R1 ) ? 1:0) #define cw_get_hdr_flag_r1(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_R1 ) ? 1:0)
#define cw_get_hdr_flag_r2(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_R2 ) ? 1:0) #define cw_get_hdr_flag_r2(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_R2 ) ? 1:0)
#define cw_get_hdr_flag_r3(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_R3 ) ? 1:0) #define cw_get_hdr_flag_r3(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_R3 ) ? 1:0)
#define cw_get_hdr_flag_k(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_K ) ? 1:0) #define cw_get_hdr_flag_k(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_K ) ? 1:0)
#define cw_get_hdr_flag_m(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_M ) ? 1:0) #define cw_get_hdr_flag_m(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_M ) ? 1:0)
#define cw_get_hdr_flag_w(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_W ) ? 1:0) #define cw_get_hdr_flag_w(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_W ) ? 1:0)
#define cw_get_hdr_flag_l(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_L ) ? 1:0) #define cw_get_hdr_flag_l(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_L ) ? 1:0)
#define cw_get_hdr_flag_f(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_F ) ? 1:0) #define cw_get_hdr_flag_f(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_F ) ? 1:0)
#define cw_get_hdr_flag_t(th) ((ntohl( *((uint32_t*)th)) & CWTH_FLAGS_T ) ? 1:0) #define cw_get_hdr_flag_t(th) ((ntohl( *((uint32_t*)th)) & CW_FLAG_HDR_T ) ? 1:0)
#define cw_get_hdr_msg_offset(th) (4*cw_get_hdr_hlen(th)) #define cw_get_hdr_msg_offset(th) (4*cw_get_hdr_hlen(th))
#define cw_get_hdr_msg_elems_offset(th) (cw_get_hdr_msg_offset(th)+8) #define cw_get_hdr_msg_elems_offset(th) (cw_get_hdr_msg_offset(th)+8)

2
src/cw/fragman.c
View File

@ -168,7 +168,7 @@ uint8_t * fragman_add(frag_t * frags, uint8_t *packet, int hlen, int payloadlen)
f->bytesreceived+=payloadlen; f->bytesreceived+=payloadlen;
} }
if (val0 & CWTH_FLAGS_L){ if (val0 & CW_FLAG_HDR_L){
f->bytesneeded=dst+payloadlen; f->bytesneeded=dst+payloadlen;
} }

10
src/wtp/wtp_main.c
View File

@ -139,10 +139,10 @@ int main()
// cw_register_actions_cipwap_wtp(&capwap_actions); // cw_register_actions_cipwap_wtp(&capwap_actions);
// cw_register_actions_capwap_80211_wtp(&capwap_actions); // cw_register_actions_capwap_80211_wtp(&capwap_actions);
// //
//#define CWMOD "cisco" #define CWMOD "cisco"
//#define CWBIND "cisco" #define CWBIND "cisco"
#define CWMOD "capwap" //#define CWMOD "capwap"
#define CWBIND "capwap80211" //#define CWBIND "capwap80211"
struct mod_wtp *mod = modload_wtp(CWMOD); struct mod_wtp *mod = modload_wtp(CWMOD);
@ -190,7 +190,7 @@ int main()
// conn->capwap_mode = CW_MODE_CAPWAP; // conn->capwap_mode = CW_MODE_CAPWAP;
//conn->capwap_mode = CW_MODE_CISCO; //conn->capwap_mode = CW_MODE_CISCO;
the_conn->strict_capwap = 1; the_conn->strict_capwap = 0;
conn->config = mbag_create(); conn->config = mbag_create();