Commit Graph

2298 Commits

Author SHA1 Message Date
Joakim Eriksson 795f646787 Merge pull request #34 from simonduq/pr/no-ipv4
Removing IPv4 stack
2017-06-21 14:31:58 +02:00
Simon Duquennoy 3d5ee21d69 Fix a number of compiler warnings 2017-06-21 12:06:57 +02:00
Simon Duquennoy 1c5c8798c7 Removing old/unused libs 2017-06-19 11:41:42 +02:00
Simon Duquennoy 1a0f8ab737 Removing IPv4 stack 2017-06-16 17:32:22 +02:00
Simon Duquennoy 2928e3e440 Remove cooja-ip64 compiler warnings 2017-05-18 10:23:28 +02:00
Simon Duquennoy ea09903d67 Move llsec802154.h to core/net/mac 2017-05-18 09:56:57 +02:00
Simon Duquennoy 78e424200b http-socket as an app 2017-05-18 09:26:44 +02:00
Simon Duquennoy f79aa2174e All MAC layers as distinct modules 2017-05-17 22:00:16 +02:00
Simon Duquennoy 880e69f770 Merging csma and nullrdc 2017-05-17 21:50:33 +02:00
Simon Duquennoy b81e039e34 Added missing include 2017-05-17 15:38:51 +02:00
Simon Duquennoy 2018c18130 Removing unused features of nullrdc 2017-05-17 15:30:17 +02:00
Simon Duquennoy d1641530dd Merge branch 'wip/platform-cleanup' into wip/mac-rdc
Conflicts:
	drivers/dev/cc2520/cc2520.c
	drivers/platform/wismote/Makefile.wismote
	drivers/platform/wismote/contiki-conf.h
	drivers/platform/wismote/contiki-wismote-main.c
	drivers/platform/z1/Makefile.z1
	drivers/platform/z1/contiki-conf.h
	drivers/platform/z1/contiki-z1-main.c
	examples/ipso-objects/cooja-example-ipso-objects.csc
	examples/rssi-scanner/Makefile
2017-05-17 15:13:16 +02:00
Simon Duquennoy aa1191d8f0 Remove RDC layer 2017-05-17 15:09:19 +02:00
Simon Duquennoy bd6f26963a Fix cc2538-common example makefile 2017-05-17 15:09:07 +02:00
Simon Duquennoy 95323b9ce7 Remove channel_check_interval 2017-05-17 14:34:29 +02:00
Simon Duquennoy 682e8f42b9 nullmac: now a MAC that does nothing 2017-05-17 14:27:12 +02:00
Simon Duquennoy 8cc5e082ac Removing more refs to old platforms 2017-05-17 13:56:30 +02:00
Simon Duquennoy 766c0e21dd Removing platform z1 2017-05-17 13:48:01 +02:00
Simon Duquennoy a346959ba4 Removing unused framer 2017-05-16 22:23:05 +02:00
Simon Duquennoy 35a9984122 Removing the need for nullrdc-noframer 2017-05-16 22:12:40 +02:00
Simon Duquennoy 3e07d4a060 Netstack defaults 2017-05-16 22:12:34 +02:00
Simon Duquennoy a980593bd6 Added framer sub-directory to core/net/mac 2017-05-16 21:05:21 +02:00
Simon Duquennoy 6220aea14a Removing Rime, old platforms, old MAC layers, LLSEC (as a layer), some examples and apps 2017-05-14 01:14:05 +02:00
Nicolas Tsiftes 66fe7abf79 Merge pull request #2188 from tonnenpinguin/pr/uninitialized_variables
Fix several uninitialized variables
2017-04-21 17:59:12 +02:00
Bernhard Hackl 848f801460 Fix several uninitialized variables 2017-04-19 01:55:27 -07:00
Nicolas Tsiftes 38b82aeeeb Merge pull request #2189 from tonnenpinguin/pr/unterminated_strings
Fix potentially unterminated strings
2017-04-18 16:39:34 +02:00
Nicolas Tsiftes 52c709bdb7 Merge pull request #2101 from yatch/pr/bugfix-rpl-icmp6
RPL: fix a bug accessing an uninitialized pointer
2017-04-18 16:09:06 +02:00
Bernhard Hackl ae91d6b4b1 Fix potentially unterminated strings 2017-04-14 08:33:40 -07:00
Simon Duquennoy a330f59b8e TSCH readme: update with 802.15.4-2015 and 6TiSCH 2017-04-04 14:15:48 +02:00
Simon Duquennoy 51205eb809 TSCH readme: link to reference paper on implem and eval 2017-04-04 14:12:35 +02:00
Yasuyuki Tanaka faeb71de00 RPL: fix a bug accessing an uninitialized pointer
This bug is uncovered when RPL_WITH_MULTICAST is enabled.
2017-04-03 17:54:25 +09:00
Yasuyuki Tanaka b7b23b712f RPL: fix indentation (rpl-icmp6.c) 2017-04-03 17:52:58 +09:00
Nicolas Tsiftes 7342a3f8a7 Merge pull request #2103 from stringr9/bugfix/non-storing-drop-fix
Don't drop packets bound for outside the RPL mesh in non-storing mode
2017-03-23 14:27:06 +01:00
Mohamed Seliem 08b12f2346 fix a macro related to multicast, which are not user configuration
fix a macro related to multicast, which are not user configuration
- RPL_CONF_MULTICAST      -> RPL_WITH_MULTICAST
2017-03-17 20:21:56 +02:00
Nicolas Tsiftes b756841522 Merge pull request #2102 from yatch/pr/rpl-leaf-only-debug-msg
RPL: move a debug message for RPL_LEAF_ONLY to a correct place
2017-03-10 15:11:31 +01:00
andrewbrannan 0a85ccdc56 prevent the rpl root from dropping packets bound for outside the dodag while in NS mode 2017-03-08 14:34:25 +00:00
Laurent Deru 9b6ba3c009 Make frame fcf creation and parsing standalone functions 2017-03-08 15:25:55 +01:00
Simon Duquennoy c37e7cfb0e Merge pull request #2108 from yatch/pr/poc-tsch-queue-flush-nbr-queue
TSCH: POC of a bug in tsch_queue_flush_nbr_queue()
2017-03-08 10:18:41 +01:00
Antonio Lignan f5f13c968c Merge pull request #2061 from cetic/pr-nat64-small-updates
Various updates for NAT64
2017-02-21 21:52:18 +01:00
Yasuyuki Tanaka effdc6e212 TSCH: add debug messages to track queued packet addresses 2017-02-10 16:56:14 +01:00
Yasuyuki Tanaka 25ac43dae9 RPL: move a debug message for RPL_LEAF_ONLY to a correct place 2017-02-08 00:02:26 +01:00
Oliver Schmidt 6463c91a4f Removed artifacts of former uip_appdata handling.
Adam Dunkels writes on 2/5/2017 on the Contiki mailing list:
[...] the original idea was that the application could just point the uip_appdata pointer to wherever the data was, but we then changed it so that the data actually had to be copied into the uip_aligned_buf buffer. So, yes, the network device driver should only need to read from this buffer. [...]

