mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-09 23:54:32 +00:00
Merge pull request #1543 from simonduq/pr/tsch-security-save-space
TSCH-Security regression test: save space
This commit is contained in:
commit
8e120748d3
@ -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) {
|
||||||
|
@ -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 */
|
||||||
|
@ -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 */
|
<script>TIMEOUT(300000); /* Time out after 5 minutes */
|
||||||

|

|
||||||
log.log("Waiting for association with security\n");
|
log.log("Waiting for association with security\n");
|
||||||
/* Check that nodes associate with security */
|
|
||||||
WAIT_UNTIL(msg.startsWith("TSCH: association done, sec 1,"));
|
|
||||||
log.log("Association with security done\n");
|
|
||||||

|

|
||||||
/* Wait until a node (can only be the DAGRoot) has
|
/* Wait until a node (can only be the DAGRoot) has
|
||||||
* 8 routing entries (i.e. can reach every node) */
|
* 8 routing entries (i.e. can reach every node) */
|
||||||
|
Loading…
Reference in New Issue
Block a user