You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/04/14 09:22:16 UTC
[incubator-nuttx-apps] branch master updated (f58d607 -> efcbd2d)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from f58d607 Merge pull request #173 from xiaoxiang781216/ci-macos
new c126732 wireless: gs2200m: Add support for UDP connect in gs2200m_main.c
new efcbd2d wireless: gs2200m: Fix nxstyle warnings in gs2200m_main.c
The 2 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:
wireless/gs2200m/gs2200m_main.c | 123 ++++++++++++++++++----------------------
1 file changed, 56 insertions(+), 67 deletions(-)
[incubator-nuttx-apps] 02/02: wireless: gs2200m: Fix nxstyle
warnings in gs2200m_main.c
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit efcbd2d842f69cc21998ce2735c943eb0f65c9c7
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Tue Apr 14 17:24:19 2020 +0900
wireless: gs2200m: Fix nxstyle warnings in gs2200m_main.c
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
wireless/gs2200m/gs2200m_main.c | 120 ++++++++++++++++++----------------------
1 file changed, 54 insertions(+), 66 deletions(-)
diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c
index 1b7f29f..851231c 100644
--- a/wireless/gs2200m/gs2200m_main.c
+++ b/wireless/gs2200m/gs2200m_main.c
@@ -149,73 +149,61 @@ static const struct usrsock_req_handler_s
{
uint32_t hdrlen;
int (CODE *fn)(int fd, FAR struct gs2200m_s *priv, FAR void *req);
-} handlers[USRSOCK_REQUEST__MAX] =
+}
+handlers[USRSOCK_REQUEST__MAX] =
+{
+{
+ sizeof(struct usrsock_request_socket_s),
+ socket_request,
+},
+{
+ sizeof(struct usrsock_request_close_s),
+ close_request,
+},
+{
+ sizeof(struct usrsock_request_connect_s),
+ connect_request,
+},
+{
+ sizeof(struct usrsock_request_sendto_s),
+ sendto_request,
+},
+{
+ sizeof(struct usrsock_request_recvfrom_s),
+ recvfrom_request,
+},
+{
+ sizeof(struct usrsock_request_setsockopt_s),
+ setsockopt_request,
+},
+{
+ sizeof(struct usrsock_request_getsockopt_s),
+ getsockopt_request,
+},
+{
+ sizeof(struct usrsock_request_getsockname_s),
+ getsockname_request,
+},
+{
+ sizeof(struct usrsock_request_getpeername_s),
+ getpeername_request,
+},
+{
+ sizeof(struct usrsock_request_bind_s),
+ bind_request,
+},
+{
+ sizeof(struct usrsock_request_listen_s),
+ listen_request,
+},
+{
+ sizeof(struct usrsock_request_accept_s),
+ accept_request,
+},
{
- [USRSOCK_REQUEST_SOCKET] =
- {
- sizeof(struct usrsock_request_socket_s),
- socket_request,
- },
- [USRSOCK_REQUEST_CLOSE] =
- {
- sizeof(struct usrsock_request_close_s),
- close_request,
- },
- [USRSOCK_REQUEST_CONNECT] =
- {
- sizeof(struct usrsock_request_connect_s),
- connect_request,
- },
- [USRSOCK_REQUEST_SENDTO] =
- {
- sizeof(struct usrsock_request_sendto_s),
- sendto_request,
- },
- [USRSOCK_REQUEST_RECVFROM] =
- {
- sizeof(struct usrsock_request_recvfrom_s),
- recvfrom_request,
- },
- [USRSOCK_REQUEST_SETSOCKOPT] =
- {
- sizeof(struct usrsock_request_setsockopt_s),
- setsockopt_request,
- },
- [USRSOCK_REQUEST_GETSOCKOPT] =
- {
- sizeof(struct usrsock_request_getsockopt_s),
- getsockopt_request,
- },
- [USRSOCK_REQUEST_GETSOCKNAME] =
- {
- sizeof(struct usrsock_request_getsockname_s),
- getsockname_request,
- },
- [USRSOCK_REQUEST_GETPEERNAME] =
- {
- sizeof(struct usrsock_request_getpeername_s),
- getpeername_request,
- },
- [USRSOCK_REQUEST_BIND] =
- {
- sizeof(struct usrsock_request_bind_s),
- bind_request,
- },
- [USRSOCK_REQUEST_LISTEN] =
- {
- sizeof(struct usrsock_request_listen_s),
- listen_request,
- },
- [USRSOCK_REQUEST_ACCEPT] =
- {
- sizeof(struct usrsock_request_accept_s),
- accept_request,
- },
- [USRSOCK_REQUEST_IOCTL] =
- {
- sizeof(struct usrsock_request_ioctl_s),
- ioctl_request,
- },
+ sizeof(struct usrsock_request_ioctl_s),
+ ioctl_request,
+},
};
static struct gs2200m_s *_daemon;
[incubator-nuttx-apps] 01/02: wireless: gs2200m: Add support for
UDP connect in gs2200m_main.c
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit c1267327993ee9e6716cd2c9b57e8c4e91bd2c68
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Tue Apr 14 17:02:49 2020 +0900
wireless: gs2200m: Add support for UDP connect in gs2200m_main.c
NOTE: gs2200m driver needs to be updated as well
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
wireless/gs2200m/gs2200m_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c
index a2f05e1..1b7f29f 100644
--- a/wireless/gs2200m/gs2200m_main.c
+++ b/wireless/gs2200m/gs2200m_main.c
@@ -650,6 +650,7 @@ static int connect_request(int fd, FAR struct gs2200m_s *priv,
ntohs(addr.sin_port));
cmsg.cid = 'z'; /* set to invalid */
+ cmsg.type = usock->type;
ret = ioctl(priv->gsfd, GS2200M_IOC_CONNECT,
(unsigned long)&cmsg);
@@ -744,7 +745,7 @@ static int sendto_request(int fd, FAR struct gs2200m_s *priv,
/* For UDP, addlen must be provided */
- if (usock->type == SOCK_DGRAM)
+ if (usock->type == SOCK_DGRAM && CONNECTED != usock->state)
{
if (req->addrlen == 0)
{