Skip to content
Commit 90c37e21 authored by Jukka Rissanen's avatar Jukka Rissanen
Browse files

Merge net branch into master



Main changes:

- TCP fixes
- ZoAP server sample application
- Fixes to issues reported by Coverity

----------------------------------------------------------------
Anas Nashif (1):
      net: in newlib, ESHUTDOWN is considered an extension

Andrei Emeltchenko (1):
      wpan_serial: Fix possible NULL pointer dereference

Andy Ross (2):
      net: tcp: Pass correct user_data pointers
      net: tcp: Destroy net_tcp struct at the same time as the context

Flavio Santes (3):
      samples/net: Remove redundant configuration variable
      drivers/ethernet: Update default GPIO pin for the ENC28J60 module
      samples/net: Remove legacy configuation variables

Jukka Rissanen (11):
      net: Fix possible null pointer dereference in nbuf
      net: icmpv6: Removing dead code
      net: tcp: Allocate space for TCP header
      net: ipv6: Check neighbor pointer in NS reply timeout
      net: ipv6: Fix IPv6 prefix comparision
      net: nbuf: Check possible null pointer access
      net: buf: Use TCP sent_list variable only if needed
      net: nbuf: Fix debug prints in memory pool init and unref
      net: context: Add status to connect callback
      net: echo-server: Use net_buf_frag_del() return parameter
      net: echo-server: Discard 0 byte received packets

Leandro Pereira (7):
      net: slip: Do not remove fragments when sending data
      net: tcp: Ensure all timers are disposed of when releasing context
      net: tcp: Use an uint8_t for retry timeout instead of an uin32_t
      net: tcp: Remove unused `recv_ack` field from TCP context
      net: tcp: Get rid of `recv_mss` field from TCP struct
      net: tcp: Reduce size of `state` member from 32 to 4 bits
      net: tcp: When retransmitting, hold an extra, temporary reference

Luiz Augusto von Dentz (2):
      net: zoap-client: Add bluetooth support
      net: zperf: Add bluetooth support

Michael Scott (13):
      net: linkaddr: calculate linkaddr storage addr size via config
      net: linkaddr: introduce net_linkaddr_set function
      net: ipv6: fix NULL reference in handle_ra_neighbor
      net: route: remove extra variable use in net_route_add()
      net: tcp: remove unused semaphore tcp_lock
      net: tcp: in tcp_establish save TCP flags for post-processing use
      net: tcp: handle TCP_FIN after processing any data in the buffer
      net: tcp: don't assume TCP_FIN buffers are NET_DROP
      net: tcp: if buffer is TCP_FIN increment send_ack by 1
      net: tcp: fix buffer leak in tcp_synack_received
      net: net_context: correct description of recv_data_wait in net_context
      net: tcp: move accept_cb from net_context to net_tcp
      net: tcp: add timeout wait in net_context_connect

Ravi kumar Veeramally (6):
      samples: net: Fix DHCPv4 config options and run on its own thread
      net: 6lo: Handle destination address uncompression properly
      net: 6lo: Fix dereferencing null pointer
      net: dhcpv4: Remove dead code
      net: samples: Add ENC28J60 pin numbers to documentation
      net: samples: Print assigned address from DHCPv4 server

Tomasz Bursztyka (4):
      net: shell: Use lighter printk() instead of printf()
      samples: net: Fix a format issues in echo_client
      samples: net: Enable buffer warning and errors in echo apps on qemu
      net: tcp: Fix TCP states swap when accepted an incoming connection

