Merge net branch into master
Main changes:
- RPL fixes
- TCP 2MSL timeout tweaking fix
- net_buf context pool crash fix
- net-shell connection status output fixes
- Packet re-routing fixes
- net_mgmt API fixes
- IEEE 802.15.4 link layer security added
- Network sample applications config option prefix changed
----------------------------------------------------------------
Jukka Rissanen (6):
net: rpl: Temporarily disable some of the RPL tests
net: tests: Fix nbr lookup in route tests
net: tcp: Allow tweaking of 2MSL timeout
net: nbuf: Do not crash if context pools are not in use
net: shell: Fix the connection status output
net: Check if sent packet is meant for us
Ravi kumar Veeramally (8):
net: if: Fix triggering interface link call back
net: icmpv6: Remove unnecessary cache ptrs for src and dst
net: rpl: Align Kconfig options properly
net: rpl: Add support for handling of DAO ACK
net: rpl: Fix invalid parsing of DAO message
net: rpl: Fix invalid parsing of DIO message
net: rpl: Fix DAO ACK reply
net: rpl: Fix invalid nbr lookup
Tomasz Bursztyka (29):
net/ieee802154: Add Auxiliary Security Header definitions
net/ieee802154: Parse and validate auxiliary security header
net/ieee802154: Change function signature for future change
net/ieee802154: Normalize one parameter to make it clearer
net/ieee802154: Add generic support for link layer cipher operations
net/ieee802154: Provide the means to create secured data frames
net/ieee802154: Provide the means to decipher data frames
net/ieee802154: Integrate link-layer security relevantly
net/ieee802154: Add net mgmt requests to set/get security settings
drivers/ieee802154: Adding support for CC2520 ccm crypto
tests/net/ieee802154: Add a simple CC2520 crypto dev test
net/ieee802154: Expose auxiliary security header validation function
net: Rename Kconfig.samples and its main option for future changes
net: Add 802.15.4 useful Kconfig application settings
net/ieee802154: Rename <SET/GET>_CHAN to <SET/GET>_CHANNEL
samples/net: Uses CONFIG_NET_APP_IEEE802154_* options relevantly
samples/net: Remove the need for IEEE 802.15.4 stack in wpan serial
net/ieee802154: Remove ORFD choice altogether.
net/samples: Add 802.15.4 link-layer security settings for the samples
tests/net/ieee802154: Switch l2 to ztest framework
tests/net/ieee802154: Add a unit test for secured data frame validation
net/ieee802154: We don't get the MFR from device drivers
net/samples/ieee802154: Making hw sample simpler
net/ieee802154: Simplify data FS settings function signature
net/ieee802154: Use context's extended address when generating frame
net/ieee802154: Use context instead of interface to reduce stack usage
net/ieee802154: Disable ACK reply handling by default
net/ieee802154: Remove useless __packed annotation
net/mgmt: Mask vs event should be verified part by part
drivers/ieee802154/Kconfig.cc2520 | 27 +-
drivers/ieee802154/ieee802154_cc2520.c | 414 ++++++++++++++++++++-
drivers/ieee802154/ieee802154_cc2520.h | 4 +
drivers/ieee802154/ieee802154_cc2520_regs.h | 11 +-
include/net/ieee802154.h | 66 +++-
samples/bluetooth/ipsp/prj.conf | 6 +-
samples/bluetooth/ipsp/src/main.c | 4 +-
samples/net/coaps_client/prj_qemu_x86.conf | 6 +-
samples/net/coaps_client/src/coaps_client.c | 6 +-
samples/net/coaps_client/src/udp.c | 6 +-
samples/net/coaps_server/prj_qemu_x86.conf | 6 +-
samples/net/coaps_server/src/coaps_server.c | 6 +-
samples/net/common/ieee802154_settings.c | 59 +++
samples/net/common/ieee802154_settings.h | 15 +
samples/net/dns_client/README.rst | 5 +-
samples/net/dns_client/prj_arduino_101.conf | 10 +-
samples/net/dns_client/prj_frdm_k64f.conf | 10 +-
samples/net/dns_client/prj_qemu_x86.conf | 10 +-
samples/net/dns_client/src/config.h | 10 +-
samples/net/dns_resolve/prj_qemu_x86.conf | 10 +-
samples/net/dns_resolve/src/main.c | 12 +-
samples/net/echo_client/prj_arduino_101.conf | 6 +-
.../net/echo_client/prj_arduino_101_cc2520.conf | 3 +-
samples/net/echo_client/prj_bt.conf | 6 +-
samples/net/echo_client/prj_cc2520.conf | 7 +-
samples/net/echo_client/prj_frdm_k64f.conf | 10 +-
samples/net/echo_client/prj_frdm_k64f_cc2520.conf | 7 +-
samples/net/echo_client/prj_frdm_k64f_mcr20a.conf | 7 +-
samples/net/echo_client/prj_nrf5.conf | 7 +-
samples/net/echo_client/prj_qemu_802154.conf | 7 +-
samples/net/echo_client/prj_qemu_cortex_m3.conf | 10 +-
samples/net/echo_client/prj_qemu_x86.conf | 10 +-
samples/net/echo_client/prj_sam_e70_xplained.conf | 6 +-
samples/net/echo_client/src/Makefile | 7 +
samples/net/echo_client/src/echo-client.c | 39 +-
samples/net/echo_server/prj_arduino_101.conf | 6 +-
.../net/echo_server/prj_arduino_101_cc2520.conf | 1 -
samples/net/echo_server/prj_bt.conf | 6 +-
samples/net/echo_server/prj_cc2520.conf | 5 +-
samples/net/echo_server/prj_frdm_k64f.conf | 10 +-
samples/net/echo_server/prj_frdm_k64f_cc2520.conf | 5 +-
samples/net/echo_server/prj_frdm_k64f_mcr20a.conf | 5 +-
samples/net/echo_server/prj_nrf5.conf | 7 +-
samples/net/echo_server/prj_qemu_802154.conf | 5 +-
samples/net/echo_server/prj_qemu_cortex_m3.conf | 10 +-
samples/net/echo_server/prj_qemu_x86.conf | 10 +-
samples/net/echo_server/prj_sam_e70_xplained.conf | 6 +-
samples/net/echo_server/src/Makefile | 7 +
samples/net/echo_server/src/echo-server.c | 23 +-
samples/net/http_client/README.rst | 4 +-
samples/net/http_client/prj_frdm_k64f.conf | 11 +-
samples/net/http_client/prj_qemu_x86.conf | 10 +-
samples/net/http_client/src/config.h | 10 +-
samples/net/http_server/README.rst | 4 +-
samples/net/http_server/prj_frdm_k64f.conf | 6 +-
samples/net/http_server/prj_qemu_x86.conf | 6 +-
samples/net/http_server/src/config.h | 6 +-
samples/net/ieee802154/hw/prj_cc2520_1.conf | 64 ++++
samples/net/ieee802154/hw/prj_cc2520_2.conf | 64 ++++
samples/net/ieee802154/hw/prj_mcr20a.conf | 19 +-
samples/net/ieee802154/hw/prj_nrf5.conf | 30 +-
samples/net/ieee802154/hw/src/Makefile | 3 +
samples/net/ieee802154/hw/src/ieee802154_test.c | 96 ++---
samples/net/ieee802154/qemu/prj.conf | 4 +-
samples/net/ieee802154/qemu/prj_client.conf | 4 +-
samples/net/ieee802154/qemu/prj_server.conf | 4 +-
.../net/ieee802154/qemu/src/ieee802154_qemu_test.c | 4 +-
samples/net/irc_bot/prj_frdm_k64f.conf | 10 +-
samples/net/irc_bot/prj_qemu_x86.conf | 10 +-
samples/net/irc_bot/src/irc-bot.c | 24 +-
samples/net/leds_demo/prj_802154.conf | 4 +-
samples/net/leds_demo/src/Makefile | 7 +
samples/net/leds_demo/src/leds-demo.c | 11 +
.../net/mbedtls_dtlsclient/prj_arduino_101.conf | 10 +-
samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf | 10 +-
samples/net/mbedtls_dtlsclient/src/dtls_client.c | 12 +-
samples/net/mbedtls_dtlsclient/src/udp.c | 12 +-
samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf | 10 +-
samples/net/mbedtls_dtlsserver/src/dtls_server.c | 12 +-
samples/net/mbedtls_sslclient/src/tcp_cfg.h | 10 +-
samples/net/mqtt_publisher/prj_96b_nitrogen.conf | 10 +-
samples/net/mqtt_publisher/prj_frdm_k64f.conf | 10 +-
samples/net/mqtt_publisher/prj_qemu_x86.conf | 10 +-
samples/net/mqtt_publisher/src/config.h | 10 +-
samples/net/nats/prj_qemu_x86.conf | 6 +-
samples/net/nats/src/main.c | 24 +-
samples/net/telnet/prj_frdm_k64f.conf | 4 +-
samples/net/telnet/prj_qemu_x86.conf | 6 +-
samples/net/telnet/prj_qemu_x86_iamcu.conf | 6 +-
samples/net/telnet/src/telnet.c | 12 +-
samples/net/wpan_serial/prj.conf | 4 +-
samples/net/wpan_serial/src/main.c | 12 +-
samples/net/zoap_client/prj_bt.conf | 6 +-
samples/net/zoap_server/prj_cc2520.conf | 8 +-
samples/net/zoap_server/src/Makefile | 7 +
samples/net/zoap_server/src/zoap-server.c | 17 +-
samples/net/zperf/prj_bt.conf | 6 +-
samples/net/zperf/prj_frdm_k64f.conf | 10 +-
samples/net/zperf/prj_qemu_x86.conf | 10 +-
samples/net/zperf/prj_quark_se_c1000_devboard.conf | 9 +-
samples/net/zperf/src/Makefile | 7 +
samples/net/zperf/src/zperf_internal.h | 12 +-
samples/net/zperf/src/zperf_shell.c | 11 +
subsys/net/ip/Kconfig | 10 +-
subsys/net/ip/Kconfig.app | 106 ++++++
subsys/net/ip/Kconfig.rpl | 130 ++++---
subsys/net/ip/Kconfig.samples | 50 ---
subsys/net/ip/icmpv6.c | 23 +-
subsys/net/ip/l2/ieee802154/Kconfig | 58 +--
subsys/net/ip/l2/ieee802154/Makefile | 2 +
subsys/net/ip/l2/ieee802154/ieee802154.c | 30 +-
subsys/net/ip/l2/ieee802154/ieee802154_frame.c | 292 +++++++++++++--
subsys/net/ip/l2/ieee802154/ieee802154_frame.h | 103 ++++-
subsys/net/ip/l2/ieee802154/ieee802154_mgmt.c | 75 +++-
subsys/net/ip/l2/ieee802154/ieee802154_security.c | 198 ++++++++++
subsys/net/ip/l2/ieee802154/ieee802154_security.h | 36 ++
subsys/net/ip/l2/ieee802154/ieee802154_shell.c | 4 +-
subsys/net/ip/nbuf.c | 12 +-
subsys/net/ip/net_core.c | 12 +-
subsys/net/ip/net_if.c | 6 +-
subsys/net/ip/net_mgmt.c | 11 +-
subsys/net/ip/net_shell.c | 80 ++--
subsys/net/ip/rpl.c | 187 +++++++---
subsys/net/ip/tcp.c | 6 +-
tests/net/ieee802154/crypto/Makefile | 12 +
.../hw => tests/net/ieee802154/crypto}/prj.conf | 8 +-
tests/net/ieee802154/crypto/src/Makefile | 1 +
.../ieee802154/crypto/src/ieee802154_crypto_test.c | 310 +++++++++++++++
tests/net/ieee802154/crypto/testcase.ini | 5 +
tests/net/ieee802154/l2/prj.conf | 6 +-
tests/net/ieee802154/l2/src/Makefile | 2 +
.../net/ieee802154/l2/src/ieee802154_fake_driver.c | 26 +-
tests/net/ieee802154/l2/src/ieee802154_test.c | 206 ++++++----
tests/net/mgmt/src/mgmt.c | 6 +-
tests/net/route/src/main.c | 82 +---
tests/net/rpl/prj.conf | 1 +
tests/net/rpl/src/main.c | 17 +-
137 files changed, 2795 insertions(+), 967 deletions(-)
create mode 100644 samples/net/common/ieee802154_settings.c
create mode 100644 samples/net/common/ieee802154_settings.h
create mode 100644 samples/net/ieee802154/hw/prj_cc2520_1.conf
create mode 100644 samples/net/ieee802154/hw/prj_cc2520_2.conf
create mode 100644 subsys/net/ip/Kconfig.app
delete mode 100644 subsys/net/ip/Kconfig.samples
create mode 100644 subsys/net/ip/l2/ieee802154/ieee802154_security.c
create mode 100644 subsys/net/ip/l2/ieee802154/ieee802154_security.h
create mode 100644 tests/net/ieee802154/crypto/Makefile
rename {samples/net/ieee802154/hw => tests/net/ieee802154/crypto}/prj.conf (86%)
create mode 100644 tests/net/ieee802154/crypto/src/Makefile
create mode 100644 tests/net/ieee802154/crypto/src/ieee802154_crypto_test.c
create mode 100644 tests/net/ieee802154/crypto/testcase.ini
Change-Id: I41c259c48daf010ad4f4ece1f43503caf94f4eb6
Signed-off-by:
Jukka Rissanen <jukka.rissanen@linux.intel.com>
Loading
Please sign in to comment