This change removes comments on the possibility of uip_appdata pointing somewhere outside the uip_aligned_buf. And it removes code in the SLIP drivers not necessary anymore.

Additionally it makes code in a SLIP driver optional that takes care of the Microsoft-specific CLIENT / SERVER / CLIENTSERVER chat.
2017-02-05 23:20:39 +01: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
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 3d40056f4f Merge pull request #2054 from cetic/pr-check-incoming-rank
Reject parents with invalid rank
2017-01-13 16:08:00 +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
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 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
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 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
Nicolas Tsiftes 1537488e74 Merge pull request #2035 from simonduq/pr/csma-fix
CSMA bugfix: do not use field on a struct that may have been deallocated
2017-01-09 08:45:49 +01:00
Simon Duquennoy 0de3563ddb CSMA bugfix: do not use field on a struct that may have been deallocated 2017-01-05 10:47:11 +01:00
Antonio Lignan 53efcec1fa Merge pull request #1994 from yatch/pr/bugfix-framer802154-sender-addr
Bugfix on source address setting in framer_802154.create()
2017-01-04 14:10:57 +01:00
Simon Duquennoy fe99f1144a TSCH bugfix: reset keep-alive timeout when switching time source 2017-01-04 11:01:46 +01:00
Joakim Eriksson cbf4a843e2 fixed comment. 2016-12-29 22:49:01 +01:00
Yasuyuki Tanaka 4faf139523 TSCH: change the return type of the APIs (tsch-security.h)
The return type is changed to "int" to "unsigned int" because APIs
provided by tsch-security are supposed to return an integer larger than
or equal to zero. This change clarifies that.
2016-12-15 19:32:22 +01:00
Yasuyuki Tanaka da853386a6 TSCH: fix indentation in tsch-packet.c 2016-12-15 19:32:04 +01:00
Yasuyuki Tanaka 38ff8e5283 TSCH: add brief API explanations (tsch-security.h) 2016-12-15 19:16:28 +01:00
Yasuyuki Tanaka 5186fa2ef1 TSCH: set PACKETBUF_ADDR_SENDER before NETSTACK_framer.create() 2016-12-15 15:10:15 +01:00
Yasuyuki Tanaka da29a5f8e3 ContikiMAC: set PACKET_ADDR_SENDER in qsend_list() 2016-12-15 15:10:15 +01:00
Yasuyuki Tanaka 586fb9a7fe framer-802154: bugfix on source address setting 2016-12-15 15:10:15 +01:00
Yasuyuki Tanaka aa1f408825 packetbuf: add packetbuf_remaininglen()
packetbuf_freelen() returns the length of free space in packetbuf.
2016-12-14 14:19:46 +01:00
Yasuyuki Tanaka c48cfb6b9d Fix indentation in packetbuf.h 2016-12-14 14:16:55 +01:00
Yasuyuki Tanaka a3417b82b0 Fix indentation in packetbuf.c 2016-12-14 14:16:55 +01:00
Nicolas Tsiftes 1249d9cf8d Merge pull request #1855 from MohamedSeliem/patch-5
DAD: Remove useless "if" that tests if the source address is unspecified
2016-12-08 20:08:58 +01:00
Nicolas Tsiftes d133ed898f Merge pull request #1914 from yatch/pr/802154-panid-handling
frame802154: comply with IEEE 802.15.4-2015 on PAN ID Field Handling
2016-12-08 18:37:58 +01:00
Yasuyuki Tanaka 5fdd731166 frame802154: fix a typo in a comment 2016-12-05 22:45:07 +01:00
Yasuyuki Tanaka 3872965362 frame802154: comply with IEEE 802.15.4-2015 on PAN ID Field Handling
This patch changes the behaviors of frame802154_has_panid() for frames
of frame version 0b10 so that it complies with the PAN ID Field Handling
specification in IEEE 802.15.4-2015. For the other frame versions, 0b00
and 0b01, no change is made in frame802154_has_panid().

