Commit graph

9768 commits

Author SHA1 Message Date
Joakim Gebart d4179a0a0c examples/rpl-border-router: Fix two minor warnings.
- Remove unused variable i in generate_routes.
 - Add cast to unsigned long for printf(..%lu..) in generate_routes.

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-10-04 18:05:38 +02:00
Adam Dunkels fd5e79d0db Merge pull request #796 from gebart/core-net-ip-buffer-overflow-fix
core/net/ip: Prevent (tiny) buffer overflow in resolv_found()
2014-10-02 13:52:05 +02:00
Joakim Gebart 24d15ad9a5 core/net/ip: Prevent (tiny) buffer overflow in resolv_found()
An off-by-one error in resolv_found() could make an strncat() call
overflow by the terminating null byte.

When building with Clang the following warning was shown:

../../../core/net/ip/resolv.c:1458:17: warning: the value of the
      size argument in 'strncat' is too large, might lead to a
      buffer overflow [-Wstrncat-size]
                sizeof(resolv_hostname) - strlen(resolv_hostname));
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../../core/net/ip/resolv.c:1458:17: note: change the argument to
      be the free space in the destination buffer minus the
      terminating null byte
                sizeof(resolv_hostname) - strlen(resolv_hostname));
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                sizeof(resolv_hostname) - strlen(resolv_hostname) - 1

Signed-off-by: Joakim Gebart <joakim.gebart@eistec.se>
2014-10-02 12:52:39 +02:00
Fredrik Österlind 718e488b78 Merge pull request #795 from ejoerns/pull-req/cooja-println-cleanup
[Cooja] Println cleanup
2014-10-02 09:25:36 +02:00
Enrico Joerns 903d0333d3 [cooja] Removed some further printlns 2014-10-02 02:11:41 +02:00
Enrico Joerns f02266d67c [cooja] dialogs/MessageListe: User Logger instead of println 2014-10-02 02:05:39 +02:00
Enrico Joerns 927d9a3153 [cooja] dialogs/MessageList: Added @Override annotations 2014-10-02 02:05:14 +02:00
Enrico Joerns 40f54a8e26 [cooja] Radio802154: Removed obsolete comments including println hints 2014-10-02 01:53:26 +02:00
Enrico Joerns c7abba860f [cooja] Radio802154: Added @Override annotations
Also removed some unused imports
2014-10-02 01:40:07 +02:00
Enrico Joerns c5e034fa1a [cooja] IEEE802154Analyzer: Use logger
Replaced println and printStackTrace by logger
2014-10-02 01:37:24 +02:00
Enrico Joerns 373b00fc47 [cooja] PcapExporter: Use logger
Removed unnused imports, replaced println and printStackTrace by logger
2014-10-02 01:25:49 +02:00
Enrico Joerns 95b54f415e [cooja] MemoryLayout: Remove annoying println 2014-10-02 01:14:07 +02:00
Nicolas Tsiftes 77a265cf0f Merge pull request #793 from alignan/add_radio_def
Added missing radio capability define to Z1 platform config
2014-09-24 13:59:30 +02:00
Fredrik Österlind 8df1c98a85 Merge pull request #781 from ejoerns/pull-req/cooja-serialsocket
[Cooja] Configurable serial socket plugin
2014-09-24 12:49:15 +02:00
Fredrik Österlind 91610b9e1f Merge pull request #780 from ejoerns/pull-req/cooja-varwatcher
[Cooja] VariableWatcher 2.0
2014-09-24 12:37:32 +02:00
Antonio Lignan 343a3d3f7b Added missing radio capability define to Z1 platform config 2014-09-24 11:42:55 +02:00
Adam Dunkels 49cb87025e README file for the IP64 module 2014-09-14 21:26:33 +02:00
Adam Dunkels c77bc6d3f1 NAT64 / DNS64 code for Contiki that makes connecting an IPv6 Contiki network to IPv4 networks really easy 2014-09-14 21:26:23 +02:00
Nicolas Tsiftes af5dcc628a Merge pull request #790 from nvt/fix-netdb-warnings
Avoid compilation warnings in Antelope.
2014-09-05 20:37:52 +02:00
Nicolas Tsiftes 7738cdd15e Avoid compilation warnings in Antelope. 2014-09-05 18:21:47 +02:00
Nicolas Tsiftes ad10f438c0 Merge pull request #789 from nvt/fix-psock-examples
Make the Protosockets examples possible to compile.
2014-09-05 17:16:10 +02:00
Nicolas Tsiftes 4c4c468907 Make the Protosockets examples possible to compile. 2014-09-05 16:25:25 +02:00
Enrico Joerns 55979636d7 [cooja] plugins/VariableWatcher: Added minimal quick help 2014-08-31 01:52:17 +02:00
Enrico Joerns 42ad188b69 [cooja] plugins/VariableWatcher: Also disble addr and size input fields when monitoring 2014-08-31 01:52:17 +02:00
Enrico Joerns 33b211c0b3 [cooja] plugins/VariableViewer: Fix decoding in stringToValue() 2014-08-31 01:52:17 +02:00
Enrico Joerns 171863a8c5 [cooja] plugins/VariableWatcher: Fixes for value layout
- Fixed layout axis form x to page to show multi-line value fields.
- More flexible width calculation for value fields
2014-08-31 01:52:16 +02:00
Enrico Joerns 57719de18d [cooja] plugins/VariableWatcher: Catch exceptions, show error dialog for invalid addresses
And some gui option handling fixes
2014-08-31 01:52:16 +02:00
Enrico Joerns f70e1ef99f [cooja] plugins/VariableWatcher: Allow to access memory by address/size
By selecting the checbox next to the address field, VariableWatcher
switches from variable mode to address mode.
Now any address and size might be entered to show data from memory.

