[riot-commits] [RIOT-OS/RIOT] 432688: rpl: wrong length of DIO options

[Fabian Brandt]

  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: 432688accb26042ed5d8ed30c3af89e47483ef7e
      https://github.com/RIOT-OS/RIOT/commit/432688accb26042ed5d8ed30c3af89e47483ef7e
  Author: Cenk Gündoğan <cnkgndgn at gmail.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
    M sys/net/routing/rpl/rpl_storing/rpl_storing.c

  Log Message:
  -----------
  rpl: wrong length of DIO options

Currently, the DIO options `dodag conf` and `prefix info` are off by two
bytes in their `length` field. The RFC states, that the length field
should not include the option `type` field and the `length` field (two bytes).

For Prefix Info Option: Option Length: 30 (RFC 6550, P.61)
For Dodag Conf  Option: Option Length: 14 (RFC 6550, P.52)

Wireshark complains about DIOs as malformed packets, otherwise.
Can be reproduced by running the rpl_udp example and logging the DIOs
via wireshark.


  Commit: 26095013a1b5ba4dd3026e17f8b8cc085b55894b
      https://github.com/RIOT-OS/RIOT/commit/26095013a1b5ba4dd3026e17f8b8cc085b55894b
  Author: Cenk Gündoğan <cnkgndgn at gmail.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M sys/net/include/rpl/rpl_config.h
    M sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
    M sys/net/routing/rpl/rpl_storing/rpl_storing.c

  Log Message:
  -----------
  rpl: introduce constants for DODAG_CONF length with and without RPL_OPT_LEN


  Commit: c14217c68e1e7cdb303e3ad4db32ec7fbb59b481
      https://github.com/RIOT-OS/RIOT/commit/c14217c68e1e7cdb303e3ad4db32ec7fbb59b481
  Author: Cenk Gündoğan <cnkgndgn at gmail.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M sys/net/include/rpl/rpl_config.h
    M sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
    M sys/net/routing/rpl/rpl_storing/rpl_storing.c

  Log Message:
  -----------
  rpl: introduce constants for PREFIX_INFO length with/without RPL_OPT_LEN


  Commit: e9168b5efcfb48944e75a2e6e6f937e0e8e0fec1
      https://github.com/RIOT-OS/RIOT/commit/e9168b5efcfb48944e75a2e6e6f937e0e8e0fec1
  Author: Fabian Brandt <fabbrandt at gmail.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M sys/net/include/rpl/rpl_config.h
    M sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
    M sys/net/routing/rpl/rpl_storing/rpl_storing.c

  Log Message:
  -----------
  Merge pull request #2216 from cgundogan/rpl_wireshark_dio_malformed_packet

rpl: wrong length of DIO options


Compare: https://github.com/RIOT-OS/RIOT/compare/9b65000f8f27...e9168b5efcfb