Commit Graph

588 Commits

Author SHA1 Message Date
Mariano Alvira
4dd29cca64 er-13 has changed the type of notify_subscribers counter to int32_t
from uint16_t which breaks builds of WITH_COAP=3 or 7.

This patch changes the 03 and 07 engine to int32_t.

An alternate fix would be to switch out the type in erbuim.h based on
WITH_COAP.

Or, maybe better, would be to drop old COAP versions.
2013-03-11 16:49:52 -04: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
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
Matthias Kovatsch
23e56e57b0 Merge branch 'master' of https://github.com/contiki-os/contiki 2013-03-08 20:21:54 +01:00
Oliver Schmidt
c7b8bac006 Reorganized web page attribute data handling.
- Up to now the web browser used several fixed size arrays to hold the various types attribute data of the web page. This turned out to be way to inflexible for any non-trivial web page. Therefore now all attribute data is stored in a single buffer one after the other as they arrive from the parser only occupying the memory actually needed. This allows for pages with many links with rather short URLs as well as pages with few link with long URLs as well as pages with several simple forms as well as pages with one form with many form inputs.

- Using the actual web page buffer to hold the text buffers of text entry fields was in general a cool idea but in reality it  is often necessary to enter text longer than the size of the text entry field. Therefore the text buffer is now stored in the new unified attribute data buffer.

- Splitting up the process of canonicalizing a link URL and actually navigating to the resulting URL allowed to get rid of the 'tmpurl' buffer used during form submit. Now the form action is canonicalized like a usual link, then the form input name/value pairs are written right into the 'url' buffer and afterwards the navigation is triggered.

- Support for the 'render states' was completely removed. The only actually supported render state was centered output. The new unified attribute buffer would have complicated enumerating all widgets added to the page in order to adjust their position. Therefore I decided to drop the whole feature as the <center> tag is barely used anymore and newer center attributes are to hard to parse.
2013-03-06 16:29:36 +01:00
Oliver Schmidt
65a4472a0d Limit content of web browser version of http-strings to web browser.
In general it seems a bad idea to have two http-strings.c files as this precludes to have them both in the Contiki library. However as it stands it seems most reasonable to have one http-strings.c file be a clean superset of all usecases in order to allow them to run together in a single binary. As webserver/http-strings.c already contained strings not present in webbrowser/http-strings.c it seems reasonable to consider webserver/http-strings.c as the superset described. From that perspective it is appropriate to remove all strings from webbrowser/http-strings.c which are not used by the web browser in order to save memory otherwise wasted.
2013-03-06 15:12:02 +01:00
Oliver Schmidt
d71ce70c54 Made sure that HTML form values get initialized properly. 2013-02-19 21:40:21 +01:00
Oliver Schmidt
d5d646528e Added support for self closing tags.
XHTML requires self closing tags to be used for empty tags, so we need to recognize them.
2013-02-19 00:49:01 +01:00
Oliver Schmidt
374c89be01 Added newline on </div>.
The tag <div> (in contrast to the tag <span>) is normally used to denote content placed on a line by its own. So it makes sense to trigger a newline when </div> is processed.
2013-02-19 00:43:16 +01:00
Oliver Schmidt
4938877dd9 Lifted restrictions on accepted MIME type.
The "normal" web is moving forward quickly reducing the interoperability of the Contiki web browser to nearly zero. The Mobile Web fits the capabilities of the Contiki web browser much better. Modern smartphones don't need the Mobile Web anymore but there are large areas in world with rather low end mobile phones and limited mobile bandwidth where the Mobile Web will be necessary for quite some time.

