deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

framer-802154: Support for creating and parsing frames with security headers

Browse source
This commit is contained in:
kkrentz 2013-05-24 04:40:01 -07:00
parent be22883724
commit 19c9ef0a95
4 changed files with 42 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/net/mac/frame802154.c
View file

@ -122,7 +122,8 @@ field_len(frame802154_t *p, field_length_t *flen)
/* Aux security header */
if(p->fcf.security_enabled & 1) {
/* TODO Aux security header not yet implemented */
flen->aux_sec_len = 5;
/* TODO Support key identifier mode !=0 */
#if 0
switch(p->aux_hdr.security_control.key_id_mode) {
case 0:
@ -232,8 +233,10 @@ frame802154_create(frame802154_t *p, uint8_t *buf, int buf_len)
/* Aux header */
if(flen.aux_sec_len) {
/* TODO Aux security header not yet implemented */
/* pos += flen.aux_sec_len; */
/* TODO Support key identifier mode !=0 */
tx_frame_buffer[pos++] = p->aux_hdr.security_control.security_level;
memcpy(tx_frame_buffer + pos, p->aux_hdr.frame_counter.u8, 4);
pos += 4;
}
return (int)pos;
@ -338,8 +341,17 @@ frame802154_parse(uint8_t *data, int len, frame802154_t *pf)
}
if(fcf.security_enabled) {
/* TODO aux security header, not yet implemented */
/* return 0; */
pf->aux_hdr.security_control.security_level = p[0] & 7;
pf->aux_hdr.security_control.key_id_mode = (p[0] >> 3) & 3;
p += 1;
memcpy(pf->aux_hdr.frame_counter.u8, p, 4);
p += 4;
if(pf->aux_hdr.security_control.key_id_mode) {
/* TODO Support key identifier mode !=0 */
return 0;
}
}
/* header length */