Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-26 02:36:11 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix condition logic: The setup seems to support a network without sockets. That is not the case.

Browse Source 
Squashed commit of the following:

    sched/sched/sched_getsockets.c:  Fix an error in conditional compilation.
    fs/:  Remove all conditional logic based on CONFIG_NSOCKET_DESCRIPTORS == 0
    Documentation/:  Remove all references to CONFIG_NSOCKET_DESCRIPTORS == 0
    include/:  Remove all conditional logic based on CONFIG_NSOCKET_DESCRIPTORS == 0
    libs/:  Remove all conditional logic based on CONFIG_NSOCKET_DESCRIPTORS == 0
    net/:  Remove all conditional logic based on CONFIG_NSOCKET_DESCRIPTORS == 0
    sched/:  Remove all conditional logic based on CONFIG_NSOCKET_DESCRIPTORS == 0
    syscall/:  Remove all conditional logic based on CONFIG_NSOCKET_DESCRIPTORS == 0
    tools/:  Fixups for CONFIG_NSOCKET_DESCRIPTORS no longer used to disable sockets.
This commit is contained in:
Gregory Nutt
2019-02-11 15:47:25 -06:00
parent 0cb1c2c0b6
commit efe65749ce
50 changed files with 58 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/socket/Kconfig
+2 -1
View File
@@ -6,8 +6,9 @@
menu "Socket Support"
config NSOCKET_DESCRIPTORS
int "Number of socket descriptor"
int "Number of socket descriptors"
default 8
range 1 99999
---help---
Maximum number of socket descriptors per task/thread.
net/socket/accept.c
-3
View File
@@ -51,8 +51,6 @@
#include "socket/socket.h"
#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -308,4 +306,3 @@ errout:
return ERROR;
}
#endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS */
net/socket/listen.c
-3
View File
@@ -46,8 +46,6 @@
#include "socket/socket.h"
#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -184,4 +182,3 @@ int listen(int sockfd, int backlog)
return OK;
}
#endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS */
net/socket/net_dupsd.c
-3
View File
@@ -46,8 +46,6 @@
#include "socket/socket.h"
#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -156,4 +154,3 @@ int net_dupsd(int sockfd, int minsd)
return psock_dupsd(sockfd_socket(sockfd), minsd);
}
#endif /* defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 */
net/socket/net_dupsd2.c
-4
View File
@@ -48,8 +48,6 @@
#include "socket/socket.h"
#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -112,5 +110,3 @@ errout:
return ret;
}
#endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS > 0 */
net/socket/net_sockets.c
-3
View File
@@ -51,8 +51,6 @@
#include "socket/socket.h"
#if CONFIG_NSOCKET_DESCRIPTORS > 0
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -295,4 +293,3 @@ FAR struct socket *sockfd_socket(int sockfd)
return NULL;
}
#endif /* CONFIG_NSOCKET_DESCRIPTORS > 0 */
net/socket/net_vfcntl.c
-3
View File
@@ -52,8 +52,6 @@
#include "socket/socket.h"
#include "usrsock/usrsock.h"
#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -318,4 +316,3 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
return psock_vfcntl(sockfd_socket(sockfd), cmd, ap);
}
#endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS > 0 */