Commit graph

783 commits

Author SHA1 Message Date
Robert Quattlebaum 28a1e40ebd core/lib/settings: Generalized Settings Manager to work on any platform
This commit moves the Settings Manager from the AVR codebase
into the Contiki core library. Any platform that implements
the Contiki EEPROM API can now use the Settings Manager's
key-value store for storing their persistent configuration info.

The Settings Manager is a EEPROM-based key-value store. Keys
are 16-bit integers and values may be up to 16,383 bytes long.
It is intended to be used to store configuration-related information,
like network settings, radio channels, etc.

 * Robust data format which requires no initialization.
 * Supports multiple values with the same key.
 * Data can be appended without erasing EEPROM.
 * Max size of settings data can be easily increased in the future,
   as long as it doesn't overlap with application data.

The format was inspired by the [OLPC manufacturing data format][].

Since the beginning of EEPROM often contains application-specific
information, the best place to store settings is at the end of EEPROM
(the "top"). Because we are starting at the end of EEPROM, it makes
sense to grow the list of key-value pairs downward, toward the start of
EEPROM.

Each key-value pair is stored in memory in the following format:

Order    | Size     | Name         | Description
--------:|---------:|--------------|-------------------------------
       0 |        2 | `key`        | 16-bit key
      -2 |        1 | `size_check` | One's-complement of next byte
      -3 |   1 or 2 | `size`       | The size of `value`, in bytes
-4 or -5 | variable | `value`      | Value associated with `key`

The end of the key-value pairs is denoted by the first invalid entry.
An invalid entry has any of the following attributes:

 * The `size_check` byte doesn't match the one's compliment of the
   `size` byte (or `size_low` byte).
 * The key has a value of 0x0000.

[OLPC manufacturing data format]: http://wiki.laptop.org/go/Manufacturing_data
2013-03-20 11:57:13 -07:00
Robert Quattlebaum da81360731 core/net/resolv: Misc. updates and cleanups. 2013-03-14 19:14:32 -07:00
Adam Dunkels 39e5a8c6dc Merge pull request #80 from darconeous/mdns-resolv
Adds IPv6 and MDNS domain name resolution.
2013-03-10 12:58:39 -07:00
Adam Dunkels 262c9db1c4 Merge pull request #127 from mkovatsc/master
Erbium CoAP draft 13
2013-03-10 12:56:06 -07: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
Robert Quattlebaum 1d113f52ad core/net/uip: Rename uip_ethaddr to uip_lladdr.
There isn't really a good reason I can think of for these
to be different between IPv4 and IPv6.
2013-03-10 11:39:11 -07:00
Adam Dunkels d2461c9e9a Merge pull request #99 from heipei/slip-radio
Load Makefile.target for slip-radio
2013-03-09 05:55:17 -08:00
Matthias Kovatsch 23e56e57b0 Merge branch 'master' of https://github.com/contiki-os/contiki 2013-03-08 20:21:54 +01:00
Oliver Schmidt 49ca10d540 Removed PFS code from C128 WGET.
On the C128 the custom PFS code doesn't add functionality (as it does with IDE64 support on the C64) but is "only" smaller than the POSIX file i/o code in the C library. But the stdio code in the C library (used in WGET for screen i/o) relies on the POSIX file i/o code anyway so there no point in additionally adding the PFS code to the WGET program.
2013-03-06 14:50:51 +01:00
Oliver Schmidt 9040f83fd4 Reduced program size.
On the C128 the custom PFS code doesn't add functionality (as it does with IDE64 support on the C64) but is "only" smaller than the POSIX file i/o code in the C library. But the POSIX directory access code in the C library relies on the POSIX file i/o code anyway so there no point in additionally adding the PFS code to the FTP program.
2013-02-14 15:57:20 +01:00
Oliver Schmidt 107b79c019 The recent cc65 snapshot yields somewhat small programs so we can move back to the MTU size used before. 2013-02-14 15:45:33 +01:00
Matthias Kovatsch 82884ab63f Fixed legacy CoAP versions. 2013-02-13 19:22:21 +01:00
Matthias Kovatsch a522357d20 Added Erbium coap-12 and coap-13. 2013-02-13 17:46:35 +01:00
Oliver Schmidt ea4fac679f Allow user to read the result of wget.
Several retro targets clear the screen after program termination so allow user to read the result.
2013-02-11 00:24:51 +01:00
Oliver Schmidt 945b334457 Minor uIP code increase from Contiki 2.5 to Contiki 2.6 make a buffer reduction necessary. 2013-02-03 23:41:20 +01:00
Oliver Schmidt 81bc336a93 Updated Contiki URL in sample web page. 2013-02-03 10:57:48 +01:00
Oliver Schmidt 7360444c94 Have the wget process allow the resolver process to initialize properly. 2013-02-01 00:10:03 +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
Adam Dunkels 47c2b13db5 Merge pull request #78 from g-oikonomou/example-putchars
We can now turn off example-provided putchars
2013-01-09 22:41:22 -08:00
George Oikonomou a35580d068 cc2530 udp server example is no longer RPL root by default 2013-01-09 22:46:20 +00:00
George Oikonomou de251aeb85 We can now turn off example-provided putchars 2013-01-09 22:23:22 +00:00
George Oikonomou 64a95dcb59 Code style fixes: sensinode examples 2012-12-16 19:28:56 +00:00
George Oikonomou 594ba9a0ed Code style fixes: cc2530dk examples 2012-12-16 19:28:56 +00:00
George Oikonomou e38b419e84 Deleted obsolete sensinode examples 2012-12-16 19:28:41 +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
Mariano Alvira e4a383d61d don't use static routing with econotag platform 2012-11-20 13:22:28 -05:00
George Oikonomou 5762179159 cc2530dk: Sniffer example changes:
- Building for the cc2531 USB dongle by default
- We turn on USB-serial buffered mode

