Commit Graph

10607 Commits

Author SHA1 Message Date
Laurent Deru
60784b40bd Check pointer in uip_debug_lladdr_print 2015-06-18 10:56:45 +02:00
Laurent Deru
68c284b955 Do not add a CRC to packet incoming from RfListener 2015-06-16 10:36:33 +02:00
Laurent Deru
6891ca12b0 Add crc to packets send by coojamote 2015-06-16 10:35:34 +02:00
Laurent Deru
7a56d91c50 Clone packet data before modifying it 2015-06-16 10:34:19 +02:00
Laurent Deru
49700c6a79 Merge pull request #1118 from phoenix-frozen/aes128-const-key
made AES-128.set_key's argument const
2015-06-16 10:30:35 +02:00
Justin King-Lacroix
db15647c2b made AES-128.set_key's argument const 2015-06-15 20:20:07 +01:00
Laurent Deru
1f0fd3f38b Add uip_ext_len definition in fakeuip.c for ravenusbstick 2015-06-15 15:15:59 +02:00
Sumankumar Panchal
db4df30366 Added MSP430X ELFLOADER support to load image with large memory model. 2015-06-15 17:53:18 +05:30
Oliver Schmidt
e762d7eb50 Merge pull request #1115 from oliverschmidt/master
Removed obsolete apps from retro distribution.
2015-06-15 13:35:39 +02:00
Laurent Deru
1784338b2e Add uip_clear_buf() macro and replace all instances of uip_len = 0; with it 2015-06-15 11:10:51 +02:00
Oliver Schmidt
1493648fab Removed obsolete apps from retro distribution.
- By end of Jan 2014 SuperTweet.net was shut down (http://supertweetnews.140plus.com/). So Breadbox64 has come to an end for sure :-(

- The email app - or rather email sending app as it is SMTP only - can't be used anymore since nowadays everybody uses some "strong" authentication for SMTP session logon (thanks NSA).

- The ftp client app isn't very useful as it supports only download - for which the WGET app is almost always more useful for. But more important it doesn't support PASV which is more or less the only supported mode nowadays (especially over NAT).
2015-06-14 21:19:37 +02:00
Oliver Schmidt
cb09689846 Merge pull request #1114 from oliverschmidt/master
Set Win32 file i/o to binary mode.
2015-06-14 21:03:46 +02:00
Oliver Schmidt
74db518846 Set Win32 file i/o to binary mode.
This is i.e. necessary to have the file based webserver-example successfully read 'contiki.gif'.
2015-06-14 17:48:36 +02:00
Oliver Schmidt
1d0a171e45 Merge pull request #1113 from oliverschmidt/master
Made first uip_nameserver_update() parameter const.
2015-06-14 17:44:20 +02:00
Oliver Schmidt
35becbbcb5 Merge remote-tracking branch 'upstream/master'
Conflicts:
	core/net/ip/uip-nameserver.c
2015-06-14 16:33:23 +02:00
Oliver Schmidt
a0d9f028d6 Made first uip_nameserver_update() parameter const.
Both apps/dhcp/dhcp.c:dhcpc_configured() and cpu/6502/ipconfig/ipconfig.c:dhcpc_configured() presume the first parameter of uip_nameserver_update() to be const. As there's no reason for it to be not const just make it const.
2015-06-14 16:27:39 +02:00
Oliver Schmidt
c9edb9006b Merge pull request #1112 from oliverschmidt/master
Various improvements of the HTTP client and web browser.
2015-06-14 16:12:24 +02:00
Oliver Schmidt
adc744ef30 Avoid compiler warning because of unused variable. (reverted from commit a9c6d59da3) 2015-06-14 15:24:38 +02:00
Justin King-Lacroix
f968e53250 fixed minor warning in cc2530-rf driver 2015-06-10 18:20:04 +01:00
Justin King-Lacroix
3ce8f26eea generalised CCM module into lib
introduced convenience functions for LLSEC modules
2015-06-10 18:07:41 +01:00
Oliver Schmidt
3e33a4d355 Made server variant of HTTP strings a superset of the client variant again. 2015-06-08 14:29:34 +02:00
Oliver Schmidt
47bf797864 Added support for form with multiple submit buttons.
Forms with multiple submit buttons are rather rare but nevertheless the most popular web page (www.google.com) contains one with the two submit buttons "Google Search" and "I'm Feeling Lucky". So we want to support that - incl. the usual feature to the interpret first button as default button used when the user presses the ENTER key.
2015-06-07 00:29:29 +02:00
Oliver Schmidt
e8b4befd1e Further improved parsing of <SCRIPT> tag.
Script code may contain a '<' as part of a equation. We erroneously interpreted that as start of a tag. Now we check for the very next char to be a '/' as the only tag allowed is the </SCRIPT> tag.
2015-06-07 00:23:44 +02:00
George Oikonomou
06f7acfd5b Merge pull request #1101 from bthebaudeau/cc2538-make-uart_isr-static
cc2538: uart: Make uart_isr() static
2015-06-05 23:48:14 +01:00
Benoît Thébaudeau
0f137e4bdd cc2538: uart: Make uart_isr() static
This function is only supposed to be used by uart.c, so it should be
static.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-05 21:50:49 +02:00
Oliver Schmidt
1d934db654 Reduce overlap on "scroll".
When using the 'down' button on a certain number of lines curently displayed at the bottom of the screen is redisplayed at the top of the screen. Given our usually small screen size and often large pages requiring many 'down' operations the number 'four' seems too generous so lets reduce it to 'two'.
2015-06-05 17:27:08 +02:00
Oliver Schmidt
c5103bf997 Removed some redundant redrawing. 2015-06-05 16:59:16 +02:00
Oliver Schmidt
f6b315a17f Fixed history handling.
- The wraparound handling when using the history with the 'back' button is actually depending on history_last being unsigned (which is the default for cc65) so define it explicitly as unsigned to make it work on other targets too.
- As there's no 'forward' button it doesn't make sense to keep history entries after using them with the 'back' button. Clearing them on use on the other hand avoids an "infinite history".
2015-06-05 16:34:57 +02:00
Oliver Schmidt
e6903e4e7e Recognize HTTPS.
Although we for sure don't support HTTPS we need to recognize it. Nowadays it has become pretty usual to redirect HTTP URLs to HTTPS URLs in order to force privacy (thanks, NSA !). So far our redirection handler didn't recognize an HTTPS URL as abslute URLs and therefore appended it to the curent URL. This led to an endless redirection loop. Now we recognize the HTTPS redirection and generate a minimal document on the fly to inform the user of (for us unrachable) the redirection target.

HTML links with HTTPS URLs are treated just like fragment-only links meaning that they get simply completely ignored.
2015-06-05 16:26:20 +02:00
Oliver Schmidt
2f2295c182 Correctly initialize 'wordlen'. 2015-06-05 16:26:17 +02:00
Timofei Istomin
eb4bdde9ca Finish the transmission at the end of a correct packet
This patch restores the original behaviour of Cooja when
the transmitted packet is correct (which is true in a vast majority
of cases).

In case of a wrong outgoing packet (wrong length, wrong preamble)
the transmission will end when the radio changes its state (which
should always happen after transmitting a packet).

Benchmarks with RPL (33 runs, 50 nodes, 3 hours of simulated time each)
yield the same results (PDR, delay, number of transmitted packets)
as with the unmodified Cooja.
2015-06-05 15:13:45 +02:00
Oliver Schmidt
e93f9da7af Adjusted coding style. 2015-06-04 22:39:16 +02:00
Oliver Schmidt
448fa88ad8 Fixed handling of empty URLs.
The code to trim spaces from the end of the URL behaved undefined if the URL was empty. That scenario is far from hypothetic as i.e. pressing the 'back' button with no (more) entry in the history yields an empty URL.
2015-06-04 22:00:52 +02:00
Oliver Schmidt
8b0a7a697f Filter excessive newlines.
The way our HTML parser triggers newlines is a guess at best. On the other hand our screen estate is severely limited. Instead of trying to (further) improve the way we translate tags to newlines it seems more reasonable to simply never render more than two successive empty lines.
2015-06-04 21:14:37 +02:00
Adam Dunkels
7caf588457 Merge pull request #1096 from bthebaudeau/remove-MODULESSUBST
Makefile.include: Remove unused MODULESSUBST
2015-06-03 10:39:56 +02:00
Antonio Lignan
5bede26b3a Merge pull request #1071 from bthebaudeau/cc2538-crypto
cc2538: Add crypto drivers and examples for AES-CCM and SHA-256
2015-06-02 23:54:33 +02:00
Benoît Thébaudeau
e8a268cd15 cc2538: aes: Add support for 192- and 256-bit keys
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:56 +02:00
Benoît Thébaudeau
801315e819 cc2538: aes: Make it possible to have several keys stored at once
Several keys can be kept at the same time in the key store, and several
keys can be loaded at once. Give access to these features.

The ccm-test example is also improved to better demonstrate the use of
the key store.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:07 +02:00
Benoît Thébaudeau
b92a5afcc4 cc2538: ccm: Make it possible to use the interrupt
Using the AES interrupt allows the user process not to waste time
polling for the completion of the operation. This time can be used by
the user process to do something else, or to let the system enter PM0.

Since the system is now free to perform various operations during a
crypto operation, a protection of the crypto resource is added, and PM1+
is prohibited in order not to stall crypto operations.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:07 +02:00
Benoît Thébaudeau
117dc4e5e3 cc2538: Add crypto drivers and examples for AES-CCM and SHA-256
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 21:41:06 +02:00
Benoît Thébaudeau
66acf74612 cc2538: examples: Fix build warnings
Toolchain used:
arm-none-eabi-gcc (GNU Tools for ARM Embedded Processors) 4.9.3 20150303
(release) [ARM/embedded-4_9-branch revision 221220]

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-02 01:38:11 +02:00
Antonio Lignan
c03536f04e Merge pull request #1094 from OlegHahm/fix_z1-bsl-nopic
Fix z1-bsl-nopic
2015-06-02 00:41:52 +02:00
Benoît Thébaudeau
ecf6765bfd Makefile.include: Remove unused MODULESSUBST
The commit bddd96d5c8 "Removed all module
makefiles. Instead, all .c files in a module directory are compiled."
made the MODULESSUBST variable useless, but it did not remove it, so do
it now.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
2015-06-01 22:09:58 +02:00
Oleg Hahm
fbeea78749 fix mixture of spaces and tabs for z1-bsl-nopic 2015-06-01 17:34:18 +02:00
Oleg Hahm
116ade0e63 z1-bsl-nopic requires Python 2 2015-06-01 17:34:00 +02:00
George Oikonomou
d28eb023ef Remove CC2530 and CC2538 dummy watchdog_stop()
The CC2538 the WDT cannot be stopped once it has been started.
The CC2530/1 WDT can be stopped if it is running in timer mode,
but it cannot be stopped once it has been started in watchdog mode.

Both platforms currently provide "dummy" implementations of `watchdog_stop()`,
one does nothing and the other one basically re-maps `_stop()` to
`_periodic()`.

This was originally done in order to provide implementations for all prototypes
declared in `core/dev/watchdog.h`. In hindsight and as per the discussion
in #1088, this is bad practice since, if the build succeeds, the caller will
expect that the WDT has in fact been stopped, when in reality it has not.

Since the feature (stopping the WDT) is unsupported by the hardware, this pull
removes those dummy implementations. Thus, we will now be able to reliably
detect - at build time - attempts at using this unsupported feature.
2015-06-01 15:24:14 +01:00
Benoît Thébaudeau
aba0b8ab40 Merge pull request #1085 from alignan/pull/remote
New Zolertia Re-Mote platform (CC2538 + CC1120)
2015-05-30 00:11:57 +02:00
Antonio Lignan
330e450ba4 Zolertia Re-Mote platform ported to Contiki, developed whitin RERUM FP7 European project (grant #609094).
The port was done jointly by Zolertia and George Oikonomou (University of Bristol).
2015-05-29 22:04:43 +02:00
Ulf Knoblich
584b6ae4ca cc1200: removed the hardware dependent sniffer stuff from cc1200 2015-05-29 15:19:16 +02:00
Timofei Istomin
034a97eed2 Don't generate a zero-length packet in case of errors.
The packet converter used to generate packets of length zero
when it encountered errors during conversion. This caused
exceptions in packet analyzers.

Now the converter returns null in case of error. Appropriate
checks have been added to the code that uses the return value.
2015-05-28 22:11:50 +02:00