giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

llsec: Removed superseded NETSTACK_ENCRYPT, NETSTACK_DECRYPT, and

Browse Source 
NETSTACK_ENCRYPTION_INIT macros
This commit is contained in:
kkrentz 2014-03-16 10:48:05 -07:00
parent c032b67969
commit 515287ef17
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/net/mac/contikimac/contikimac.c
View File

@ -632,11 +632,7 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr,
PRINTF("contikimac: shorter than shortest (%d)\n", packetbuf_totlen()); PRINTF("contikimac: shorter than shortest (%d)\n", packetbuf_totlen());
transmit_len = SHORTEST_PACKET_SIZE; transmit_len = SHORTEST_PACKET_SIZE;
} }
#ifdef NETSTACK_ENCRYPT
NETSTACK_ENCRYPT();
#endif /* NETSTACK_ENCRYPT */
transmit_len = packetbuf_totlen(); transmit_len = packetbuf_totlen();
NETSTACK_RADIO.prepare(packetbuf_hdrptr(), transmit_len); NETSTACK_RADIO.prepare(packetbuf_hdrptr(), transmit_len);
@ -933,10 +929,6 @@ input_packet(void)
/* printf("cycle_start 0x%02x 0x%02x\n", cycle_start, cycle_start % CYCLE_TIME);*/ /* printf("cycle_start 0x%02x 0x%02x\n", cycle_start, cycle_start % CYCLE_TIME);*/
#ifdef NETSTACK_DECRYPT
NETSTACK_DECRYPT();
#endif /* NETSTACK_DECRYPT */
if(packetbuf_totlen() > 0 && NETSTACK_FRAMER.parse() >= 0) { if(packetbuf_totlen() > 0 && NETSTACK_FRAMER.parse() >= 0) {
#if WITH_CONTIKIMAC_HEADER #if WITH_CONTIKIMAC_HEADER

8
core/net/mac/nullrdc.c
View File

@ -125,11 +125,6 @@ send_one_packet(mac_callback_t sent, void *ptr)
PRINTF("nullrdc: send failed, too large header\n"); PRINTF("nullrdc: send failed, too large header\n");
ret = MAC_TX_ERR_FATAL; ret = MAC_TX_ERR_FATAL;
} else { } else {
#ifdef NETSTACK_ENCRYPT
NETSTACK_ENCRYPT();
#endif /* NETSTACK_ENCRYPT */
#if NULLRDC_802154_AUTOACK #if NULLRDC_802154_AUTOACK
int is_broadcast; int is_broadcast;
uint8_t dsn; uint8_t dsn;
@ -275,9 +270,6 @@ packet_input(void)
original_datalen = packetbuf_datalen(); original_datalen = packetbuf_datalen();
original_dataptr = packetbuf_dataptr(); original_dataptr = packetbuf_dataptr();
#ifdef NETSTACK_DECRYPT
NETSTACK_DECRYPT();
#endif /* NETSTACK_DECRYPT */
#if NULLRDC_802154_AUTOACK #if NULLRDC_802154_AUTOACK
if(packetbuf_datalen() == ACK_LEN) { if(packetbuf_datalen() == ACK_LEN) {

4
core/net/netstack.c
View File

@ -46,9 +46,5 @@ netstack_init(void)
NETSTACK_RDC.init(); NETSTACK_RDC.init();
NETSTACK_MAC.init(); NETSTACK_MAC.init();
NETSTACK_NETWORK.init(); NETSTACK_NETWORK.init();
#ifdef NETSTACK_ENCRYPTION_INIT
NETSTACK_ENCRYPTION_INIT();
#endif /* NETSTACK_ENCRYPTION_INIT */
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/