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

Changes for the non-pointer rmac field, (Some debug prints, which have to be removed ...)

Browse Source 
FossilOrigin-Name: f2ea52208e830ac3023940fb95b429cdb1c1b00cb23eb21b82e167510513ea71
This commit is contained in:
7u83@mail.ru 2014-07-28 04:56:37 +00:00
parent bb491532a8
commit 9ccb28bdbf
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/capwap/conn_process_packet.c
View File

@ -1,4 +1,5 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "capwap.h" #include "capwap.h"
#include "cw_log.h" #include "cw_log.h"
@ -107,7 +108,8 @@ void conn_process_packet(struct conn * conn, uint8_t *packet, int len,int (*cb)(
} }
int hlen = 4*((val >> 19) & 0x1f); int hlen = 4*((val >> 19) & 0x1f);
printf ("HHHHHHHHHHHHHHHLEN: %d\n",hlen);
int payloadlen = len - hlen; int payloadlen = len - hlen;
if (payloadlen<0){ if (payloadlen<0){
@ -121,19 +123,32 @@ void conn_process_packet(struct conn * conn, uint8_t *packet, int len,int (*cb)(
cwrmsg.wbid=(val>>9) & 0x1f; cwrmsg.wbid=(val>>9) & 0x1f;
cwrmsg.rid=(val>>14) & 0x1f; cwrmsg.rid=(val>>14) & 0x1f;
#ifdef WITH_RMAC_SUPPORT printf ("PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP\n");
printf ("WBID: %d\n",cwrmsg.wbid);
printf ("RID: %d\n",cwrmsg.rid);
//#ifdef WITH_RMAC_SUPPORT
if (val & CWTH_FLAGS_M){ if (val & CWTH_FLAGS_M){
if (*(packet+8)+8>hlen){ if (*(packet+8)+8>hlen){
cw_log_debug0("Discarding packet, wrong rmac size, size=%d",*(packet+8)); cw_log_debug0("Discarding packet, wrong rmac size, size=%d",*(packet+8));
/* wrong rmac size */ /* wrong rmac size */
return; return;
} }
cwrmsg.rmac = packet+8; memcpy(cwrmsg.rmac, packet+8,8);
int i;
for (i=0; i<8; i++){
printf (":%02X:",cwrmsg.rmac[i]);
}
} }
else{ else{
cwrmsg.rmac=NULL; cwrmsg.rmac[0]=0;
} }
#endif //#endif
if (val & CWTH_FLAGS_F){ /* fragmented */ if (val & CWTH_FLAGS_F){ /* fragmented */