From that perspective it is reasonable to increase the Contiki web browser's interoperability with the Mobie Web - namely WAP 2.0 aka XHTML MP. XHTML MP is delivered as MIME types 'application/vnd.wap.xhtml+xml' or 'application/xhtml+xml'. Therefore we (try to) parse the document if the MIME type contains the substring 'html' (which is true 'text/html' too).
2013-02-19 00:25:36 +01:00
Oliver Schmidt
15fb63ba9a Harmonized ststus texts and and added status on wrong MIME type. 2013-02-18 23:08:05 +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
b493395f00 Allow to reduce functionality if non-standard alloca() isn't available. 2013-02-04 00:49:52 +01:00
Adam Dunkels
99f541e8fd Updated to the latest 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
nvt
757a54f63c Added some comments about Antelope and Coffee. 2012-11-19 13:21:59 +01:00
George Oikonomou
713c2e5974 DOS EOL and indentation fixes (core/ apps/ cpu/)
- Removed some DOS EOLs
- Changed some tabs to spaces
- Removed some trailing whitespaces

Part of Pull Request #6
2012-10-30 13:43:51 +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
Adam Dunkels
a3e56371a5 Bumped version number 2012-07-12 11:33:12 +02:00
Adam Dunkels
dd148e1d12 Bumped version number 2012-07-12 11:30:05 +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
Nicolas Tsiftes
4f6fb987c3 The keyword structure can be constant. 2012-06-07 10:20:27 +02:00
Nicolas Tsiftes
23cfc77218 Removed previous language grammar. Added a parameter for the bytecode size. 2012-06-04 19:44:08 +02:00
Fredrik Osterlind
10064dbdd9 bugfix: control messages were lost due to lack of buffers; wait for buffer before sending 2012-05-30 18:01:04 +02:00
Niclas Finne
0d6dabe6f5 lookup content type only when needed 2012-05-29 19:28:14 +02:00
Fredrik Osterlind
a95c2cf6c1 bugfix: ptr must be preserved until psock has finished 2012-05-29 17:40:33 +02:00
Niclas Finne
ec1d598148 Precision (printf("%.Ns", text1)) not supported by all compilers, for example some versions of avrgcc and mspgcc. 2012-05-16 11:23:17 +02:00
Matthias Kovatsch
c1b318356e Renamed static functions for clearer memory profiles. 2012-05-13 17:29:21 +02:00
Niclas Finne
28c62208cb Added check for illegal attributes in packet attribute serialization 2012-04-20 22:40:24 +02:00
David Kopf
0612f771c6 Restart ajax on changed update time, remove unused variable. 2012-04-09 10:04:41 -04:00
Matthias Kovatsch
ed92994784 Clean-up and fix for rest-server-example. 2012-03-29 18:56:46 +02:00
Matthias Kovatsch
3b2fe65c66 Added rt filtering for Link Format. 2012-03-29 18:16:28 +02:00
Matthias Kovatsch
c023faead2 Added Content-Type to observe notifications. 2012-03-29 18:16:25 +02:00
Matthias Kovatsch
949ba03bda Changed notify API to passing a notification message. 2012-03-29 18:16:24 +02:00
Matthias Kovatsch
d102d8c607 Changed separate API and fixed token bug. 2012-03-29 18:16:23 +02:00
Niclas Finne
7bf4fa4bff Removed obsolete mac pointer 2012-03-28 21:51:19 +02:00
Matthias Kovatsch
e794088d19 Made Block1 support dependent on resource handlers.\nAdded flags and target for minimal-net. 2012-03-17 15:32:51 +01:00
Joakim Eriksson
3852585c26 added sub resource macro 2012-03-12 16:27:26 -07:00
David Kopf
ca273e28e9 Add variable update time for Ajax display. Update status.shtml with <pre> tag now used by cgi. 2012-03-10 10:43:23 -05:00
Matthias Kovatsch
cd802979da Fixed token bug in separate response and extended API (thanks to Klaus Hartke for the bug report). 2012-02-06 06:22:55 +01:00
Matthias Kovatsch
2ef46ac47a Bugfix for separate NON requests and updated separate resonse API.\nEnabled multiple BLOCKING_REQUESTs in the same scope. 2012-02-05 06:21:35 +01:00
David Kopf
709822042c Redo html output, more options, httpd state variables to allow neighbors and routes to span tcp segments. 2012-03-02 15:51:42 -05:00
Matthias Kovatsch
860de0dd01 Bugfixes for observing. Many thanks to Klaus Hartke. 2012-02-01 05:16:16 +01:00
Matthias Kovatsch
c1aa211dc7 Added RST-MID matching for observing. 2012-02-01 03:58:35 +01:00
Matthias Kovatsch
dc6142fa0b Revised Erbium observing. 2012-02-01 03:24:49 +01:00
Matthias Kovatsch
4a02790c76 Simplified Erbium support for separate responses. 2012-01-31 04:38:07 +01:00
Matthias Kovatsch
b44d125d80 Observe handler now checks if GET request. 2012-01-30 22:01:31 +01:00
Matthias Kovatsch
de82815186 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
Conflicts:
	apps/er-coap-06/er-coap-06-engine.c
	apps/er-coap-06/er-coap-06-observing.c
	apps/er-coap-06/er-coap-06-separate.c
	apps/er-coap-06/er-coap-06-transactions.c
	apps/er-coap-06/er-coap-06.c

