Commit graph

520 commits

Author SHA1 Message Date
Oliver Schmidt 78f7a74689 Merge remote-tracking branch 'origin/master' 2011-04-12 14:14:45 +02:00
Oliver Schmidt 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
dogan yazar 4432a2e551 Bugfix for Post method not allowed. 2011-04-12 00:54:19 +02:00
dogan yazar 91dd236c55 Changes for minimal-net and bug fix for buffer handling. 2011-04-12 00:09:15 +02:00
Enric M. Calvo 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
Niclas Finne 1601b25d53 Updated to use new Rime sniffer API 2011-05-10 15:48:34 +02:00
Adam Dunkels ade10623de Bugfix: print out the correct total idle transmit and listen time 2011-05-08 22:25:20 +02:00
Nicolas Tsiftes 46cffcf114 Made it possible to access the results externally. 2011-03-21 09:17:54 +01:00
Adam Dunkels bb86392ea0 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-03-03 06:22:41 +01:00
Adam Dunkels f5a6b6f20a Fixed bugs in the types to the printf arguments 2011-03-02 15:49:04 +01:00
Enric M. Calvo 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
Fredrik Osterlind 499c13a357 removed execute flag of source files (avoids diff problems with egit) 2011-03-01 18:16:42 +01:00
dak664 263f7e6ebd Insidious minimal-net segmentation fault if initialized ptr not declared static. 2011-02-19 15:43:43 -05:00
Adam Dunkels 847c99d804 Explicitly turn LEDs off if the command is interrupted 2011-02-10 22:43:18 +01:00
Adam Dunkels 9c62a8c1a6 Set default number of retries to 8 to make the netperf command more robust 2011-02-07 17:34:39 +01:00
oliverschmidt 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
nvt-se 50aee97fc2 More comments + minor adjustments to the header file 2011-01-19 05:09:57 +00:00
nvt-se d34de25f29 A facility for testing units of Contiki software. 2011-01-18 19:10:06 +00:00
nifi 569895af1c Removed void * operations 2011-01-12 22:58:33 +00:00
joxe ce46b7c6cb patched rest-code for econotag 2011-01-12 18:32:36 +00:00
adamdunkels 026076e1f4 Moved packet structure into its own header file 2011-01-09 21:08:30 +00:00
nifi f3d22e6287 dos2unix conversion 2011-01-07 11:55:36 +00:00
doganyazar b0236dd204 Added support for Uri_Query option 2011-01-03 23:49:16 +00:00
dak664 a026c94467 Fix compiler warnings 2010-12-14 22:45:22 +00:00
doganyazar 8c9f78374a Subscription Lifetime update 2010-11-30 13:24:05 +00:00
doganyazar 135d5f0ace Subscription lifetime update 2010-11-30 13:23:30 +00:00
doganyazar 726f927c40 Bug fix and updates 2010-11-24 10:16:45 +00:00
doganyazar e4fdaa3ccc Bug fix and updates in http implementation. 2010-11-24 10:15:10 +00:00
doganyazar ed6012b4ab Bug fix and added new features in coap. 2010-11-24 10:14:09 +00:00
doganyazar f9d5815e19 Changed HTONS to uip_htons 2010-10-28 14:59:17 +00:00
doganyazar 1db955f913 Changed HTONS to uip_htons and removed some commented code 2010-10-28 13:18:49 +00:00
doganyazar e441bd4321 Initial commit of an experimental COAP/HTTP/REST implementation for Contiki 2010-10-28 12:37:42 +00:00
adamdunkels 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
adamdunkels 959af3b803 Avoid including the powertrace tools makefile more than once. 2010-10-24 21:04:17 +00:00
adamdunkels 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
adamdunkels 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
adamdunkels ce53d7b748 Rewrote part of the repeat command to make the repeat cycle deterministic 2010-10-20 15:18:49 +00:00
oliverschmidt 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
adamdunkels 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
adamdunkels 665eaba2df Added function for creating a message in a separate buffer 2010-10-19 07:33:47 +00:00
adamdunkels d55079e7ba Arch-specific code template that works on all platforms 2010-10-19 07:33:09 +00:00
oliverschmidt b91bc69653 - Allow to configure window dimensions.
- Added usage text in fullscreen windowless scenario.
2010-10-16 09:55:06 +00:00
oliverschmidt 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
adamdunkels 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
adamdunkels 0c5f9992c1 Increased the default number of retransmissions for the send command 2010-10-12 11:36:42 +00:00
adamdunkels 3f6dc30373 Added a powertrace command as an interface to the powertrace app 2010-10-12 11:34:49 +00:00
adamdunkels 04ede258d0 Bugfix: rfchannel did not print out over the correct command structure 2010-10-12 11:34:08 +00:00
adamdunkels 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
oliverschmidt 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
oliverschmidt a6a2d5de9f Fixed recently introduced minor inconsistency. 2010-09-29 09:35:56 +00:00
oliverschmidt cd24e920b6 Made cfs-based webserver example compatible with 8.3 file systems. 2010-09-28 20:40:52 +00:00
adamdunkels 0261af4af2 Made use of the new collect keepalive timer 2010-09-22 22:11:20 +00:00
adamdunkels 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
adamdunkels 2be8454a15 Const and typecast bugfix 2010-09-14 07:18:14 +00:00
adamdunkels f11b0d56ee Fixed compilation error 2010-09-14 06:40:17 +00:00
adamdunkels 6794154aa5 Set a default value for 'send' commands without arguments 2010-09-13 19:15:21 +00:00
adamdunkels 3be23eb3fc Fixed alignment issue 2010-09-13 13:29:47 +00:00
adamdunkels f1769a3622 Added the number of hop-by-hop retransmissions to the 'send' command 2010-09-13 13:29:29 +00:00
oliverschmidt 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
oliverschmidt 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
adamdunkels 11e25499a5 Servreg-hack makefile 2010-06-15 20:01:10 +00:00
adamdunkels f8437ad545 Periodically increase sequence number to avoid active registrations being garbage collected in neighbors 2010-06-15 19:32:29 +00:00
adamdunkels 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
adamdunkels 951fd78f6c ctimer moved from net/rime to sys/ 2010-06-14 18:58:45 +00:00
nifi f537fac5f0 Made arguments const to allow constant strings as arguments 2010-06-14 14:08:17 +00:00
nifi a453acd325 Added support for IPv6 URLs 2010-06-09 08:36:43 +00:00
nifi 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
adamdunkels e53b93384a Print out rdc instead of mac 2010-04-30 07:17:50 +00:00
adamdunkels 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
nifi a5264324b5 Added missing urlconv.c for optional URL filtering. 2010-04-19 21:25:49 +00:00
nvt-se 75690c3399 Improved configuration for low-power wireless networks. Removed legacy code regarding netsim and energest. Fixed bug with state transitions, in which timers were stopped incorrectly. 2010-04-12 14:39:52 +00:00
nvt-se 40f7541f88 Report an error if cfs_write failed. 2010-04-12 13:21:58 +00:00
oliverschmidt eebbd2694c Set the maximum number of concurrent web server connections by default to the maximum number of concurrent TCP connections. 2010-04-11 20:54:39 +00:00
oliverschmidt 85082693c5 Added final newline to make GCC happy. 2010-04-11 20:16:56 +00:00
oliverschmidt f22b0dffb3 Made CFS web server pathname length configurable via WEBSERVER_CONF_CFS_PATHLEN and increased default pathname length from 20 to 80 chars in order to allow to actually make use of subdirs. 2010-04-11 20:10:12 +00:00
oliverschmidt eae42d02d5 Added optional URL filtering code to the CFS web server contributed by Kajtar Zsolt (and activated it by default). 2010-04-11 19:18:47 +00:00
oliverschmidt 62e6882946 Include slash in CFS web server state field 'filename' (like in the non-CFS web server). 2010-04-11 15:19:34 +00:00
oliverschmidt 157a95ef19 Reduced code size by removing one PT_WAIT_THREAD call site. 2010-04-11 12:29:07 +00:00
nvt-se fec9171d5d Print the node ID instead of the first byte in the Rime address. That byte often has the value 0 when using powertrace with IPv6. 2010-04-09 15:47:45 +00:00
oliverschmidt 48f7992a48 Minor syntax simplification. 2010-04-06 20:41:42 +00:00
oliverschmidt 5a3eb98937 Log requests in PETSCII on CBMs in the non-CFS web server (as was already done in the CFS web server). 2010-04-06 20:35:40 +00:00
oliverschmidt 186ab03dd2 Search for last '.' just like in send_headers(). 2010-04-06 20:16:25 +00:00
oliverschmidt 37d5c753c0 Copy '/404.html' to filename in order to allow send_headers() to send the proper content type. 2010-04-06 20:10:45 +00:00
oliverschmidt d1c4b4968c Added GIF support to the CFS web server (which was already present in the non-CFS web server). 2010-04-06 12:11:41 +00:00
oliverschmidt 69b0727a6d There are no query strings or alike in the CFS web server so the file extensions have to be the actual end of the requested filename. 2010-04-06 12:03:18 +00:00
oliverschmidt 5c75b89ef7 Reduced code size by reducing the SEND_STRING call sites. 2010-04-06 11:49:47 +00:00
adamdunkels 1fa81eac59 Print out the name of the radio duty cycling mechanism instead of the MAC 2010-04-04 12:27:31 +00:00
adamdunkels 1241aa34d0 Added a function powertrace_print() that prints out the current power trace 2010-03-29 21:49:07 +00:00
adamdunkels 2617274989 Updated to new announcement API 2010-03-25 08:55:20 +00:00
adamdunkels 79ba20ddcc Updated to new collect router API 2010-03-25 08:52:23 +00:00
adamdunkels aeec1769dc Added functions for turning powertracing off 2010-03-19 13:23:31 +00:00
adamdunkels f2c9b3e813 Remove old neighbor.h inclusion 2010-03-19 13:20:40 +00:00
nvt-se cfcb6c6b71 Updated for the changed Rime API 2010-03-18 14:25:54 +00:00
joxe fc738a5809 fixed for new uip6 APIs 2010-03-17 13:19:34 +00:00
joxe da36724ac8 updated for new uip APIs 2010-03-17 12:27:52 +00:00
fros4943 3769a28516 updated to new sensors API 2010-03-14 19:54:00 +00:00
adamdunkels 331f93b439 Removed the 'nodes' command from the shell: it never really worked 2010-02-28 14:16:19 +00:00
adamdunkels c4c4e8164d Enabled compilation without timesynch enabled 2010-02-23 18:22:44 +00:00
adamdunkels 2186d70c59 Added per-packet power profile tracing 2010-02-23 18:22:16 +00:00
adamdunkels 5e6fd67213 Powertrace: a program that periodically prints out the power consumption; suitable for experiments or simulations that want to measure power consumption 2010-02-20 14:15:45 +00:00
adamdunkels 6b523f2446 Fixed compilation without timesynch compiled in 2010-02-18 20:56:12 +00:00
oliverschmidt 340de209c7 Allow to build the webbrowser without history support - by setting WWW_CONF_HISTORY_SIZE to 0. 2010-02-13 10:39:57 +00:00
adamdunkels ba56b22c03 Potential alignment problem fix 2010-02-04 16:21:15 +00:00
nifi 8cf4821a73 added check for too long server name 2010-02-04 15:23:15 +00:00
adamdunkels 4ea2312f23 Rewrote NULL-termination code to avoid writing to a const array 2010-02-04 14:59:08 +00:00
adamdunkels 35f8d24c2e Bugfix: zero-terminate string before copying 2010-02-04 11:20:09 +00:00
oliverschmidt 2a6f169e46 - Added yet another PETSCII->ASCII conversion, this time for the file name in case of a 404.
- Use all lowercase for the 404 message to avoid another PETSCII->ASCII conversion.
- Write logfile entries for all 404s.
- Adjust memory buffers on the C128 to accomodate for the items above.
2010-02-03 23:19:39 +00:00
adamdunkels dda757aca7 I made a mess out of the dec64 command being moved to a new module; this commit should fix the previous issues though 2010-02-03 21:53:51 +00:00
adamdunkels 551f7fc7a7 Moved the dec64 command into the shell base64 module 2010-02-03 21:39:25 +00:00
adamdunkels 815468b442 Added missing argument to send_string() 2010-02-03 21:06:51 +00:00
adamdunkels 6fc0c73bac Reverted the recent addition of the directory listing: instead, a 404 is now sent to indicate that a notfound.html file is missing 2010-02-03 20:41:16 +00:00
adamdunkels 217fa504e7 Small documentation fix 2010-02-03 20:40:00 +00:00
adamdunkels 1a34dbe550 Broke out the base64 commands from the text module 2010-02-03 20:37:29 +00:00
adamdunkels e029cf489e When a file was not found, and no notfound.html was found, send directory contents instead 2010-02-02 18:17:55 +00:00
adamdunkels 1a42eac80b Print out the performance test number for automatic processing 2010-02-02 15:29:24 +00:00
adamdunkels 7ed2af70f9 Two 'peek' and 'poke' commands for reading and writing directly to memory 2010-02-02 15:28:52 +00:00
oliverschmidt dbfa1efdcf Allow to build the web browser without DNS support - like i.e. the email client and the IRC client. 2010-02-01 19:44:30 +00:00
adamdunkels 354243afcd Added missing Rime channel for the runicast debug command 2010-01-31 23:57:22 +00:00
oliverschmidt 76e21b5912 Added conversion of From field from PETSCII to ASCII (and adjusted setup window size to commented-out POP3 settings). 2010-01-31 21:44:49 +00:00
oliverschmidt de3142c0d4 Made 'Erase' button and dialog optional to make email client compatible with non-windows CTK. 2010-01-31 21:13:38 +00:00
adamdunkels 435add5e17 Added a debug command for testing reliable unicast (runicast) communication 2010-01-31 19:35:12 +00:00
adamdunkels 4938df5c05 Update to Contiki version number 2.4 2010-01-29 18:03:55 +00:00
joxe 318cf56564 fixed for new sensor api 2010-01-14 15:05:40 +00:00
adamdunkels f50b8db53b Implement repeats with a periodic second timer to allow for greater range than what is possible with Contiki ctimers. Use RTIMER_NOW() instead of rtimer_arch_now(). 2009-12-09 18:12:23 +00:00
adamdunkels 01153b468e Fixed compliation problem 2009-11-09 08:22:17 +00:00
adamdunkels 01442326b2 Made rimeaddr_t pointers const when they should be 2009-11-08 19:42:59 +00:00
adamdunkels 3c8d51e05f Added command line options for enabling the four different performance tests 2009-11-04 07:48:18 +00:00
adamdunkels 4928e43880 netperf: a new small shell command that measures the communication
performance between two local (single-hop) nodes. It sends packets
over both broadcast and unicast, both in one direction and in both, as
well as tested the stream mode of the underlying MAC protocol.
2009-11-03 22:52:39 +00:00
adamdunkels 2662c87d60 Printout power data as well 2009-11-03 10:04:23 +00:00
fros4943 b0a92c5f4e added log output + minor fix 2009-10-27 10:46:24 +00:00
adamdunkels 63f927fc8d Added missing string.h include, for memset() 2009-10-18 11:42:06 +00:00
adamdunkels bddd31abf2 Fixed compiler warnings 2009-09-09 21:06:51 +00:00
dak664 0798c56899 Print ipv6 address in weblog and tcp_stats cgi 2009-08-12 18:23:37 +00:00
dak664 8d9f8e3a17 ipv6 address logging 2009-08-11 16:07:54 +00:00
joxe 92f8ac6a2b added webserver-nogui.c to webserver sources 2009-06-23 21:06:34 +00:00
nvt-se 2b1053f0e3 shorten file size function by using the new CFS_SEEK_END. 2009-05-15 23:04:15 +00:00
nvt-se 79b7cab36e the third read parameter must be checked for existence.
updated the documentation to cover the third parameter.
2009-05-12 14:22:58 +00:00
adamdunkels fd6dd95b9b Removed unused include serial-shell.h 2009-05-11 17:31:13 +00:00
adamdunkels 2c6c665309 New Twitter tweet commands added 2009-05-11 17:11:56 +00:00
adamdunkels 6808bb387b A shell command for posting a #sensortweet message to Twitter 2009-05-11 17:11:37 +00:00
adamdunkels 3bb946fa51 A shell command for posting arbitrary messages to Twitter 2009-05-11 17:10:55 +00:00
adamdunkels a3101e14de Contiki program that posts messages to the Twitter microblogging service 2009-05-11 16:57:49 +00:00
adamdunkels a220da3e88 Added new shell commands 2009-05-10 21:05:06 +00:00
adamdunkels f6dbf82e05 Added two commands: unicast-send and unicast-recv that can be used to send unicast data 2009-05-10 21:04:40 +00:00
adamdunkels 904bb1487c Broke out the 'neighbor' command functionality from the shell-rime.c file; reimplemented it to use the announcemnet primitive instead 2009-05-10 21:04:06 +00:00
adamdunkels 8458a4fe28 Added a 'netstat' command that (currently) shows active TCP connections 2009-05-10 21:02:24 +00:00
fros4943 8f66601a5a fixed compiler warnings (as suggested by Niclas Finne) 2009-04-20 13:18:07 +00:00
fros4943 a23b4fd40b two new shell commands: download and sendcmd 2009-04-16 14:33:47 +00:00
nvt-se ddbc5a9555 send only packets in the request set. reset the request set immediately
after sending the packets.
2009-04-07 14:07:39 +00:00
adamdunkels 5d8d7844bb Avoid alignment problems by copying the crc from the header field into a local variable 2009-04-06 23:29:31 +00:00