deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
13011 commits 6 branches 13 tags 80 MiB
Commit graph

13011 commits

This branch
This branch
All branches
Author SHA1 Message Date
Harald Pichler 9fb2352b08 bugfix buffer overflow 2017-02-01 10:28:02 +01:00
Harald Pichler 2f8549aaae Merge branch 'contiki' 
Conflicts:
	cpu/cc26xx-cc13xx/lib/cc13xxware
	cpu/cc26xx-cc13xx/lib/cc26xxware
 2017-01-31 15:00:59 +01:00
Oliver Schmidt 8248f524f5 Merge pull request #2091 from oliverschmidt/master 
Revert to static Ethernet driver for the ATARI.
 2017-01-27 11:34:44 +01:00
Oliver Schmidt a6472c8dd9 Revert to static Ethernet driver for the ATARI. 
After all there's no momentum for a W5100-based Ethernet solution on the ATARI. So I revert to static linkage of the CS8900A driver as this improves program load times.
 2017-01-27 00:18:25 +01:00
Atis Elsts cd1bcb101d CC26xx IEEE mode radio: fix reading lqi 2017-01-26 13:31:15 +00:00
George Oikonomou 7b7781360f Merge pull request #2071 from g-oikonomou/bugfix/cc13xx/no-acks 
Make the number of Prop Mode RX Buffers easy to configure
 2017-01-21 00:17:49 +00:00
Nicolas Tsiftes 5eb2ac15ff Merge pull request #2073 from cetic/pr-fix-send-na 
Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS
 2017-01-20 13:18:43 +01:00
Nicolas Tsiftes 0cfda4c026 Merge pull request #2053 from cetic/pr-fix-dag-lifetime 
Use RPL_DAG_LIFETIME when computing dag lifetime
 2017-01-20 11:08:43 +01:00
Simon Duquennoy d59bbcf86c Merge pull request #2080 from yatch/pr/tsch-reenable-regression-test 
TSCH: re-enable TSCH regression tests
 2017-01-19 16:53:21 +01:00
Yasuyuki Tanaka 2d44b47050 Print an entry for the root node as well as other entries 2017-01-19 14:36:59 +01:00
Yasuyuki Tanaka 651147df57 TSCH: Fix incorrect test criteria for regression-tests 
The tests are recognized as success when a return value by
rpl_ns_num_nodes(), the number of entries in the nodelist, tells all the
routes for the nodes in the network are installed.

There are eight nodes in addition to one root node. Therefore, the value
for test success should not be eight but nine since we have to take into
account an nodelist entry for the root.
 2017-01-19 14:35:37 +01:00
Yasuyuki Tanaka ac937eda24 TSCH: re-enable TSCH regression tests with Cooja mote 2017-01-19 14:25:06 +01:00
Yasuyuki Tanaka 83f2382791 Orchestra: avoid a link error for nbr_routes 2017-01-19 13:55:08 +01:00
Nicolas Tsiftes 2e754c7832 Merge pull request #2063 from cetic/pr-ndp-config 
Make all NDP configuration parameters user configurable
 2017-01-17 08:22:52 +01:00
Nicolas Tsiftes f80f673e21 Merge pull request #2062 from cetic/pr-add-defrt_list_head 
Adding uip_ds6_defrt_list_head()
 2017-01-17 08:21:50 +01:00
Laurent Deru 0fb597f2fa Use RPL_DAG_LIFETIME when computing dag lifetime 2017-01-16 16:56:22 +01:00
Laurent Deru 12c930893c Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
Laurent Deru e5a604552e Allow modification of IP64 prefix 2017-01-16 14:38:35 +01:00
Laurent Deru 10be59cc15 Update nameserver using DHCP info 2017-01-16 14:38:35 +01:00
Laurent Deru 37fe6a2fa6 Use uip-debug in ip64-ipv4-dhcp.c 2017-01-16 14:37:52 +01:00
Laurent Deru 63ac4d2a3d Adding uip_ds6_defrt_head() 2017-01-16 13:54:36 +01:00
Laurent Deru 88d0003b75 Make all NDP configuration parameters user configurable 2017-01-16 13:50:56 +01:00
Antonio Lignan a7b5050382 Merge pull request #2047 from contiki-os/orion-update-motelist-string 
Orion: update motelist string
 2017-01-15 16:06:23 +01:00