Removed er-coap-06.
2012-01-30 01:30:49 +01:00
David Kopf
ea3d427c33 Add PAGETITLE option to webserver-nano, compress status page white space. 2012-02-21 11:19:25 -05:00
Nicholas J Humfrey
efab964451 Converted u8_t to uint8_t and u16_t to uint16_t in the apps directory. 2012-02-21 08:33:25 -05:00
David Kopf
38267bfd5a Webserver-nano: Add page load times, remove workaround code for bug in arm strformat.c, correct the double count of leading zeros there. 2012-02-11 14:58:35 -05:00
Matthias Kovatsch
f23e86f589 Moved status code API from REST engine to main coap implementation. 2012-01-30 01:28:43 +01:00
Matthias Kovatsch
a4589ee9da Renamed CoAP transaction ID (tid) to message ID (mid). 2012-01-28 19:21:13 +01:00
Matthias Kovatsch
bca4d56eec Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-28 18:52:45 +01:00
Matthias Kovatsch
2240289d1f Erbium code cleanup. 2012-01-28 18:52:14 +01:00
Niclas Finne
c8c5ddd99d Updated API to avoid compiler warnings (added const) 2012-01-22 22:27:23 +01:00
Matthias Kovatsch
4c3e858df5 Made Erbium function parameters const where applicable.\nMinor clean-up. 2012-01-20 18:30:12 +01:00
Matthias Kovatsch
0a4c77dbff Fixed snprintf() return value handling. 2012-01-20 16:11:45 +01:00
Matthias Kovatsch
690e03a8a7 Removed Erbium CoAP draft-06. 2012-01-20 16:08:24 +01:00
Maxim Osipov
37faa8ce59 Fix alignment issue on ARM
Signed-off-by: Maxim Osipov <maxim.osipov@gmail.com>
2012-01-13 19:38:46 -05:00
Matthias Kovatsch
c861ce0197 Fixed Erbium bugs (ext. header, client request path) and added server resource config defines. 2012-01-12 20:19:54 +01:00
Nicolas Tsiftes
510f20dc42 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-10 11:38:57 +01:00
Nicolas Tsiftes
343b2376c0 Use variable-length arrays instead of alloca. 2012-01-10 11:38:33 +01:00
Niclas Finne
1a761ec3eb fixed compiler warning 2012-01-09 14:54:53 +01:00
Niclas Finne
8b83ffec67 Added native-border-router and slip-radio 2012-01-01 09:29:33 +01:00
Nicolas Tsiftes
3f31fb9514 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2012-01-04 09:15:44 +01:00
Fredrik Osterlind
abc4cee94d hex conversion and crc shell commands 2011-12-21 10:54:39 +01:00
Fredrik Osterlind
e743039261 no newline added by echo command 2011-12-21 10:51:23 +01:00
Nicolas Tsiftes
c6fb738f98 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-12-08 15:57:30 +01:00
Nicolas Tsiftes
5994200578 Added reference. 2011-12-08 15:57:11 +01:00
Matthias Kovatsch
9b4860e644 Fixed bug in block size negotiation. 2011-12-07 20:46:12 +01:00
Matthias Kovatsch
b2cd4638bd Removed debug output. 2011-12-07 19:43:30 +01:00
Matthias Kovatsch
1ac07971e2 Fixed int serialization bug (affected large values). 2011-12-07 19:35:11 +01:00
nvt
bbddbdee05 New attribute must be put into storage. 2011-12-06 19:10:22 +01:00
Nicolas Tsiftes
50342fa801 Publishing Antelope - a DBMS for sensor devices. For details, see A Database in Every Sensor, N. Tsiftes and A. Dunkels, in Proceedings of ACM SenSys 2011. 2011-12-02 18:58:12 +01:00
Nicolas Tsiftes
a81cbbbd80 Do not return test execution status. The information is already available in the test object, and it becomes possible for test function to easily clean up state allocated during the test by putting such code after UNIT_TEST_END. 2011-12-01 14:40:54 +01:00
David Kopf
062b85123e Add Raven battery display to status page 2011-11-14 11:38:44 -05:00
David Kopf
9587b39707 atmega128rfa1 ajax power and sensor reporting, longint calculation bugfixes. 2011-11-08 12:14:31 -05:00
David Kopf
91cf1cc92e Condense js file and hopefully convert to unix line endings. Move r.abort to stop button so IE9 can stop ajax streaming. 2011-11-05 14:34:04 -04:00
David Kopf
404895ec04 Add streaming ajax page with csv text buffer 2011-11-03 14:58:33 -04:00
David Kopf
ccd866cdd4 Better formatting of webserver-nano status page 2011-10-13 11:18:14 -04:00
Joakim Eriksson
cf61e522a8 added powertrace to IPv6 including an example 2011-10-13 15:09:40 +02:00
Matthias Kovatsch
df9f871313 Fixed Erbium chunks for minimal-net 2011-10-10 16:09:17 +02:00
Matthias Kovatsch
65955ca477 Fixed bug in well-known/core resource for small block sizes 2011-10-10 14:17:56 +02:00
David Kopf
dd71927576 Add ENERGEST, RIMESTATS, COMPOWER to status page 2011-10-04 14:10:32 -04:00
Matthias Kovatsch
f71b0bc794 Added Erbium REST engine with new CoAP implementation 2011-09-14 16:33:01 +02:00
David Kopf
c22dd67ada Revert rules to rebuild httpd-fs.c and httpd-fsdata.c 2011-09-11 12:25:30 -04:00
David Kopf
d01df43a0c Drop unneded null byte at end of httpd-fsdata files. 2011-09-10 13:04:21 -04:00
Adam Dunkels
4e5d3217ca Copy the string first, since shell_output_str() does not ensure constness of the first string 2011-08-31 22:03:31 +02:00
Adam Dunkels
2cbec29a42 Explicitly initialize module if it wasn't initialized before the first registration 2011-08-29 21:59:08 +02:00
Adam Dunkels
6699f6a6f6 To avoid ambiguity, address should be explicitly set by caller, not automatically by the module. 2011-08-29 21:56:49 +02:00
David Kopf
4fee1513ff makefsdata must be run with HTTPD_STRING_ADDR 2011-08-25 14:43:55 -04:00
David Kopf
c23abeb3ed More reliable webserver-nano build 2011-08-24 10:52:30 -04:00
David Kopf
93097dcc0a Minor tweaks based on maniacbug commits. 2011-08-16 14:25:16 -04:00
Adam Dunkels
3b7666956f Bugfix: removed extreanous asterix character 2011-08-08 22:26:44 +02:00
David Kopf
e2ad2acde4 Add stk500 platform and changes suggested by Daniel Willmann 2011-08-03 11:18:55 -04:00
David Kopf
e953b66f78 avr-libc %.*s workaround 2011-08-03 11:10:26 -04:00