Closes #21
2012-11-04 21:44:38 +00:00
George Oikonomou 9215081f41 cc2530dk: Border router example changes:
- It now plays nicely with the cc2531 USB dongle
- We build it for the dongle by default
- Debugging with cc2530dk functions instead of printf
- Using __nonbanked optimisations
- During prefix requests, invert LED blinking to make things more visible
- Removed leftover include
- Code style fixes

See Pull Request #21
2012-11-04 21:44:24 +00:00
George Oikonomou 13f20225a6 Sensinode: Border router debug without printf
Closes #20
2012-11-04 21:44:06 +00:00
George Oikonomou be93f1ae52 cc2531: Added a new USB demo project (CDC-ACM)
See Pull Request #18
2012-11-01 17:42:01 +00: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
Niclas Finne f5c8cff5b2 Made MT stack size configurable 2012-10-23 00:52:52 +02:00
George Oikonomou 8699f7741d Fixed typos and a stray printf. Adjusted comments 2012-09-07 17:31:25 +01:00
simonduq 1bb055bae6 Fixed the udp-stream example: use the new RPL interface, reduce RAM usage 2012-08-30 13:22:27 +02:00
Antonio Lignan c5e9d688a5 Fixed sht11 driver, now ensures the i2c bus is disabled when initializing 2012-08-16 14:12:27 +02:00
Antonio Lignan 73e7f25cbc Simple phidget-like relay driver for the Z1 mote with basic functionalities 2012-07-30 11:27:13 +02:00
George Oikonomou 43f2790357 Added channel_get() to the cc2x3x RF drivers 2012-07-11 10:53:14 +01:00
Nicolas Tsiftes 86115a392e Include string.h 2012-06-27 15:44:53 +02:00
Nicolas Tsiftes 0ba83a10df Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-06-27 15:42:51 +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
Nicolas Tsiftes 21f2b42090 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-06-11 08:01:03 +02:00
David Kopf 37c407b177 Patch from Landon Fuller adds const to PROGMEM, required for newer avr-gcc 2012-06-10 12:54:11 -04:00
Matthias Kovatsch 9096da299e Added sub-resource example. 2012-06-09 12:20:57 +02:00
Matthias Kovatsch ed66cfa364 Disabled debugging. 2012-06-09 11:18:51 +02:00
Matthias Kovatsch 6c813f0fb1 Fixed bug in debug print noticed by Linus. 2012-06-09 11:14:25 +02:00
Matthias Kovatsch 4a96e12890 Added Giovanni Pellerano's radio resource. 2012-06-09 10:47:09 +02:00
Nicolas Tsiftes e84d6fc665 Added default targets and removed certain C flags. 2012-06-04 20:02:23 +02:00