Vinicius Costa Gomes (14):
      samples/zoap_server: Add support for the '/separate' resource
      samples/zoap_server: Add support for blockwise GET tests
      iot/zoap: Add response code for Continue status
      samples/zoap_server: Add resouce for TD_COAP_BLOCK_03
      iot/zoap: Ignore non-request packets in zoap_handle_request
      iot/zoap: Fix wrong byte-order when retrieving integer options
      iot/zoap: Clarify the return value of zoap_register_observer()
      iot/zoap: Add a helper to find an observer by address
      samples/zoap_server: Fix responding messages with the wrong type
      samples/zoap_server: Add support for messages with token
      samples/zoap_server: Add Content-Format options to GET responses
      samples/zoap_server: Include a path for the "created" resource
      samples/zoap-server: Add support for the "location-query" resource
      samples/zoap_server: Do not error if there's no payload or queries

 drivers/ethernet/Kconfig.enc28j60                  |   2 +-
 drivers/slip/slip.c                                |   5 +-
 include/net/buf.h                                  |   2 +
 include/net/net_context.h                          |  24 +-
 include/net/net_ip.h                               |  21 +-
 include/net/net_linkaddr.h                         |  55 ++-
 include/net/zoap.h                                 |   9 +
 samples/net/dhcpv4_client/prj_arduino_101.conf     |   2 -
 samples/net/dhcpv4_client/prj_frdm_k64f.conf       |  12 +-
 samples/net/dhcpv4_client/prj_qemu_x86.conf        |  29 +-
 samples/net/dhcpv4_client/src/Makefile             |   1 +
 samples/net/dhcpv4_client/src/main.c               |  52 ++-
 samples/net/dns_client/README.rst                  |  22 +-
 samples/net/dns_client/prj_arduino_101.conf        |   5 -
 samples/net/echo_client/prj_arduino_101.conf       |   4 +-
 samples/net/echo_client/prj_qemu_x86.conf          |   3 +
 samples/net/echo_client/src/echo-client.c          |   2 +-
 samples/net/echo_server/prj_arduino_101.conf       |   4 +-
 samples/net/echo_server/prj_qemu_x86.conf          |   3 +
 samples/net/echo_server/src/echo-server.c          |  16 +-
 .../net/mbedtls_dtlsclient/prj_arduino_101.conf    |   2 -
 samples/net/wpan_serial/src/main.c                 |   6 +-
 samples/net/zoap_client/Makefile                   |   7 +-
 samples/net/zoap_client/prj_bt.conf                |  21 +
 samples/net/zoap_client/src/Makefile               |   5 +
 samples/net/zoap_client/src/zoap-client.c          |  38 +-
 samples/net/zoap_client/testcase.ini               |   5 +
 samples/net/zoap_server/src/zoap-server.c          | 476 ++++++++++++++++++++-
 samples/net/zperf/Makefile                         |   7 +-
 samples/net/zperf/prj_bt.conf                      |  32 ++
 samples/net/zperf/src/Makefile                     |   5 +
 samples/net/zperf/src/zperf_shell.c                |  12 +
 subsys/net/ip/6lo.c                                |  16 +-
 subsys/net/ip/Makefile                             |   1 +
 subsys/net/ip/dhcpv4.c                             |   9 +-
 subsys/net/ip/icmpv6.c                             |   4 -
 subsys/net/ip/ipv6.c                               |  26 +-
 subsys/net/ip/nbr.c                                |   6 +-
 subsys/net/ip/nbuf.c                               |  40 +-
 subsys/net/ip/net_context.c                        | 126 +++---
 subsys/net/ip/net_shell.c                          | 217 +++++-----
 subsys/net/ip/route.c                              |   6 +-
 subsys/net/ip/tcp.c                                | 140 +++---
 subsys/net/ip/tcp.h                                |  67 ++-
 subsys/net/lib/zoap/zoap.c                         |  86 +++-
 tests/net/context/src/main.c                       |   3 +-
 tests/net/ipv6/src/main.c                          |  66 +++
 tests/net/rpl/src/main.c                           |   8 +-
 48 files changed, 1278 insertions(+), 432 deletions(-)
 create mode 100644 samples/net/zoap_client/prj_bt.conf
 create mode 100644 samples/net/zperf/prj_bt.conf

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