Merge net branch into master
Main changes:
- Former iot libraries are now part of network stack as net protocols.
(lib/iot/ is now susbys/net/lib/)
- Network stack logging is more flexible with its own sys log level
- Network statistics are now handled privately into the stack, and
exposed via net_mgmt API to the user. This prepares the future
statistics per-interface, per-l2 etc...
----------------------------------------------------------------
Andrei Emeltchenko (1):
samples: net: Add echo_client build test for frdm CC2520 configuration
Flavio Santes (2):
samples/net: Fix logging format error
net: Restructure network protocols
Marcus Shawcroft (9):
dhcpv4: Report address acquisition.
samples/dhcpv4: Add missing NET_MGMT configury.
net/dhcpv4: Correct spellings in comments.
net/dns: Drop unnecessary ETH_KSDK configuration.
net/dhcpv4: Re-instate init_app()
ethernet/arp: Use gateway for non local ipv4 routing.
dhcpv4: Add option parsing diagnostics.
net/dhcpv4: Use router option to set IPv4 GW.
net/dhcpv4: Use net_if_ipv4_set_netmask()
Tomasz Bursztyka (18):
tests: net: Fix format issues
net: buf: Fix a debug message missing a parameter
net: log: Do not select STDOUT_CONSOLE
samples: net: STDOUT_CONSOLE is not necessary
net: buf: Change NET_BUF_DEBUG to NET_BUF_LOG and add a level option
net: buf: Let's make use of func/line parameters when available
net: statistics: Fix comment length issue
net: statistics: Move current statistics code to its own file
net: statistics: Make statistics calculation fully private
net: statistics: Provide specific Kconfig options
net: statistics: Have a dedicated struct for rpl data
net: statistics: Expose relevant information through net mgmt API
net: ethernet: IPv6 packet length should be relevantly handled
net: rpl: Fix a build issue
net: nbuf: Let's remove inner type
net: tests: Add platforms whitelist to http header unit test
net: ip: Improve logging by adding a dedicated sys_log level
net: shell: NET_SHELL is not NET_LOG dependent
Vinicius Costa Gomes (4):
samples/zoap_client: Use the correct option for TAP
samples/zoap_server: Use the correct option for TAP
lib/zoap: Fix incorrect values for payload size
tests/zoap: Add test for payload size
doc/doxygen.config | 3 +-
include/net/buf.h | 6 +-
include/{iot => net}/dns_client.h | 0
include/{iot => net}/http_parser.h | 0
include/{iot => net}/mqtt.h | 2 +-
include/{iot => net}/mqtt_types.h | 0
include/net/nbuf.h | 20 --
include/net/net_context.h | 21 --
include/net/net_core.h | 14 +-
include/net/net_ip.h | 6 +-
include/net/net_stats.h | 180 +++++++++-----
{lib/iot/zoap => include/net}/zoap.h | 0
.../net/zoap_link_format.h | 0
lib/Kbuild | 1 -
lib/Kconfig | 2 -
lib/Makefile | 2 -
lib/iot/Makefile | 15 --
lib/iot/dns/Makefile | 5 -
lib/iot/mqtt/Makefile | 2 -
lib/iot/zoap/Kbuild | 4 -
lib/iot/zoap/Makefile | 1 -
samples/net/README | 4 +-
samples/net/dhcpv4_client/prj_frdm_k64f.conf | 3 +
samples/net/dhcpv4_client/prj_qemu_x86.conf | 2 +
samples/net/dhcpv4_client/src/main.c | 21 +-
samples/net/dns_client/README_IPv4 | 2 +-
samples/net/dns_client/prj_frdm_k64f.conf | 8 -
samples/net/dns_client/src/main.c | 2 +-
.../net/echo_client/prj_arduino_101_cc2520.conf | 1 +
samples/net/echo_client/prj_cc2520.conf | 1 +
samples/net/echo_client/prj_frdm_k64f_cc2520.conf | 1 +
samples/net/echo_client/prj_qemu_802154.conf | 1 +
samples/net/echo_client/src/echo-client.c | 6 +-
samples/net/echo_client/testcase.ini | 6 +
.../net/echo_server/prj_arduino_101_cc2520.conf | 1 +
samples/net/echo_server/prj_cc2520.conf | 1 +
samples/net/echo_server/prj_frdm_k64f_cc2520.conf | 1 +
samples/net/echo_server/prj_qemu_802154.conf | 1 +
samples/net/echo_server/src/echo-server.c | 4 +-
samples/net/ieee802154/cc2520/prj.conf | 2 -
samples/net/ieee802154/qemu/prj.conf | 1 -
samples/net/leds_demo/src/Makefile | 1 -
samples/net/leds_demo/src/leds-demo.c | 8 +-
samples/net/leds_demo/testcase.ini | 2 +-
.../net/mbedtls_dtlsclient/prj_arduino_101.conf | 2 -
samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf | 2 -
samples/net/mbedtls_sslclient/prj_galileo.conf | 2 -
samples/net/wpan_serial/prj.conf | 1 -
samples/net/wpanusb/prj.conf | 1 -
samples/net/zoap_client/prj.conf | 2 +-
samples/net/zoap_client/src/zoap-client.c | 2 +-
samples/net/zoap_server/prj.conf | 2 +-
samples/net/zoap_server/src/Makefile | 2 -
samples/net/zoap_server/src/zoap-server.c | 2 +-
samples/net/zperf/prj_galileo_ethernet.conf | 1 -
samples/net/zperf/prj_galileo_ethernet_prof.conf | 1 -
samples/net/zperf/src/zperf_shell.c | 4 +-
samples/net/zperf/src/zperf_udp_receiver.c | 2 +-
subsys/net/Kconfig | 27 ++-
subsys/net/Makefile | 4 +
subsys/net/buf.c | 28 +--
subsys/net/ip/6lo.c | 2 +-
subsys/net/ip/Kconfig | 10 +
subsys/net/ip/Kconfig.debug | 54 ++++-
subsys/net/ip/Kconfig.rpl | 8 -
subsys/net/ip/Kconfig.stats | 93 +++++++
subsys/net/ip/Makefile | 1 +
subsys/net/ip/connection.c | 20 +-
subsys/net/ip/dhcpv4.c | 61 ++++-
subsys/net/ip/icmpv4.c | 34 +--
subsys/net/ip/icmpv6.c | 36 +--
subsys/net/ip/ipv4.c | 4 +-
subsys/net/ip/ipv6.c | 46 ++--
subsys/net/ip/l2/arp.c | 36 +--
subsys/net/ip/l2/bluetooth.c | 7 +-
subsys/net/ip/l2/ethernet.c | 9 +-
subsys/net/ip/l2/ieee802154/ieee802154.c | 4 +-
subsys/net/ip/l2/ieee802154/ieee802154_fragment.c | 2 +-
subsys/net/ip/l2/ieee802154/ieee802154_frame.c | 4 +-
.../net/ip/l2/ieee802154/ieee802154_radio_aloha.c | 4 +-
.../ip/l2/ieee802154/ieee802154_radio_csma_ca.c | 4 +-
subsys/net/ip/nbr.c | 6 +-
subsys/net/ip/nbuf.c | 252 +++++++++----------
subsys/net/ip/net_context.c | 11 +-
subsys/net/ip/net_core.c | 157 ++----------
subsys/net/ip/net_if.c | 20 +-
subsys/net/ip/net_mgmt.c | 2 +-
subsys/net/ip/net_private.h | 6 +-
subsys/net/ip/net_shell.c | 11 +-
subsys/net/ip/net_stats.c | 262 ++++++++++++++++++++
subsys/net/ip/net_stats.h | 270 +++++++++++++++++++++
subsys/net/ip/route.c | 18 +-
subsys/net/ip/rpl-mrhof.c | 6 +-
subsys/net/ip/rpl-of0.c | 6 +-
subsys/net/ip/rpl.c | 94 ++++---
subsys/net/ip/tcp.c | 20 +-
subsys/net/ip/trickle.c | 4 +-
subsys/net/ip/utils.c | 2 +-
{lib/iot => subsys/net/lib}/Kbuild | 0
{lib/iot => subsys/net/lib}/Kconfig | 10 +-
subsys/net/lib/Makefile | 15 ++
{lib/iot => subsys/net/lib}/dns/Kconfig | 0
subsys/net/lib/dns/Makefile | 7 +
{lib/iot => subsys/net/lib}/dns/README | 4 -
{lib/iot => subsys/net/lib}/dns/dns_client.c | 2 +-
{lib/iot => subsys/net/lib}/dns/dns_pack.c | 0
{lib/iot => subsys/net/lib}/dns/dns_pack.h | 0
{lib/iot => subsys/net/lib}/http/Kconfig | 0
{lib/iot => subsys/net/lib}/http/Makefile | 0
.../iot => subsys/net/lib}/http/README_http_parser | 0
{lib/iot => subsys/net/lib}/http/http_parser.c | 2 +-
{lib/iot => subsys/net/lib}/mqtt/Kconfig | 0
subsys/net/lib/mqtt/Makefile | 4 +
{lib/iot => subsys/net/lib}/mqtt/mqtt.c | 2 +-
{lib/iot => subsys/net/lib}/mqtt/mqtt_pkt.c | 0
{lib/iot => subsys/net/lib}/mqtt/mqtt_pkt.h | 2 +-
subsys/net/lib/zoap/Kbuild | 4 +
{lib/iot => subsys/net/lib}/zoap/Kconfig | 0
subsys/net/lib/zoap/Makefile | 1 +
{lib/iot => subsys/net/lib}/zoap/zoap.c | 4 +-
.../net/lib/zoap/zoap_link_format.c | 4 +-
tests/iot/test_http_header/testcase.ini | 3 -
tests/iot/test_mqtt_packet/src/Makefile | 4 -
tests/net/6lo/prj.conf | 1 -
tests/net/6lo/src/main.c | 26 +-
tests/net/arp/src/main.c | 2 +-
tests/net/buf/prj.conf | 3 +-
tests/net/dhcpv4/src/main.c | 2 +-
tests/net/ieee802154/fragment/src/main.c | 2 +-
.../net/ieee802154/l2/src/ieee802154_fake_driver.c | 2 +-
tests/net/ip-addr/src/main.c | 2 +-
tests/net/ipv6/src/main.c | 2 +-
.../lib/http_header_fields}/Makefile | 0
.../lib/http_header_fields}/README | 0
.../lib/http_header_fields}/prj.conf | 5 +-
.../lib/http_header_fields}/src/Makefile | 2 +-
.../http_header_fields/src/http_header_fields.c} | 2 +-
.../lib/http_header_fields}/testcase.ini | 2 +-
.../lib/mqtt_packet}/Makefile | 0
.../lib/mqtt_packet}/README | 0
.../lib/mqtt_packet}/prj.conf | 0
tests/net/lib/mqtt_packet/src/Makefile | 4 +
.../lib/mqtt_packet/src/mqtt_packet.c} | 0
tests/net/lib/mqtt_packet/testcase.ini | 4 +
tests/net/{ => lib}/zoap/Makefile | 0
tests/net/{ => lib}/zoap/prj.conf | 0
tests/net/{ => lib}/zoap/src/Makefile | 0
tests/net/{ => lib}/zoap/src/main.c | 14 +-
tests/net/{ => lib}/zoap/testcase.ini | 0
tests/net/nbuf/prj.conf | 3 +-
tests/net/nbuf/src/main.c | 2 +-
tests/net/neighbor/src/main.c | 2 +-
tests/net/route/src/main.c | 2 +-
tests/net/rpl/src/main.c | 2 +-
tests/net/tcp/prj.conf | 1 +
tests/net/tcp/src/main.c | 2 +-
tests/net/utils/src/main.c | 2 +-
157 files changed, 1429 insertions(+), 765 deletions(-)
rename include/{iot => net}/dns_client.h (100%)
rename include/{iot => net}/http_parser.h (100%)
rename include/{iot => net}/mqtt.h (99%)
rename include/{iot => net}/mqtt_types.h (100%)
rename {lib/iot/zoap => include/net}/zoap.h (100%)
rename lib/iot/zoap/link-format.h => include/net/zoap_link_format.h (100%)
delete mode 100644 lib/iot/Makefile
delete mode 100644 lib/iot/dns/Makefile
delete mode 100644 lib/iot/mqtt/Makefile
delete mode 100644 lib/iot/zoap/Kbuild
delete mode 100644 lib/iot/zoap/Makefile
create mode 100644 subsys/net/ip/Kconfig.stats
create mode 100644 subsys/net/ip/net_stats.c
create mode 100644 subsys/net/ip/net_stats.h
rename {lib/iot => subsys/net/lib}/Kbuild (100%)
rename {lib/iot => subsys/net/lib}/Kconfig (77%)
create mode 100644 subsys/net/lib/Makefile
rename {lib/iot => subsys/net/lib}/dns/Kconfig (100%)
create mode 100644 subsys/net/lib/dns/Makefile
rename {lib/iot => subsys/net/lib}/dns/README (68%)
rename {lib/iot => subsys/net/lib}/dns/dns_client.c (99%)
rename {lib/iot => subsys/net/lib}/dns/dns_pack.c (100%)
rename {lib/iot => subsys/net/lib}/dns/dns_pack.h (100%)
rename {lib/iot => subsys/net/lib}/http/Kconfig (100%)
rename {lib/iot => subsys/net/lib}/http/Makefile (100%)
rename {lib/iot => subsys/net/lib}/http/README_http_parser (100%)
rename {lib/iot => subsys/net/lib}/http/http_parser.c (99%)
rename {lib/iot => subsys/net/lib}/mqtt/Kconfig (100%)
create mode 100644 subsys/net/lib/mqtt/Makefile
rename {lib/iot => subsys/net/lib}/mqtt/mqtt.c (99%)
rename {lib/iot => subsys/net/lib}/mqtt/mqtt_pkt.c (100%)
rename {lib/iot => subsys/net/lib}/mqtt/mqtt_pkt.h (99%)
create mode 100644 subsys/net/lib/zoap/Kbuild
rename {lib/iot => subsys/net/lib}/zoap/Kconfig (100%)
create mode 100644 subsys/net/lib/zoap/Makefile
rename {lib/iot => subsys/net/lib}/zoap/zoap.c (99%)
rename lib/iot/zoap/link-format.c => subsys/net/lib/zoap/zoap_link_format.c (99%)
delete mode 100644 tests/iot/test_http_header/testcase.ini
delete mode 100644 tests/iot/test_mqtt_packet/src/Makefile
rename tests/{iot/test_http_header => net/lib/http_header_fields}/Makefile (100%)
rename tests/{iot/test_http_header => net/lib/http_header_fields}/README (100%)
rename tests/{iot/test_http_header => net/lib/http_header_fields}/prj.conf (58%)
rename tests/{iot/test_http_header => net/lib/http_header_fields}/src/Makefile (95%)
rename tests/{iot/test_http_header/src/test_http_header.c => net/lib/http_header_fields/src/http_header_fields.c} (99%)
rename tests/{iot/test_mqtt_packet => net/lib/http_header_fields}/testcase.ini (86%)
rename tests/{iot/test_mqtt_packet => net/lib/mqtt_packet}/Makefile (100%)
rename tests/{iot/test_mqtt_packet => net/lib/mqtt_packet}/README (100%)
rename tests/{iot/test_mqtt_packet => net/lib/mqtt_packet}/prj.conf (100%)
create mode 100644 tests/net/lib/mqtt_packet/src/Makefile
rename tests/{iot/test_mqtt_packet/src/test_mqtt_packet.c => net/lib/mqtt_packet/src/mqtt_packet.c} (100%)
create mode 100644 tests/net/lib/mqtt_packet/testcase.ini
rename tests/net/{ => lib}/zoap/Makefile (100%)
rename tests/net/{ => lib}/zoap/prj.conf (100%)
rename tests/net/{ => lib}/zoap/src/Makefile (100%)
rename tests/net/{ => lib}/zoap/src/main.c (98%)
rename tests/net/{ => lib}/zoap/testcase.ini (100%)
Change-Id: I6b32349768694ae3cca9cda68e88e6c5cc97ae61
Signed-off-by: 
Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Loading
Please sign in to comment