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

Moved the link layer destination check to sicslowmac

Browse source
This commit is contained in:
nifi 2009-09-18 16:37:17 +00:00
parent 0c4dc6fc6b
commit 0ad51b8dcc
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/net/mac/sicslowmac.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: sicslowmac.c,v 1.3 2009/06/22 11:14:11 nifi Exp $ * $Id: sicslowmac.c,v 1.4 2009/09/18 16:37:17 nifi Exp $
*/ */
@ -190,10 +190,15 @@ read_packet(void)
/* Not broadcast or for our PAN */ /* Not broadcast or for our PAN */
PRINTF("6MAC: for another pan %u\n", frame.dest_pid); PRINTF("6MAC: for another pan %u\n", frame.dest_pid);
return 0; return 0;
} }
if(!is_broadcast_addr(frame.fcf.dest_addr_mode, frame.dest_addr.u8)) { if(!is_broadcast_addr(frame.fcf.dest_addr_mode, frame.dest_addr.u8)) {
packetbuf_set_addr(PACKETBUF_ADDR_RECEIVER, &frame.dest_addr); packetbuf_set_addr(PACKETBUF_ADDR_RECEIVER, &frame.dest_addr);
if(!rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER),
&rimeaddr_node_addr)) {
/* Not for this node */
PRINTF("6MAC: not for us\n");
return 0;
}
} }
} }
packetbuf_set_addr(PACKETBUF_ADDR_SENDER, &frame.src_addr); packetbuf_set_addr(PACKETBUF_ADDR_SENDER, &frame.src_addr);

13
core/net/sicslowpan.c
View file

@ -32,7 +32,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: sicslowpan.c,v 1.8 2009/07/10 13:33:45 dak664 Exp $ * $Id: sicslowpan.c,v 1.9 2009/09/18 16:37:17 nifi Exp $
*/ */
/** /**
* \file * \file
@ -1285,15 +1285,6 @@ input(const struct mac_driver *r)
} }
#endif /* SICSLOWPAN_CONF_CONVENTIONAL_MAC */ #endif /* SICSLOWPAN_CONF_CONVENTIONAL_MAC */
#if UIP_CONF_ROUTER
if(!rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER),
&rimeaddr_node_addr) &&
!rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_RECEIVER), &rimeaddr_null)) {
PRINTFI("sicslowpan: dropping packet not for us\n");
return;
}
#endif /* UIP_CONF_ROUTER */
/* init */ /* init */
uncomp_hdr_len = 0; uncomp_hdr_len = 0;
rime_hdr_len = 0; rime_hdr_len = 0;
@ -1483,7 +1474,7 @@ sicslowpan_init(const struct mac_driver *m)
#if SICSLOWPAN_CONF_COMPRESSION == SICSLOWPAN_CONF_COMPRESSION_HC01 #if SICSLOWPAN_CONF_COMPRESSION == SICSLOWPAN_CONF_COMPRESSION_HC01
#if SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS < 1 #if SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS < 1
#error sicslowpan compression HC01 requires at least one address context. #error sicslowpan compression HC01 requires at least one address context.
#error Change SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS int contiki-conf.h. #error Change SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS in contiki-conf.h.
#endif #endif
/* /*