For more information, please refer to:
https://github.com/contiki-os/contiki/pull/1914/
2016-12-05 22:45:07 +01:00
Nicolas Tsiftes f09e84976a Merge pull request #1950 from yatch/pr/update-for-tsch-cooja-mote
Miscellaneous updates for tsch-cooja-mote
2016-12-05 18:40:28 +01:00
Antonio Lignan 95f69d92a8 Merge pull request #1918 from adamdunkels/pr-websocket-2
Contiki websocket client
2016-12-05 06:46:43 +01:00
George Oikonomou d6656ccde1 Fix minor typo 2016-12-03 23:26:25 +00:00
Nicolas Tsiftes 238e8b4dcf Merge pull request #1949 from simonduq/pr/non-storing-fix-dtsn
RPL non-storing: more conservative DTSN update
2016-12-01 16:27:38 +01:00
Simon Duquennoy 7bb50da178 Merge pull request #1271 from drugo72/pr-rpl
RPL: fix clock_time_t calculations
2016-12-01 16:22:43 +01:00
Yasuyuki Tanaka 106731cec1 TSCH: update README.md
- add cooja / Cooja mote as supported platform
- correct Rx mode requirements
2016-11-26 11:47:59 +01:00
George Oikonomou 610eefc2ff Merge pull request #1741 from simonduq/pr/tsch-adaptive-control-traffic
TSCH adaptive control traffic
2016-11-25 15:53:32 +00:00
Simon Duquennoy 3e00adacc0 RPL non-storing: more conservative DTSN update, as per RFC 6550, section 9.6. 2016-11-25 16:30:08 +01:00
Nicolas Tsiftes edf3a27920 Merge pull request #1879 from pernin/master
Change on DIO trickle timer condition for DIO sending
2016-11-25 16:15:08 +01:00
Luca Pernini 5803971adc Changing DIO timer condition - merge 2016-11-24 10:52:10 +01:00
Simon Duquennoy 86dbd590db Merge pull request #1400 from pablocorbalan/nud-with-acks
Refresh nbr reachable state after received IPv6 unicast message
2016-11-23 12:00:13 +01:00
Simon Duquennoy ecd1d57eec Merge pull request #1661 from yatch/pr-tsch-cooja-mote
TSCH on Cooja mote
2016-11-23 11:59:29 +01:00
Cristiano De Alti 1bdec853e1 Prevent interger overflow on the AVR
Compiling examples/er-rest-example for the avr-raven gives:

  integer overflow in expression [-Woverflow]

On the AVR int is 16 bit and some calculations may overflow.
This happens for example with multiplications involving
CLOCK_SECOND where all the operands are of type int.
Casting one of the operands to clock_time_t forces
the arithmetic to clock_time_t without increasing the size
of the program (the calculation is performed at compile time).
2016-11-05 22:46:42 +01:00
Adam Dunkels 36afb693b0 Removed left-over debug printout 2016-11-02 21:54:15 +01:00
Adam Dunkels 869df3bc36 Updated copyright statements 2016-11-02 21:54:02 +01:00
Adam Dunkels 937fddbedf Removed blanks 2016-11-02 21:53:43 +01:00
Adam Dunkels c484ee4998 Added comments 2016-11-02 21:53:31 +01:00