d102d8c607
Changed separate API and fixed token bug.
2012-03-29 18:16:23 +02:00
7bf4fa4bff
Removed obsolete mac pointer
2012-03-28 21:51:19 +02:00
e794088d19
Made Block1 support dependent on resource handlers.\nAdded flags and target for minimal-net.
2012-03-17 15:32:51 +01:00
3852585c26
added sub resource macro
2012-03-12 16:27:26 -07:00
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
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
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
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
860de0dd01
Bugfixes for observing. Many thanks to Klaus Hartke.
2012-02-01 05:16:16 +01:00
c1aa211dc7
Added RST-MID matching for observing.
2012-02-01 03:58:35 +01:00
dc6142fa0b
Revised Erbium observing.
2012-02-01 03:24:49 +01:00
4a02790c76
Simplified Erbium support for separate responses.
2012-01-31 04:38:07 +01:00
b44d125d80
Observe handler now checks if GET request.
2012-01-30 22:01:31 +01:00
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
ea3d427c33
Add PAGETITLE option to webserver-nano, compress status page white space.
2012-02-21 11:19:25 -05:00
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
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
f23e86f589
Moved status code API from REST engine to main coap implementation.
2012-01-30 01:28:43 +01:00
a4589ee9da
Renamed CoAP transaction ID (tid) to message ID (mid).
2012-01-28 19:21:13 +01:00
bca4d56eec
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-01-28 18:52:45 +01:00
2240289d1f
Erbium code cleanup.
2012-01-28 18:52:14 +01:00
c8c5ddd99d
Updated API to avoid compiler warnings (added const)
2012-01-22 22:27:23 +01:00
4c3e858df5
Made Erbium function parameters const where applicable.\nMinor clean-up.
2012-01-20 18:30:12 +01:00
0a4c77dbff
Fixed snprintf() return value handling.
2012-01-20 16:11:45 +01:00
690e03a8a7
Removed Erbium CoAP draft-06.
2012-01-20 16:08:24 +01:00
37faa8ce59
Fix alignment issue on ARM
...
Signed-off-by: Maxim Osipov <maxim.osipov@gmail.com>
2012-01-13 19:38:46 -05:00
c861ce0197
Fixed Erbium bugs (ext. header, client request path) and added server resource config defines.
2012-01-12 20:19:54 +01:00
510f20dc42
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-01-10 11:38:57 +01:00
343b2376c0
Use variable-length arrays instead of alloca.
2012-01-10 11:38:33 +01:00
1a761ec3eb
fixed compiler warning
2012-01-09 14:54:53 +01:00
8b83ffec67
Added native-border-router and slip-radio
2012-01-01 09:29:33 +01:00
3f31fb9514
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2012-01-04 09:15:44 +01:00
abc4cee94d
hex conversion and crc shell commands
2011-12-21 10:54:39 +01:00
e743039261
no newline added by echo command
2011-12-21 10:51:23 +01:00
c6fb738f98
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-12-08 15:57:30 +01:00
5994200578
Added reference.
2011-12-08 15:57:11 +01:00
9b4860e644
Fixed bug in block size negotiation.
2011-12-07 20:46:12 +01:00
b2cd4638bd
Removed debug output.
2011-12-07 19:43:30 +01:00
1ac07971e2
Fixed int serialization bug (affected large values).
2011-12-07 19:35:11 +01:00
bbddbdee05
New attribute must be put into storage.
2011-12-06 19:10:22 +01:00
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
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
062b85123e
Add Raven battery display to status page
2011-11-14 11:38:44 -05:00
9587b39707
atmega128rfa1 ajax power and sensor reporting, longint calculation bugfixes.
2011-11-08 12:14:31 -05:00
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
404895ec04
Add streaming ajax page with csv text buffer
2011-11-03 14:58:33 -04:00
ccd866cdd4
Better formatting of webserver-nano status page
2011-10-13 11:18:14 -04:00
cf61e522a8
added powertrace to IPv6 including an example
2011-10-13 15:09:40 +02:00
df9f871313
Fixed Erbium chunks for minimal-net
2011-10-10 16:09:17 +02:00
65955ca477
Fixed bug in well-known/core resource for small block sizes
2011-10-10 14:17:56 +02:00
dd71927576
Add ENERGEST, RIMESTATS, COMPOWER to status page
2011-10-04 14:10:32 -04:00
f71b0bc794
Added Erbium REST engine with new CoAP implementation
2011-09-14 16:33:01 +02:00
c22dd67ada
Revert rules to rebuild httpd-fs.c and httpd-fsdata.c
2011-09-11 12:25:30 -04:00
d01df43a0c
Drop unneded null byte at end of httpd-fsdata files.
2011-09-10 13:04:21 -04:00
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
2cbec29a42
Explicitly initialize module if it wasn't initialized before the first registration
2011-08-29 21:59:08 +02:00
6699f6a6f6
To avoid ambiguity, address should be explicitly set by caller, not automatically by the module.
2011-08-29 21:56:49 +02:00
4fee1513ff
makefsdata must be run with HTTPD_STRING_ADDR
2011-08-25 14:43:55 -04:00
c23abeb3ed
More reliable webserver-nano build
2011-08-24 10:52:30 -04:00
93097dcc0a
Minor tweaks based on maniacbug commits.
2011-08-16 14:25:16 -04:00
3b7666956f
Bugfix: removed extreanous asterix character
2011-08-08 22:26:44 +02:00
e2ad2acde4
Add stk500 platform and changes suggested by Daniel Willmann
2011-08-03 11:18:55 -04:00
e953b66f78
avr-libc %.*s workaround
2011-08-03 11:10:26 -04:00
44f4ee9315
Use PROCESS_NAME_STRING macro to handle NO_PROCESS_NAMES
2011-08-03 11:08:40 -04:00
7fc6c8d678
Collect view for z1
2011-07-29 14:49:35 +02:00
e3368ffb67
Fix avr progmem string accesses, add DEBUGLOGIC, configure sky defaults
2011-07-25 15:08:49 -04:00
67ac9f3c3e
Add /apps/webserver-nano
2011-07-24 12:04:41 -04:00
058bb6039b
Include status cgi's with explicit define
2011-06-30 12:10:16 -04:00
cfd3198fda
Restore lines that were excluded for VC++ test build
2011-06-28 08:59:39 -04:00
c48b7ab78d
Add RPL nodes and border router to minimal-net platform (cygwin only)
2011-06-28 08:19:48 -04:00
ddd245ed15
Added streaming mode for page updates. Rewrote and removed some legacy code. Improved error checks and comments.
2011-06-14 17:12:15 +02:00
c48f8fd39a
Keep gcc 4.x from complaining about 'lvalue required as increment operand'.
2011-05-22 23:08:40 +02:00
baae42b2f8
Made DNS optional - just like the other web clients.
2011-05-21 22:33:18 +02:00
d4f49fa204
Added explicit rejection of multiple connections.
...
Although a simple solution the recently introduced approach to just not listen to incoming connetions if there's already one has the downside that one doesn't know if a connection fails because the server is down or becuase there's a connection.
Therefore now connections are always accepted but after sending a message to the user and waiting a few seconds they are closed.
The appstate is used used in a somewhat unusual way here: The one and only "active" connection has an appstate of 0. For all other connections the appstate is initially set to 1. Then it is increased on every uIP poll until it reaches 10, which triggers the connection close. This somewhat hacky approach allows to keep track of the rejected sessions without any additional state variables and/or timers.
2011-05-21 21:03:04 +02:00
8c00be1a56
Minor beautification / optmization of prompt / banner custimization.
2011-05-21 20:52:00 +02:00
3d9771403e
Merge remote-tracking branch 'origin/master'
2011-05-21 11:50:56 +02:00
ff9dd0fce4
Improved shell banner / prompt customization.
...
Working with string-type macros on cmdlines is a pain in the nack so rather go for global string constants activated by simple flag-type macros.
2011-05-21 11:48:50 +02:00
0b6f9c0e97
Bug fix by Kovatsch Matthias.
2011-04-17 22:50:28 +02:00
d862e9dcfb
Allow only one Telnet connection at a time.
...
As the session state management of Telnet server is a single static variable allowing more than one connection leads to inconsistencies.
2011-04-17 12:46:42 +02:00
831312e311
Some Telnet server enhancements:
...
- PETSCII sending support
- Option to customize shell prompt and banner
- Stop all running commands on shell close
- New 'exit' and 'quit' commands to close shell
2011-04-16 21:10:22 +02:00
31a14c3d90
Commented periodic resource related stuff for the sake of small code print and added minimal-net configuration in README.
2011-04-13 00:07:47 +02:00
78f7a74689
Merge remote-tracking branch 'origin/master'
2011-04-12 14:14:45 +02:00
07f3df45be
Converted scope-local variables into function-local variables.
...
The 6502-specific LC implementation doesn't allow for scope-local vaiables between PT_BEGIN/PROCESS_BEGIN/PSOCK_BEGIN and PT_BEGIN/PROCESS_END/PSOCK_END.
2011-04-12 14:12:09 +02:00
4432a2e551
Bugfix for Post method not allowed.
2011-04-12 00:54:19 +02:00
91dd236c55
Changes for minimal-net and bug fix for buffer handling.
2011-04-12 00:09:15 +02:00
1716d837fc
Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup
...
Makefile.z1 is broken into .common and .z1 to share it with Z1 Starter Platform
Conflicts:
.gitignore
platform/z1/Makefile.z1
2011-03-25 17:46:38 +01:00
1601b25d53
Updated to use new Rime sniffer API
2011-05-10 15:48:34 +02:00
ade10623de
Bugfix: print out the correct total idle transmit and listen time
2011-05-08 22:25:20 +02:00
46cffcf114
Made it possible to access the results externally.
2011-03-21 09:17:54 +01:00
bb86392ea0
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-03-03 06:22:41 +01:00
f5a6b6f20a
Fixed bugs in the types to the printf arguments
2011-03-02 15:49:04 +01:00
840c1331d1
examples/sky-shell now runs out-of-the-box on Z1
...
For best results, use a Z1 Starter Platform with an sht11 sensor plugged
in the ziglet port.
Keep in mind that the light-sensor is mapped to the potentiometer in this platform.
XXX Tracing why powertrace does not show anything different from 0.
2011-03-01 19:42:23 +01:00
499c13a357
removed execute flag of source files (avoids diff problems with egit)
2011-03-01 18:16:42 +01:00
263f7e6ebd
Insidious minimal-net segmentation fault if initialized ptr not declared static.
2011-02-19 15:43:43 -05:00
847c99d804
Explicitly turn LEDs off if the command is interrupted
2011-02-10 22:43:18 +01:00
9c62a8c1a6
Set default number of retries to 8 to make the netperf command more robust
2011-02-07 17:34:39 +01:00
b15deeff07
Fixed bug introduced with the 8.3 filesystem support.
...
If we use .htm instead of .html then we should also check for .htm instead of .html when it comes to MIME type setting.
Interestingly this didn't show up when testing with Internet Explorer as that one just ignores the wrong MIME type and displays the HTML page as expected.
Thanks to Shane Wood for pointing out the issue!
2011-01-25 20:13:41 +00:00
50aee97fc2
More comments + minor adjustments to the header file
2011-01-19 05:09:57 +00:00
d34de25f29
A facility for testing units of Contiki software.
2011-01-18 19:10:06 +00:00
569895af1c
Removed void * operations
2011-01-12 22:58:33 +00:00
ce46b7c6cb
patched rest-code for econotag
2011-01-12 18:32:36 +00:00
026076e1f4
Moved packet structure into its own header file
2011-01-09 21:08:30 +00:00
f3d22e6287
dos2unix conversion
2011-01-07 11:55:36 +00:00
b0236dd204
Added support for Uri_Query option
2011-01-03 23:49:16 +00:00
a026c94467
Fix compiler warnings
2010-12-14 22:45:22 +00:00
8c9f78374a
Subscription Lifetime update
2010-11-30 13:24:05 +00:00
135d5f0ace
Subscription lifetime update
2010-11-30 13:23:30 +00:00
726f927c40
Bug fix and updates
2010-11-24 10:16:45 +00:00
e4fdaa3ccc
Bug fix and updates in http implementation.
2010-11-24 10:15:10 +00:00
ed6012b4ab
Bug fix and added new features in coap.
2010-11-24 10:14:09 +00:00
f9d5815e19
Changed HTONS to uip_htons
2010-10-28 14:59:17 +00:00
1db955f913
Changed HTONS to uip_htons and removed some commented code
2010-10-28 13:18:49 +00:00
e441bd4321
Initial commit of an experimental COAP/HTTP/REST implementation for Contiki
2010-10-28 12:37:42 +00:00
7f95059703
The collect view functions now take the node's routing metric, not the parent's routing metric.
2010-10-24 21:04:39 +00:00
959af3b803
Avoid including the powertrace tools makefile more than once.
2010-10-24 21:04:17 +00:00
d0852a5bcc
The collect view functions now take the node's routing metric, not the parent's routing metric. The node ID is now given as the last two bytes of the Rime address, to make it play nice with 8-byte Rime addresses.
2010-10-24 21:03:52 +00:00
d6cb77a1d0
Broke out shell code from the collect-view app to make it useful for non-shell apps too. Added a shell app for interacting with collect-view. Broke out handling of parent, rtmetric, etx, and num_neighbors to make collect-view independent of rime collect.
2010-10-20 15:21:43 +00:00
ce53d7b748
Rewrote part of the repeat command to make the repeat cycle deterministic
2010-10-20 15:18:49 +00:00
fd18646d12
Added PETSCII support to the FTP client. It seems reasonable to do this in ftpc.c (instead of ftp.c) as all command connection strings are given in PETSCII in the C source.
2010-10-19 22:30:13 +00:00
5585d72c86
A simple but substantial change: uIP used the htons()/HTONS() macro
...
functions for converting between host and network byte order. These
names are the de facto standard names for this functionality because
of the original BSD TCP/IP implementation. But they cause problems for
uIP/Contiki: some platforms define these names themselves (Mac OS,
most notably), causing compilation problems for Contiki on those
platforms.
This commit changes all htons to uip_htons instead. Same goes for
htonl, ntohs, and ntohl. All-caps versions as well.
2010-10-19 18:29:03 +00:00
665eaba2df
Added function for creating a message in a separate buffer
2010-10-19 07:33:47 +00:00
d55079e7ba
Arch-specific code template that works on all platforms
2010-10-19 07:33:09 +00:00
b91bc69653
- Allow to configure window dimensions.
...
- Added usage text in fullscreen windowless scenario.
2010-10-16 09:55:06 +00:00
3eadd924ea
- Activated toggle between download/upload and upload dialog. However removed actual upload button. This seems reasonable as otherwiese the whole UI concept with remote and local directory listing doesn't make sense to the user.
...
- Made sure that the "low level" keystroke events are only handled if no dialog is displayed.
- Changed anonymous to 'anonymous'.
- Added option to run in fullscreen windowless mode by replacing in that scenario the dialogs with windows.
2010-10-16 08:15:40 +00:00
f82279c299
Made the collect-view application that was preivously hidden inside examples/sky-shell into its own application. This makes it possible for other platforms to use the same nica Java gui from the sky-shell application.
2010-10-12 11:37:41 +00:00
0c5f9992c1
Increased the default number of retransmissions for the send command
2010-10-12 11:36:42 +00:00
3f6dc30373
Added a powertrace command as an interface to the powertrace app
2010-10-12 11:34:49 +00:00
04ede258d0
Bugfix: rfchannel did not print out over the correct command structure
2010-10-12 11:34:08 +00:00
14940b65b8
Added the total power consumption to each powertrace printout; updated powertrace scripts to reflect this change
2010-10-06 18:40:21 +00:00
32701dacb5
Fixed recent build error in example-shell.
...
Both apps/webbrowser and apps/webserver contain a http-strings.c. It seems unclear to me if the original intention was to have them identical (but then they should have been factored out in the first place) or if they were only very similiar by chance.
Anyway, currently webserver/http-strings.c is a clean superset of webbrowser/http-strings.c so if a project has both HTTP server and client parts it is desirable to use the webserver variant. In the case of apps/shell this can be archived by adding webserver *before* webbrowser to the APPS variable.
This seems like a hack to me - but the whole shell build qualifies as hack, doesn't it ;-)
2010-09-29 11:53:39 +00:00
a6a2d5de9f
Fixed recently introduced minor inconsistency.
2010-09-29 09:35:56 +00:00
cd24e920b6
Made cfs-based webserver example compatible with 8.3 file systems.
2010-09-28 20:40:52 +00:00
0261af4af2
Made use of the new collect keepalive timer
2010-09-22 22:11:20 +00:00
b72e90597e
Rewrote the default powertrace_sniff() behaviour. Instead of printing
...
out power data for all incoming and outgoing packets (which causes
problems when there is much traffic), the power data for the packets
is instead logged and periodically printed out in aggregated form.
2010-09-22 22:09:52 +00:00
2be8454a15
Const and typecast bugfix
2010-09-14 07:18:14 +00:00
f11b0d56ee
Fixed compilation error
2010-09-14 06:40:17 +00:00
6794154aa5
Set a default value for 'send' commands without arguments
2010-09-13 19:15:21 +00:00
3be23eb3fc
Fixed alignment issue
2010-09-13 13:29:47 +00:00
f1769a3622
Added the number of hop-by-hop retransmissions to the 'send' command
2010-09-13 13:29:29 +00:00
a5dff5e08a
Up to now the root of the webserver filesystem was always the current directory. Now an optional file 'wwwroot.cfg' is read. If present its content is used as prefix in the conversion of http paths to local paths. This prefix may be a relative path as well as an absolute path.
...
This is especially useful for the cc65-based targets as it ain't possible there to "just change into the wwwroot directory and start the webserver using its pathname".
2010-08-30 19:44:38 +00:00
05f938e7c1
Converting the last screen line from ASCII to PETSCII as it was done up to now almost never makes sense. Either the conent to be converted is not the last screen line or the last screen line was already converted (and is incorrectly converted back). Therefore now only a partial line not already converted before gets converted.
2010-07-21 21:03:06 +00:00
11e25499a5
Servreg-hack makefile
2010-06-15 20:01:10 +00:00
f8437ad545
Periodically increase sequence number to avoid active registrations being garbage collected in neighbors
2010-06-15 19:32:29 +00:00
5dc55f0a1b
A quick and dirty service registry daemon hack. The servreg-hack
...
allows a program to register an 8-bit service ID that gets
disseminated to the entire network, as long as a servreg-hack daemon
is running on all neighbors. Other nodes can look up the service ID to
figure out what nodes in the network offer this service.
This is officially labeled as a "hack" so that we don't get too comfy
with it; this hack is not the future of service discovery and
advertisement in Contiki.
2010-06-15 19:00:28 +00:00
951fd78f6c
ctimer moved from net/rime to sys/
2010-06-14 18:58:45 +00:00
f537fac5f0
Made arguments const to allow constant strings as arguments
2010-06-14 14:08:17 +00:00
a453acd325
Added support for IPv6 URLs
2010-06-09 08:36:43 +00:00
b54c6e673b
Updated API for uiplib and resolv to use uip_ipaddr_t instead of uint16_t for compability with IPv6
2010-05-31 15:22:08 +00:00
e53b93384a
Print out rdc instead of mac
2010-04-30 07:17:50 +00:00
bac84c314c
Don't include sniffer code when using IPv6 - this saves significant code space because Rime won't be pulled in
2010-04-30 07:17:21 +00:00
Matthias Kovatsch
Niclas Finne
Joakim Eriksson
David Kopf
Nicholas J Humfrey
Maxim Osipov
Nicolas Tsiftes
Fredrik Osterlind
Adam Dunkels
Oliver Schmidt
dogan yazar
Enric M. Calvo
oliverschmidt
nvt-se
nifi
joxe
adamdunkels
doganyazar
dak664