George Oikonomou 5fb226f4c9 Make the count of prop mode RX buffers configurable 2017-01-15 12:31:09 +00:00
George Oikonomou 07de8b238b Easy manipulation of CC13xx Prop Mode RX buffers 2017-01-15 12:25:10 +00:00
George Oikonomou ba12ed2cce Re-initialise RX buffers each time we turn the RF on 2017-01-15 12:24:30 +00:00
George Oikonomou 82fd325b7a Merge pull request #2069 from alignan/pull/light-example-verbatim 
Explicitly specify light sensor model in example
 2017-01-15 11:52:09 +00:00
Antonio Lignan 999b246fd2 Explicitly specify light sensor model in example 2017-01-14 22:57:08 +01:00
Antonio Lignan 3d40056f4f Merge pull request #2054 from cetic/pr-check-incoming-rank 
Reject parents with invalid rank
 2017-01-13 16:08:00 +01:00
Antonio Lignan 0fb4a68332 Merge pull request #2052 from cetic/pr-rpl-route-infinite-lifetime 
Make RPL route lifetime RFC compliant
 2017-01-13 16:07:09 +01:00
Laurent Deru 0da6e128eb Remove servername from DHCP request 2017-01-13 13:35:25 +01:00
Laurent Deru f9ffa252f6 Reject parents with invalid rank 2017-01-13 12:32:33 +01:00
Laurent Deru d866e6bd34 Make RPL route lifetime RFC compliant 2017-01-13 10:54:06 +01:00
Antonio Lignan 10d54f228b Orion: update motelist string 
Updates the expected motelist string
 2017-01-12 11:23:20 +01:00
Nicolas Tsiftes c1f11cfaa9 Merge pull request #2034 from Vinggui/patch-1 
Fixing Avr-Zigbit Makefile not compiling.
 2017-01-12 07:49:30 +01:00
Vinicius Guimaraes 5e05a951f2 Fixing Avr-Zigbit Makefile not compiling 
Fixed two errors in Zigbit's makefile:
-Compiling "frame.c" here is not necessary (already done in radio's makefile) and brings up an error. Removing it.
-Fixed undefined reference to "link_stats_input_callback" in "../../core/net/ipv6/sicslowpan.c:1521". Module "core/net" was missing.
Compiling working now.
 2017-01-11 15:56:20 -02:00
Simon Duquennoy bb4f2e5678 Merge pull request #2043 from e120guru/master 
Fixed rime-tsch sync problem in Cooja
 2017-01-11 18:15:43 +01:00
Michael Karlsson 22d10ba03a Added Cooja target config to rime-tsch example 2017-01-11 16:35:16 +01:00
Simon Duquennoy fe210b05f0 Merge pull request #2002 from yatch/pr/tsch-misc-update 
TSCH Miscelleneous updates
 2017-01-10 14:05:36 +01:00
Yasuyuki Tanaka 1d5fc88ae9 TSCH: fix indentation in tsch-packet.c 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka 3dc74dc632 TSCH: fix a wrong return value 
tsch_security_secure_frame() returns the length of MIC in case of
success. Otherwise, it is supposed to return 0. There was one case where
it returns 1 in an error handling block.
 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka 4069ac5262 TSCH: add a regression test for tsch-packet.c 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka 35a1701236 TSCH: handle error cases returning -1 properly 
- tsch_send_eb_process() in tsch-slot-operation.c
- tsch_rx_slot()         in tsch.c
 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka 0b81c0de18 TSCH: make *dest_addr const (tsch_packet_create_eack) 2017-01-10 11:45:59 +01:00
Yasuyuki Tanaka 667dd6a210 TSCH: put tsch_ prefix to definitions in the global scope 
struct asn_t         -> struct tsch_asn_t
  struct asn_divisor_t -> tsch_asn_divisor_t
  ASN_ macros          -> TSCH_ASN_ macros
  current_asn          -> tsch_current_asn
 2017-01-10 11:45:59 +01:00
Antonio Lignan 7d9134757f Merge pull request #2004 from yatch/pr/tsch-security-update 
Trivial Updates on tsch-security.[ch]
 2017-01-10 11:23:55 +01:00
Pere Tuset 361cb612a7 Reduce bootloader baudrate to be on the safe side. 2017-01-10 10:59:06 +01:00
Antonio Lignan 82f3ce392e Merge pull request #2028 from joakimeriksson/minimal-net-ND-fix 
added support for 6-bytes link-layer address
 2017-01-10 09:07:50 +01:00
Antonio Lignan 247d79ea7c Merge pull request #2011 from jdede/z1-llsec 
Enable llsec on Z1 nodes
 2017-01-10 09:07:27 +01:00
Antonio Lignan bfef0b5d6a Merge pull request #2032 from simonduq/pr/tsch-ka-fix 
TSCH bugfix: reset keep-alive timeout when switching time source
 2017-01-10 08:47:30 +01:00