Commit Graph

217 Commits

Author SHA1 Message Date
Simon Duquennoy
4a93f5148d Fixed a number of compiler warnings 2015-05-08 09:07:20 +02:00
Simon Duquennoy
290fc829ea Consistently use PACKETBUF_ATTR_MAC_SEQNO for MAC sequence number, both input and output. Disable PACKETBUF_ATTR_PACKET_ID in the non-Rime case. 2015-05-06 16:34:44 +02:00
Simon Duquennoy
bb76bb8beb Remove unused flag SICSLOWPAN_CONF_ACK_ALL. Include packetbuf attribute PACKETBUF_ATTR_RELIABLE only when RIME is compiled. 2015-05-06 16:34:26 +02:00
Michael Richardson
5699127c9a additional edits to further clarify interface between native-border-router and slip-radio 2015-02-07 10:51:41 -05:00
Michael Richardson
a0ac6bceb6 added some documentation of native-border-router and slip-radio relationship 2015-02-03 11:05:13 -05:00
Simon Duquennoy
c2ca3e9fdb Cleanup UIP_CONF_IPV6_RPL configuration 2014-12-02 12:38:55 +01:00
Simon Duquennoy
74f6ae3751 slip-radio: remove unneeded definition of NETSTACK_CONF_WITH_RPL (now set from makefile with CONTIKI_WITH_RPL) 2014-12-01 21:04:25 +01:00
Simon Duquennoy
a9cc909794 Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_* 2014-12-01 21:02:57 +01:00
Simon Duquennoy
722b3258d1 Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack. 2014-12-01 20:13:09 +01:00
Joakim Gebart
1e03cdd553 examples/ipv6/rpl-border-router: Add -DUIP_CONF_TCP=1 to CFLAGS
The example used to rely on the default value being set to 1 which
caused build failures on platforms which have a default UIP_CONF_TCP=0

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-11-26 19:05:32 +01:00
Adam Dunkels
d891d11324 Merge pull request #557 from kkrentz/llsec-integration
Integration of Link Layer Security
2014-10-08 15:45:46 +02:00
Joakim Gebart
d4179a0a0c examples/rpl-border-router: Fix two minor warnings.
- Remove unused variable i in generate_routes.
 - Add cast to unsigned long for printf(..%lu..) in generate_routes.

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-10-04 18:05:38 +02:00
kkrentz
2cf7d98cad ContikiMAC: Create and parse ContikiMAC header in special framer; Expanded framer interface
to allow for creating and securing frames in advance; Create and secure frames in advance when sending bursts; Do neither recreate nor resecure frames that come from phase
2014-08-05 05:07:06 -07:00
kkrentz
c396a85364 llsec: Added a layer in between NETSTACK_MAC and NETSTACK_NETWORK for implementing link layer security 2014-08-04 01:09:57 -07:00
Rémy Léone
911f3aa07c SkyByteRadio was replaced by Msp802154Radio 2014-07-23 15:42:59 +02:00
George Oikonomou
a9e7bea675 Make DODAG ID selection RFC 6550-compliant
Some calls to `rpl_set_root` select a hardcoded DODAG ID
(0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011)

This is against what RFC 6550 says. We change these calls
to select a DODAG ID corresponding to a routable v6 address
corresponding to the root
2014-06-12 00:09:53 +01:00
Niclas Finne
68730566a3 Added method to framer that returns the header length if the framer
would create a header with the current packet information.

This allows sicslowpan to calculate the max payload size without
consuming a sequence number or clearing/restoring the packet buffer.
2014-04-11 17:03:23 +02:00
Adam Dunkels
d397e97e74 Minor code style fixes 2014-03-05 20:31:18 +00:00
George Oikonomou
0bbb574689 IPv6 Multicast Example 2014-03-05 20:31:17 +00:00
Adam Dunkels
45265249fc Changed the name of the rimeaddr module to linkaddr 2014-01-29 20:12:24 +01:00
Adam Dunkels
0fe08205e1 Moved the rimeaddr.[ch] code from the core/net/rime module to the core/net module, as it is used not only by rime code 2014-01-26 23:20:36 +01:00
Adam Dunkels
4cfe6c4a5e Moved the sht11 driver to its own module 2014-01-26 23:20:30 +01:00
Adam Dunkels
0b805e4763 Moved the cc2420 driver into a separate dev/cc2420 module 2014-01-26 23:20:27 +01:00
Adam Dunkels
5f3fe7f7c7 Updated include paths for the moved files under net/ 2014-01-26 23:20:23 +01:00
Mariano Alvira
54719b75b8 Merge pull request #140 from cetic/slip-radio-platforms
Extend slip-radio example for Econotag and Nooliberry
2013-12-02 09:23:10 -08:00
Adam Dunkels
0d04db2b03 Merge pull request #428 from g-oikonomou/config-sanity
Remove unnecessary stuff from various Makefiles (Config Sanity, Pt 1)
2013-11-26 15:05:08 -08:00
Nicolas Tsiftes
db4cada4e7 Merge pull request #462 from adamdunkels/push/no-reserved-double-inclusion-defines
Remove all leading double underscore inclusion #defines
2013-11-26 14:26:37 -08:00
Adam Dunkels
bb2dcaa057 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
Adam Dunkels
9f2e233770 The RPL_PARENT_COUNT() macro doesn't exist anymore - use the uip_ds6_nbr_num() function instead 2013-11-24 15:17:53 +01:00
Fredrik Osterlind
b5c94910ac Renamed Java packages to match our contiki-os.org domain. Note that this commit does not affect external dependencies
like /tools/mspsim.

