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

Merge pull request #1543 from simonduq/pr/tsch-security-save-space

Browse source 
TSCH-Security regression test: save space
This commit is contained in:
Simon Duquennoy 2016-03-07 20:25:54 +01:00
parent 8b3d220761 8b63b41b96
commit 8e120748d3
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/net/mac/tsch/tsch.c
View file

@ -936,6 +936,7 @@ send_packet(mac_callback_t sent, void *ptr)
tsch_queue_packet_count(addr), tsch_queue_packet_count(addr),
p->header_len, p->header_len,
queuebuf_datalen(p->qb)); queuebuf_datalen(p->qb));
(void)packet_count_before; /* Discard "variable set but unused" warning in case of TSCH_LOG_LEVEL of 0 */
} }
} }
if(ret != MAC_TX_DEFERRED) { if(ret != MAC_TX_DEFERRED) {

2
examples/ipv6/rpl-tsch/project-conf.h
View file

@ -153,7 +153,7 @@
#define TSCH_SCHEDULE_CONF_DEFAULT_LENGTH 2 #define TSCH_SCHEDULE_CONF_DEFAULT_LENGTH 2
/* Reduce log level to make space for security on z1 */ /* Reduce log level to make space for security on z1 */
#undef TSCH_LOG_CONF_LEVEL #undef TSCH_LOG_CONF_LEVEL
#define TSCH_LOG_CONF_LEVEL 1 #define TSCH_LOG_CONF_LEVEL 0
#endif /* WITH_SECURITY */ #endif /* WITH_SECURITY */
#endif /* CONTIKI_TARGET_Z1 */ #endif /* CONTIKI_TARGET_Z1 */

3
regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
View file

@ -270,9 +270,6 @@ make node.z1 TARGET=z1 MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1</commands>
<script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD; <script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD;
&#xD; &#xD;
log.log("Waiting for association with security\n");&#xD; log.log("Waiting for association with security\n");&#xD;
/* Check that nodes associate with security */&#xD;
WAIT_UNTIL(msg.startsWith("TSCH: association done, sec 1,"));&#xD;
log.log("Association with security done\n");&#xD;
&#xD; &#xD;
/* Wait until a node (can only be the DAGRoot) has&#xD; /* Wait until a node (can only be the DAGRoot) has&#xD;
* 8 routing entries (i.e. can reach every node) */&#xD; * 8 routing entries (i.e. can reach every node) */&#xD;