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

Merge branch 'develop' into contrib/osx-linker-fatal-warnings

Browse Source
This commit is contained in:
George Oikonomou 2018-05-15 21:14:50 +01:00 committed by GitHub
commit 290c7f0386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/services/rpl-border-router/native/slip-dev.c
View File

@ -336,7 +336,7 @@ slip_flushbuf(int fd)
if(slip_begin == slip_packet_end) {
slip_packet_count--;
if(slip_end > slip_packet_end) {
memcpy(slip_buf, slip_buf + slip_packet_end,
memmove(slip_buf, slip_buf + slip_packet_end,
slip_end - slip_packet_end);
}
slip_end -= slip_packet_end;

9
tests/17-tun-rpl-br/09-native-border-router-cooja-frag.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
# Contiki directory
CONTIKI=$1
# Simulation file
BASENAME=07-native-border-router-cooja
bash test-native-border-router.sh $CONTIKI $BASENAME fd00::204:4:4:4 60 600 2

8
tests/17-tun-rpl-br/test-native-border-router.sh
View File

@ -12,6 +12,12 @@ IPADDR=$3
# Time allocated for convergence
WAIT_TIME=$4
# Payload len. Default is ping6's default, 56.
PING_SIZE=${5:-56}
# Inter-ping delay. Default is ping6's default, 1s.
PING_DELAY=${6:-1}
# ICMP request-reply count
COUNT=5
@ -30,7 +36,7 @@ sleep $WAIT_TIME
# Do ping
echo "Pinging"
ping6 $IPADDR -c $COUNT | tee $BASENAME.scriptlog
ping6 $IPADDR -c $COUNT -s $PING_SIZE -i $PING_DELAY | tee $BASENAME.scriptlog
# Fetch ping6 status code (not $? because this is piped)
STATUS=${PIPESTATUS[0]}
REPLIES=`grep -c 'icmp_seq=' $BASENAME.scriptlog`