This is a very simple modification that affects a very large number of files in Contiki: Cooja,
/platform/cooja, Collect-view, Coffe-manager, and Cooja simulation files (.csc).

I've gone through Contiki to update all references I could find. Nevertheless, this commit will likely
break external dependencies, like saved Cooja simulation files.
2013-11-20 16:43:27 +01:00
George Oikonomou
58ef2342c2 Stop setting WITH_UIP6=1 in example Makefiles
It achieves exactly nothing other than generate confusion
2013-11-20 14:52:32 +00:00
Giovanni evilaliv3 Pellerano
7fa2ce1329 fixed a C error "della madonna"
http://it.wikipedia.org/wiki/Jerry_Cal%C3%A0
2013-10-23 15:21:07 +02:00
Simon Duquennoy
248301a041 Fix naming issues and includes in uip-ds6-nbr.h 2013-08-19 17:48:30 +02:00
Simon Duquennoy
5dc05e7913 Port apps, examples, platforms and tools so they use the new neighbor and route API. 2013-08-19 17:48:30 +02:00
Simon Duquennoy
ff093a2b50 Removed now unused per-module neighbor table size configs. Use NEIGHBOR_CONF_MAX_NEIGHBORS instead. 2013-08-19 17:48:30 +02:00
Nicolas Tsiftes
9b3c704be5 Merge pull request #210 from joakimeriksson/master
Fixed native border router to compile and have less packet loss (due to slip-dev bug).
2013-05-20 04:39:36 -07:00
Joakim Eriksson
a096ace73e fixed bug causing lots of packet loss 2013-05-04 13:13:08 -07:00
Joakim Eriksson
26d3359683 make native border router use ipv6 stack and not rime 2013-05-04 13:12:09 -07:00
Rémy Léone
e6bd4f1dde Rename to md 2013-03-26 23:15:37 +01:00
Rémy Léone
7b40a568a6 Update to markdown
- Spellchecking
- Update plain text to github markdown
2013-03-26 16:55:19 +01:00
Adam Dunkels
277a348f60 Changed the name of the IPv6 number of route entries configuration from UIP_CONF_DS6_ROUTE_NBU to UIP_CONF_MAX_ROUTES. 2013-03-18 11:12:44 +01:00
Robert Quattlebaum
f145c17039 core/net/resolv: IPv6 and mDNS ("Bonjour") support. Major refactor.
This patch updates the DNS resolver to support IPv6 and introduces an
improved API for looking up DNS entries. This patch also adds optional
support for mDNS lookups and responses to the DNS resolver.

Here is a quick summary of the changes:

 * Added support for IPv6 lookups.
 * DNS queries now honor record expiration.
 * Added support for mDNS, compatible with "Bonjour".
 * Implemented a new lookup api, `resolv_lookup2()`, which provides
   more information about the state of the record(error, expired,
   looking-up, etc.).

About mDNS/Bonjour Support
--------------------------

This patch adds basic support for mDNS/Bonjour, which allows you to
refer to the name of a device instead of its IP address. This is
incredibly convenient for IPv6 addresses because they tend to be very
long and difficult to remember. It is especially important for
link-local IPv6 addresses, since not all programs support the '%'
notation for indicating a network interface (required on systems with
more than one network interface to disambiguate).

In other words, instead of typing in this:

 * `http://[fe80::58dc:d7ed:a644:628f%en1]/`

You can type this instead:

 * `http://contiki.local/`

Huge improvement, no?

The convenience extends beyond that: this mechanism can be used for
nodes to talk to each other based on their human-readable names instead
of their IPv6 addresses. So instead of a switch on
`aaaa::58dc:d7ed:a644:628f` triggering an actuator on
`aaaa::ed26:19c1:4bd2:f95b`, `light-switch.local` can trigger the
actuator on `living-room-lights.local`.

