Skip to content
Commit 3958177f authored by Jukka Rissanen's avatar Jukka Rissanen
Browse files

Merge net branch into master



Main changes:

- DHCPv4 fixes
- FRDM-K64F ethernet IPv6 workaround
- FRDM-K64F detect ethernet cable connect
- MQTT documentation fix
- Add HTTPS sample application
- HTTP fixes
- ZoAP fixes

----------------------------------------------------------------
Anas Nashif (1):
      net: remove obsolete CONFIG_NET_YAIP

Flavio Santes (5):
      net/dns: Update QEMU prj file
      net/mqtt: Fix inline doc for MQTT
      net/http: Add QEMU support to the HTTP server sample app
      net/http: Improve network configuration routines
      ext/lib/mbedtls: Add the TLS configuration file

Jorge Ramirez-Ortiz (1):
      net/mqtt: Add BT support to MQTT publisher sample

Marcus Shawcroft (4):
      eth/mcux: Add basic PHY support.
      net/dhcpv4: Fix event/state mismatch
      net/dhcpv4: Remove unused dhcpv4 offer state
      net/dhcpv4: Ensure udp header checksum is computed correctly

Paul Sokolovsky (1):
      eth/mcux: Add temporary workaround to unbreak IPv6 ND features.

Richard Peters (1):
      samples: net: Add .conf file for qemu_cortex_m3 in echo_*

Sergio Rodriguez (2):
      libc/include: Adding time.h
      samples/net/http: Add HTTP over TLS sample application

Vinicius Costa Gomes (5):
      iot/zoap: Improve zoap.h documentation
      samples/zoap-server: Update docs with information about libcoap
      iot/zoap: Fix handling of 16-bytes block-wise transfers
      iot/zoap: Fix header indentation
      iot/zoap: Add missing const modifier to header file

 boards/arm/frdm_k64f/doc/frdm_k64f.rst             |  10 +-
 drivers/ethernet/Kconfig.mcux                      |   7 +
 drivers/ethernet/eth_mcux.c                        | 204 +++++++--
 .../crypto/mbedtls/configs/config-mini-tls1_2.h    |  91 ++++
 include/net/dhcpv4.h                               |   1 -
 include/net/mqtt.h                                 | 390 ++++++++--------
 include/net/zoap.h                                 | 425 ++++++++++++++----
 lib/libc/minimal/include/time.h                    |  10 +
 samples/net/dns_client/prj_qemu_x86.conf           |   4 +-
 samples/net/echo_client/prj_qemu_cortex_m3.conf    |  26 ++
 samples/net/echo_server/prj_qemu_cortex_m3.conf    |  27 ++
 samples/net/http_server/README.rst                 |  57 ++-
 samples/net/http_server/prj_qemu_x86.conf          |  34 ++
 samples/net/http_server/src/Makefile               |   5 +
 samples/net/http_server/src/config.h               |   4 +
 samples/net/http_server/src/http_server.c          |  26 ++
 samples/net/http_server/src/http_server.h          |   4 +
 samples/net/http_server/src/https_server.c         | 406 +++++++++++++++++
 samples/net/http_server/src/main.c                 | 106 ++---
 samples/net/http_server/src/ssl_utils.c            | 295 ++++++++++++
 samples/net/http_server/src/ssl_utils.h            |  37 ++
 samples/net/http_server/src/test_certs.h           |  92 ++++
 samples/net/http_server/testcase.ini               |   2 +-
 samples/net/leds_demo/prj_802154.conf              |   1 -
 samples/net/mqtt_publisher/prj_96b_nitrogen.conf   |  65 +++
 samples/net/mqtt_publisher/src/Makefile            |   4 +
 samples/net/mqtt_publisher/src/main.c              |  59 ++-
 samples/net/mqtt_publisher/testcase.ini            |   5 +
 samples/net/zoap_server/README.rst                 |  28 +-
 samples/net/zoap_server/prj_cc2520.conf            |   1 -
 samples/net/zperf/prj_frdm_k64f_prof.conf          |   1 -
 samples/net/zperf/prj_qemu_x86.conf                |   1 -
 subsys/net/ip/dhcpv4.c                             |   6 +-
 subsys/net/ip/net_shell.c                          |   2 -
 subsys/net/lib/mqtt/mqtt.c                         | 110 ++---
 subsys/net/lib/mqtt/mqtt_pkt.c                     | 287 ++++++------
 subsys/net/lib/mqtt/mqtt_pkt.h                     | 495 +++++++++++----------
 subsys/net/lib/zoap/zoap.c                         |  32 +-
 38 files changed, 2506 insertions(+), 854 deletions(-)
 create mode 100644 ext/lib/crypto/mbedtls/configs/config-mini-tls1_2.h
 create mode 100644 lib/libc/minimal/include/time.h
 create mode 100644 samples/net/echo_client/prj_qemu_cortex_m3.conf
 create mode 100644 samples/net/echo_server/prj_qemu_cortex_m3.conf
 create mode 100644 samples/net/http_server/prj_qemu_x86.conf
 create mode 100644 samples/net/http_server/src/https_server.c
 create mode 100644 samples/net/http_server/src/ssl_utils.c
 create mode 100644 samples/net/http_server/src/ssl_utils.h
 create mode 100644 samples/net/http_server/src/test_certs.h
 create mode 100644 samples/net/mqtt_publisher/prj_96b_nitrogen.conf

Change-Id: Ic5d4766a98db84599f2238e0104c6bc37cbf34bd
Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
parents 587ba7b8 de60e4c8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment