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

changes for rmac field which ist not a pointer anymore. 

FossilOrigin-Name: 08bba10bce17f15c02e6542bf41d1f9be56c16b1010cb71298a62c1717401622
This commit is contained in:
7u83@mail.ru 2014-07-28 04:47:53 +00:00
parent 8378a8152d
commit 0947bdb5b9
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/capwap/cwmsg_init.c
View File

@ -30,11 +30,20 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
cwmsg->buffer=buffer; cwmsg->buffer=buffer;
cwmsg->trnsprthdr=buffer; cwmsg->trnsprthdr=buffer;
#ifdef WITH_RMAC_SUPPORT
//#ifdef WITH_RMAC_SUPPORT
int rmaclen; int rmaclen;
if (radioinfo->rmac){ if (radioinfo->rmac[0]){
rmaclen=(*radioinfo->rmac)+1; /* we assume the radio mac is already aligned */
memcpy(buffer+8,radioinfo->rmac,rmaclen);
rmaclen=(*radioinfo->rmac);
printf ("Adding rmac len %d\n",rmaclen);
printf ("Real copy woul dbe %d\n",rmaclen/8+8);
memcpy(buffer+8,radioinfo->rmac,rmaclen/8+8);
cwmsg->flags=CWTH_FLAGS_M; cwmsg->flags=CWTH_FLAGS_M;
} }
else else
@ -45,7 +54,7 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
hlen+=rmaclen; hlen+=rmaclen;
if (hlen%4) if (hlen%4)
hlen = (hlen>>2)*4+4; hlen = (hlen>>2)*4+4;
#endif //#endif
cwmsg->ctrlhdr=cwmsg->trnsprthdr+hlen; cwmsg->ctrlhdr=cwmsg->trnsprthdr+hlen;