What you need to do to be able to look up `.local` names on your
workstation depends on a few factors:

 * Your machine needs to be able to send and receive multicast packets
   to and from the LoWPAN. You can do this easily with the Jackdaw
   firmware on an RZUSBStick. If you have a border router, you will need
   it to bridge the mDNS multicast packets across the border.

 * If you are using a Mac, you win. All Apple devices support mDNS
   lookups.

 * If you are using Windows, you can install Apple's Bonjour for Windows
   package. (This may be already installed on your machine if you have
   installed iTunes) After you install this you can easily do `.local`
   lookups.

 * If you are using a Unix machine, you can install Avahi.

The default hostname is set to `contiki.local.`. You can change the
hostname programmatically by calling `resolv_set_hostname()`. You can
change the default hostname by changing `CONTIKI_CONF_DEFAULT_HOSTNAME`.

You may disable mDNS support by setting `RESOLV_CONF_SUPPORTS_MDNS` to
`0`.

---------------------------------

core/net/resolv: `resolv_lookup2()` -> `resolv_lookup()`

Note that this patch should fix several `resolv_lookup()` bugs
that already existed. There were many cases where `resolv_lookup()`
was being called and the IP address ignored, but later code
assumed that the IP address had been fetched... ANYWAY, those
should be fixed now.

---------------------------------

examples/udp-ipv6: Updated client to use MDNS to lookup the server.

Also updated the Cooja regression test simulation.
2013-03-10 11:40:08 -07:00
Sébastien Dawans
de3cd3811d Restore CC2420 as default in slip-radio 2013-02-20 18:26:52 +01:00
Laurent Deru
3486c69981 SLIP-radio support for the Econotag 2013-02-19 21:52:59 +01:00
Sébastien Dawans
e05ab21557 SLIP-radio support for the Nooliberry (RF230 radio) 2013-02-19 21:52:54 +01:00
Johannes Gilger
3877f361e4 Load Makefile.target for slip-radio
This loads Makefile.target into Makefile so we can check for TARGET==sky
when building this. Compilation for sky fails without it.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2013-01-30 15:34:06 +01:00
George Oikonomou
de251aeb85 We can now turn off example-provided putchars 2013-01-09 22:23:22 +00:00
Adam Dunkels
99f541e8fd Updated to the latest uip-ds6-route API 2012-11-27 23:04:34 +01:00
Adam Dunkels
5406dd8b18 Updated to use the new uip-ds6-route API 2012-11-27 23:04:34 +01:00
Adam Dunkels
ec8c7e9be0 Cleanup of the node-id.h files. The node-id.h file contains
declarations of functions for setting and getting a node ID number, a
functionality that exists on many platforms. Since this functionality
was not considered part of the Contiki core, each platform defined its
own node-id.h file. This commit attempts to clean this up by
collecting the node-id.h into a core/sys/node-id.h file that replaces
the old node-id.h files from the platform directories.
2012-11-20 19:59:46 +01:00
Adam Dunkels
944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
Joakim Eriksson
51b73127e9 * Simple JSON parser and generator.
* Simple HTTP webservice with support for both receiving and sending HTTP requests.
* json-ws example that optionally push sensor data to COSM over IPv6.
2012-06-12 16:42:16 +02:00
Niclas Finne
f177284a73 Added option to specify the IPv6 prefix 2012-06-12 16:32:05 +02:00
Niclas Finne
16bb9295f3 Added configurable delay between slip packets to avoid losing data 2012-04-20 22:40:45 +02:00
Niclas Finne
28c62208cb Added check for illegal attributes in packet attribute serialization 2012-04-20 22:40:24 +02:00
Niclas Finne
1733f3b6bc Added command context. Patch by Joakim Eriksson 2012-04-20 22:31:37 +02:00
Joakim Eriksson
90e969344a added config for serializing attributes 2012-03-16 03:08:47 -07:00
Niclas Finne
9217c8b321 fixed compiler warning 2012-03-14 15:20:02 +01:00
Joakim Eriksson
adff634b88 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-03-09 01:11:21 -08:00
Joakim Eriksson
ae3ff57c39 replaced inet6 with inet for linux to get tunbridge working. 2012-03-09 01:09:56 -08:00
David Kopf
07f6e10c1c Add display options to border router web page, default now uses stack instead of static buffer.
Turn radio off until prefix is acquired.
2012-03-02 16:01:12 -05:00
Ilya Dmitrichenko
b67e49051c Use __APPLE__ instead of __MACH__. 2012-03-02 15:15:46 -05:00
Ilya Dmitrichenko
7621bdfc77 Fixed ifconfig for Darwin 2012-03-02 15:15:45 -05:00
Ilya Dmitrichenko
70d3acf9af Fixed baudrate issue on Darwin. 2012-03-02 15:15:44 -05:00
David Kopf
7110075108 Make static buffer the default, add comments. 2012-03-06 09:10:12 -05:00
Niclas Finne
40c32990e3 Added missing arguments to usage information 2012-03-06 12:33:16 +01:00
Joakim Eriksson
417a2b691f increase uip buffer size for native border router 2012-02-23 13:59:39 -08:00
Niclas Finne
5fdcd6bc13 Fixed typo, added option to run without slip connection 2012-02-21 14:42:05 +01:00
Nicholas J Humfrey
a561d20828 Converted u8_t to uint8_t and u16_t to uint16_t in the examples directory. 2012-02-21 08:33:25 -05:00
Niclas Finne
23a70177b2 Added option to connect to server instead of serial device 2012-02-21 11:05:52 +01:00
David Kopf
0327fe3020 Turn off RDC before SLIP prefix interchange. Disable SIN/SUT prints, leave off-route prints. 2012-02-11 15:15:00 -05:00
Niclas Finne
aceb36c66b Replaced SELECT_CALLBACK with an API that supports multiple select callbacks 2012-01-19 17:52:01 +01:00
Adam Dunkels
8a89f90e3e Update to the newest RPL API 2012-01-18 06:12:24 -08:00
David Kopf
b251619a2f Add wpcap for cygwin/Windows native border router 2012-01-08 13:37:56 -05:00
David Kopf
777cc88872 Add 921600 baud to slip options, fix compiler warnings 2012-01-08 13:33:40 -05:00
Joakim Eriksson
3d388760c3 added parsing of frame to get receiver address, etc 2012-01-08 02:27:37 -08:00
Niclas Finne
8b83ffec67 Added native-border-router and slip-radio 2012-01-01 09:29:33 +01:00
Joakim Eriksson
65163a9b57 Changed FRAMER to return negative values for error to allow 0 size headers. 2012-01-01 09:10:56 +01:00
Mariano Alvira
5247be27bf dio_intcurrent is now part of the instance struct 2011-12-09 11:15:33 -05:00
Nicolas Tsiftes
d0ebeb409e Merge remote-tracking branch 'sf/master' into rpl-patch
Conflicts:
	core/net/tcpip.c