Additionally for variables where now size information is available the
interface allows the user to select one.
2014-08-31 01:52:16 +02:00
Enrico Joerns 9d8516e9ef [cooja] plugins/VariableWatcher: Replaced obsolete Vector by ArrayList 2014-08-31 01:52:16 +02:00
Enrico Joerns 490bc6c5cb [cooja] plugins/VariableWatcher: fixed handling of unknown variable sizes 2014-08-31 01:52:16 +02:00
Enrico Joerns 7ac14fae60 [cooja] plugins/VariableWatcher: Added Tooltip that shows address, added address variable type, fixed columns width layout 2014-08-31 01:52:16 +02:00
Enrico Joerns d1e0311184 [cooja] plugins/VariableWatcher: Added swingx library to provide autocomplete support for variable names combobox in plugins/VariableWatcher 2014-08-31 01:52:16 +02:00
Enrico Joerns 72dcd323a3 [cooja] plugins/VariableWatcher: Added 'line break' for byte text fields
Adds new line each 8 text fields
2014-08-31 01:52:16 +02:00
Enrico Joerns a638bd5b01 [cooja] plugins/VariableWatcher: Added address and and size labels
to display information about currently selected variable
2014-08-31 01:52:15 +02:00
Enrico Joerns c0f727e3c0 [cooja] plugins/VariableWatcher: implemented monitoring, writing; fixed various issues 2014-08-31 01:52:15 +02:00
Enrico Joerns e77c01d586 [cooja] plugins/VariableWatcher: Fixed xml config save/load 2014-08-31 01:52:15 +02:00
Enrico Joerns 16d94780e9 [cooja] plugins/VariableWatcher: Remove charValuePane and reimplement read functionality and more 2014-08-31 01:52:15 +02:00
Enrico Joerns cdc9b9a9d2 [cooja] plugins/VariableWatcher: Replace varName KeyListener by DocumentListener as only content changes change validation state of varName
Modify foreground color of varName instead of background color because some LookAndFeels do not support colored backgrounds.
2014-08-31 01:52:15 +02:00
Enrico Joerns a1671462c0 [cooja] plugins/VariableWatcher: Implemented formatted output for value fields 2014-08-31 01:52:15 +02:00
Enrico Joerns 053b1d55af [cooja] plugins/VariableWatcher: Enums for ComboBoxes and new one for display format
Allows to choose between var types (byte, short, int, long) and display
types (char, decimal, hex)
2014-08-31 01:52:15 +02:00
Enrico Joerns 6ae097cc09 [cooja] plugins/VariableWatcher: Added Combo as name suffix for JComboBoxes 2014-08-31 01:52:15 +02:00
Enrico Joerns a9f31ee662 [cooja] plugins/VariableWatcher: Added @Override annotations 2014-08-31 01:52:14 +02:00
Nicolas Tsiftes 97037763ad Merge pull request #777 from atiselsts/msp430f5xxx_timing_fixes
Fix time accounting on msp430 Series 5 MCU based platforms
2014-08-30 22:28:45 +02:00
Nicolas Tsiftes c13adb120f Merge pull request #778 from alessandrelli/fix_duplicate_observe_value
er-coap (observe): fix possible duplicate value for observe option
2014-08-30 22:25:32 +02:00
Nicolas Tsiftes c6d7775daa Merge pull request #779 from PaulCorbalan/master
Add SHT11 CoAP Resource and Activate Sensors for CoAP Resources like Light, Battery.
2014-08-30 22:23:59 +02:00
Enrico Joerns 8cc0bb8a1e [avr] Removed usage of deprecated MCUSR
Since avr-libc 1.8.0 MCUSR is marked as poison as it was replaced by the
correct name MCUCSR.
Thus code still using the old MCUSR name does not compile anymore.

This commit replaces usages of former MCUSR by its new name MCUCSR and
modifies the alias fallback accordingly.
2014-08-30 01:58:18 +02:00
Fredrik Österlind 2263f4b87b Merge pull request #569 from ejoerns/pull-req/cooja-newip
[Cooja] Reimplementation of the IPAddress interface
2014-08-29 14:51:02 +02:00
Enrico Joerns 01333c235c [cooja] interfaces/IPAddress: Reimplementation of the IPAddress interface
New features:
* extended interface
* Shows all IPv6 addresses of a mote
* Shows link local IP in visualizer
* Reads IPs correctly from different memory layouts
2014-08-29 13:08:56 +02:00
Enrico Joerns f93b58b9fb [cooja] Get rid of all those redundant IP address to String functions
Commonly use the String representation functions of IPUtils.
2014-08-29 12:58:57 +02:00
Enrico Joerns 1babb9475d [ccoja] Added new IPUtils class
Utility class to convert IPv4/IPv6 byte arrays to String representation.

* RFC5952-compliant IPv6 address shortening routine
2014-08-29 12:58:19 +02:00