You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2022/11/22 11:45:32 UTC
[incubator-nuttx] branch master updated (b4bab51e86 -> 39338ce96c)
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from b4bab51e86 tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2
new c2f566afcb net/usrsock: Remove NET_USRSOCK_NO_INET[6]
new 7f380533a3 net/udp: NET_BROADCAST shouldn't configurable if NET_UDP_NO_STACK enable
new 0d516c7ff6 net/tcp: Remove the dependence on SCHED_WORKQUEUE
new 8bbb477316 net/usrsock: Should select NET_[UDP|TCP]_NO_STACK instead NET_[UDP|TCP]
new b170e4cc9f net/usrsock: Split NET_USRSOCK_OTHER to NET_USRSOCK_ICMP[v6]
new 39338ce96c boards: Refresh ursock related config
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../arm/cxd56xx/spresense/configs/wifi/defconfig | 4 ---
.../cxd56xx/spresense/configs/wifi_smp/defconfig | 4 ---
.../stm32/stm32f4discovery/configs/wifi/defconfig | 4 ---
boards/sim/sim/sim/configs/adb/defconfig | 5 +--
boards/sim/sim/sim/configs/rpproxy/defconfig | 5 +--
boards/sim/sim/sim/configs/vncserver/defconfig | 5 +--
net/tcp/Kconfig | 1 -
net/udp/Kconfig | 6 +---
net/usrsock/Kconfig | 22 ++++++-------
net/usrsock/usrsock_sockif.c | 37 ----------------------
10 files changed, 14 insertions(+), 79 deletions(-)
[incubator-nuttx] 01/06: net/usrsock: Remove NET_USRSOCK_NO_INET[6]
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c2f566afcb51b19184f967803ba64259f3c67aef
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 20 06:58:44 2022 +0800
net/usrsock: Remove NET_USRSOCK_NO_INET[6]
let the remote peer do all final decision
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/usrsock/Kconfig | 8 --------
net/usrsock/usrsock_sockif.c | 37 -------------------------------------
2 files changed, 45 deletions(-)
diff --git a/net/usrsock/Kconfig b/net/usrsock/Kconfig
index d5c2504c05..bfd3961e33 100644
--- a/net/usrsock/Kconfig
+++ b/net/usrsock/Kconfig
@@ -38,14 +38,6 @@ config NET_USRSOCK_NPOLLWAITERS
int "Number of usrsock poll waiters"
default 1
-config NET_USRSOCK_NO_INET
- bool "Disable PF_INET for usrsock"
- default n
-
-config NET_USRSOCK_NO_INET6
- bool "Disable PF_INET6 for usrsock"
- default n
-
config NET_USRSOCK_UDP
bool "User-space daemon provides UDP sockets"
default n
diff --git a/net/usrsock/usrsock_sockif.c b/net/usrsock/usrsock_sockif.c
index b809286bf6..5791ec6e68 100644
--- a/net/usrsock/usrsock_sockif.c
+++ b/net/usrsock/usrsock_sockif.c
@@ -98,43 +98,6 @@ static int usrsock_sockif_setup(FAR struct socket *psock, int protocol)
int type = psock->s_type;
int ret;
-#ifdef CONFIG_NET_USRSOCK_NO_INET
- if (domain == PF_INET)
- {
- return -ENETDOWN;
- }
-#endif
-
-#ifdef CONFIG_NET_USRSOCK_NO_INET6
- if (domain == PF_INET6)
- {
- return -ENETDOWN;
- }
-#endif
-
- if (domain == PF_INET || domain == PF_INET6)
- {
-#ifndef CONFIG_NET_USRSOCK_UDP
- if (type == SOCK_DGRAM)
- {
- return -ENETDOWN;
- }
-#endif
-
-#ifndef CONFIG_NET_USRSOCK_TCP
- if (type == SOCK_STREAM)
- {
- return -ENETDOWN;
- }
-#endif
- }
- else
- {
-#ifndef CONFIG_NET_USRSOCK_OTHER
- return -ENETDOWN;
-#endif
- }
-
psock->s_type = PF_UNSPEC;
psock->s_conn = NULL;
[incubator-nuttx] 02/06: net/udp: NET_BROADCAST shouldn't configurable if NET_UDP_NO_STACK enable
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7f380533a3af57dbbad30af25a918556fa115eaa
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 20 07:03:49 2022 +0800
net/udp: NET_BROADCAST shouldn't configurable if NET_UDP_NO_STACK enable
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/udp/Kconfig | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/net/udp/Kconfig b/net/udp/Kconfig
index 030a0e6cba..b2606e1fce 100644
--- a/net/udp/Kconfig
+++ b/net/udp/Kconfig
@@ -20,7 +20,7 @@ config NET_UDP_NO_STACK
---help---
Build without UDP/IP stack even if UDP networking support enabled.
-if NET_UDP
+if NET_UDP && !NET_UDP_NO_STACK
config NET_BROADCAST
bool "UDP broadcast Rx support"
@@ -28,10 +28,6 @@ config NET_BROADCAST
---help---
Incoming UDP broadcast support
-endif # NET_UDP
-
-if NET_UDP && !NET_UDP_NO_STACK
-
config NET_UDP_CHECKSUMS
bool "UDP checksums"
default y if NET_IPv6
[incubator-nuttx] 06/06: boards: Refresh ursock related config
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 39338ce96c92dbc3aa14acc5c1e2c802abcbf4aa
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 20 08:09:52 2022 +0800
boards: Refresh ursock related config
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/cxd56xx/spresense/configs/wifi/defconfig | 4 ----
boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig | 4 ----
boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig | 4 ----
boards/sim/sim/sim/configs/adb/defconfig | 5 +----
boards/sim/sim/sim/configs/rpproxy/defconfig | 5 +----
boards/sim/sim/sim/configs/vncserver/defconfig | 5 +----
6 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
index 35366f2267..db1329e16d 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@@ -102,10 +102,6 @@ CONFIG_NETUTILS_HTTPD_SENDFILE=y
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NETUTILS_WEBSERVER=y
-CONFIG_NET_BROADCAST=y
-CONFIG_NET_ICMP_NO_STACK=y
-CONFIG_NET_TCP_NO_STACK=y
-CONFIG_NET_UDP_NO_STACK=y
CONFIG_NET_USRSOCK=y
CONFIG_NET_USRSOCK_CONNS=16
CONFIG_NET_USRSOCK_UDP=y
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
index eb7f22bc03..90b098a44d 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
@@ -105,10 +105,6 @@ CONFIG_NETUTILS_HTTPD_SENDFILE=y
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NETUTILS_WEBSERVER=y
-CONFIG_NET_BROADCAST=y
-CONFIG_NET_ICMP_NO_STACK=y
-CONFIG_NET_TCP_NO_STACK=y
-CONFIG_NET_UDP_NO_STACK=y
CONFIG_NET_USRSOCK=y
CONFIG_NET_USRSOCK_CONNS=16
CONFIG_NET_USRSOCK_UDP=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
index 0fd6d69813..66c547f238 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
@@ -55,10 +55,6 @@ CONFIG_NETUTILS_HTTPD_SENDFILE=y
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NETUTILS_WEBSERVER=y
-CONFIG_NET_BROADCAST=y
-CONFIG_NET_ICMP_NO_STACK=y
-CONFIG_NET_TCP_NO_STACK=y
-CONFIG_NET_UDP_NO_STACK=y
CONFIG_NET_USRSOCK=y
CONFIG_NET_USRSOCK_CONNS=16
CONFIG_NET_USRSOCK_UDP=y
diff --git a/boards/sim/sim/sim/configs/adb/defconfig b/boards/sim/sim/sim/configs/adb/defconfig
index f1f9347c79..0edd5f5a5c 100644
--- a/boards/sim/sim/sim/configs/adb/defconfig
+++ b/boards/sim/sim/sim/configs/adb/defconfig
@@ -30,12 +30,9 @@ CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT=y
CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x08080808
CONFIG_NETUTILS_TELNETD=y
-CONFIG_NET_ICMP_NO_STACK=y
CONFIG_NET_LOCAL=y
-CONFIG_NET_TCP_NO_STACK=y
-CONFIG_NET_UDP_NO_STACK=y
CONFIG_NET_USRSOCK_CUSTOM=y
-CONFIG_NET_USRSOCK_OTHER=y
+CONFIG_NET_USRSOCK_ICMP=y
CONFIG_NET_USRSOCK_TCP=y
CONFIG_NET_USRSOCK_UDP=y
CONFIG_NSH_ARCHINIT=y
diff --git a/boards/sim/sim/sim/configs/rpproxy/defconfig b/boards/sim/sim/sim/configs/rpproxy/defconfig
index c28136a04b..385bcd36fb 100644
--- a/boards/sim/sim/sim/configs/rpproxy/defconfig
+++ b/boards/sim/sim/sim/configs/rpproxy/defconfig
@@ -38,12 +38,9 @@ CONFIG_NETDB_DNSCLIENT=y
CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=176
CONFIG_NETDB_DNSCLIENT_RECV_TIMEOUT=3
CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x771d1d1d
-CONFIG_NET_ICMP_NO_STACK=y
CONFIG_NET_RPMSG=y
-CONFIG_NET_TCP_NO_STACK=y
-CONFIG_NET_UDP_NO_STACK=y
CONFIG_NET_USRSOCK=y
-CONFIG_NET_USRSOCK_OTHER=y
+CONFIG_NET_USRSOCK_ICMP=y
CONFIG_NET_USRSOCK_RPMSG=y
CONFIG_NET_USRSOCK_RPMSG_CPUNAME="server"
CONFIG_NET_USRSOCK_TCP=y
diff --git a/boards/sim/sim/sim/configs/vncserver/defconfig b/boards/sim/sim/sim/configs/vncserver/defconfig
index 3f257c195d..a8de2d713e 100644
--- a/boards/sim/sim/sim/configs/vncserver/defconfig
+++ b/boards/sim/sim/sim/configs/vncserver/defconfig
@@ -17,11 +17,8 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
CONFIG_INIT_ENTRYPOINT="fb_main"
CONFIG_NET=y
-CONFIG_NET_ICMP_NO_STACK=y
-CONFIG_NET_TCP_NO_STACK=y
-CONFIG_NET_UDP_NO_STACK=y
CONFIG_NET_USRSOCK_CUSTOM=y
-CONFIG_NET_USRSOCK_OTHER=y
+CONFIG_NET_USRSOCK_ICMP=y
CONFIG_NET_USRSOCK_TCP=y
CONFIG_NET_USRSOCK_UDP=y
CONFIG_SCHED_LPWORK=y
[incubator-nuttx] 05/06: net/usrsock: Split NET_USRSOCK_OTHER to NET_USRSOCK_ICMP[v6]
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b170e4cc9f8693bc8c5ee28191001f6c13b70e32
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 20 07:50:51 2022 +0800
net/usrsock: Split NET_USRSOCK_OTHER to NET_USRSOCK_ICMP[v6]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/usrsock/Kconfig | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net/usrsock/Kconfig b/net/usrsock/Kconfig
index de963d271a..6d6745c403 100644
--- a/net/usrsock/Kconfig
+++ b/net/usrsock/Kconfig
@@ -49,8 +49,14 @@ config NET_USRSOCK_TCP
default n
select NET_TCP_NO_STACK
-config NET_USRSOCK_OTHER
- bool "Enable other protocol families in addition of INET & INET6"
+config NET_USRSOCK_ICMP
+ bool "User-space daemon provides ICMP sockets"
+ select NET_ICMP_NO_STACK
+ default n
+
+config NET_USRSOCK_ICMPv6
+ bool "User-space daemon provides ICMPv6 sockets"
+ select NET_ICMPv6_NO_STACK
default n
endif # NET_USRSOCK
[incubator-nuttx] 03/06: net/tcp: Remove the dependence on SCHED_WORKQUEUE
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0d516c7ff68e4f277ae458d375899e2f61290dc9
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 20 07:07:36 2022 +0800
net/tcp: Remove the dependence on SCHED_WORKQUEUE
since it isn't required in case of NET_TCP_NO_STACK
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/tcp/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/tcp/Kconfig b/net/tcp/Kconfig
index 6c0d6403ca..bea9f5159f 100644
--- a/net/tcp/Kconfig
+++ b/net/tcp/Kconfig
@@ -9,7 +9,6 @@ config NET_TCP
bool "TCP/IP Networking"
default n
select NET_READAHEAD if !NET_TCP_NO_STACK
- depends on SCHED_WORKQUEUE
---help---
Enable or disable TCP networking support.
[incubator-nuttx] 04/06: net/usrsock: Should select NET_[UDP|TCP]_NO_STACK instead NET_[UDP|TCP]
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8bbb477316fa033b07222c1874685e4cfa9af497
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 20 07:09:18 2022 +0800
net/usrsock: Should select NET_[UDP|TCP]_NO_STACK instead NET_[UDP|TCP]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/usrsock/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/usrsock/Kconfig b/net/usrsock/Kconfig
index bfd3961e33..de963d271a 100644
--- a/net/usrsock/Kconfig
+++ b/net/usrsock/Kconfig
@@ -41,13 +41,13 @@ config NET_USRSOCK_NPOLLWAITERS
config NET_USRSOCK_UDP
bool "User-space daemon provides UDP sockets"
default n
- select NET_UDP
+ select NET_UDP_NO_STACK
---help---
config NET_USRSOCK_TCP
bool "User-space daemon provides TCP sockets"
default n
- select NET_TCP
+ select NET_TCP_NO_STACK
config NET_USRSOCK_OTHER
bool "Enable other protocol families in addition of INET & INET6"