2011-12-08 15:26:11 +01:00
Nicolas Tsiftes
6177187954 Check the return value of udp_new. 2011-12-01 14:40:55 +01:00
Nicolas Tsiftes
2b1549bfe8 Continued merge with sf master 2011-11-21 15:25:13 +01:00
Nicolas Tsiftes
0e32956a63 Merge remote-tracking branch 'sf/master' into rpl-patch 2011-11-21 14:59:31 +01:00
Niclas Finne
c273969400 Added missing include 2011-11-15 15:14:43 +01:00
David Kopf
899123a634 Use fixed font for neighbors and routes 2011-10-27 09:25:56 -04:00
Joakim Eriksson
cf61e522a8 added powertrace to IPv6 including an example 2011-10-13 15:09:40 +02:00
Matthias Kovatsch
2522566b68 Added SMALL flag for border-router (exceeded sky memory) 2011-10-10 14:30:31 +02:00
Niclas Finne
c46acc0a77 Updated for the latest version of httpd-simple in rpl-border-router 2011-09-06 00:25:20 +02:00
Niclas Finne
c1b88afe48 Added safeguard to avoid copying too much data to filename 2011-09-06 00:19:31 +02:00
Adam Dunkels
bfc314a037 Remove debug output to save space 2011-09-05 12:08:26 +02:00
Adam Dunkels
a06cf93e4c Made the sky and z1 platform handling of PROJECT_CONF_H the same as the other platforms: the makefile should define PROJECT_CONF_H to be the name of the header file to include. This header file should #undef everything it #defines, as it is included after all the other configuration options in contiki-conf.h 2011-09-05 11:46:15 +02:00
Adam Dunkels
722b6e0b96 Print out sender IPv6 address when receiving data. When sending data, include a counter in the message. 2011-09-01 09:19:26 +02:00
Adam Dunkels
69d262af5b Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-08-31 20:57:31 +02:00
Adam Dunkels
587ac9c501 Copyright headers 2011-08-31 20:54:57 +02:00
David Kopf
407c76c5df output buffer unused at present, save some RAM 2011-08-31 11:52:55 -04:00
Adam Dunkels
823f28e87c Made the simple UDP examples simpler 2011-08-29 21:51:09 +02:00
Adam Dunkels
2ae835ef65 Simulation file for the unicast example 2011-08-29 21:41:25 +02:00
Adam Dunkels
e480740fd9 Simulation file for the broadcast example 2011-08-29 21:41:15 +02:00
Adam Dunkels
b3f3163661 Example code for the simple UDP API 2011-08-29 21:33:23 +02:00
David Kopf
c42085c00b Add warning about slip overrun 2011-08-24 10:59:15 -04:00