You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2022/03/17 10:32:37 UTC
[GitHub] [incubator-nuttx] anchao opened a new pull request #5770: net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
anchao opened a new pull request #5770:
URL: https://github.com/apache/incubator-nuttx/pull/5770
## Summary
net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
SO_RCVBUF/SO_SNDBUF tightly coupled with stack
Signed-off-by: chao.an <an...@xiaomi.com>
## Impact
N/A
## Testing
call setsockopt SO_SNDBUF from usrsock client to server
setsockopt(socketfd, SOL_SOCKET, SO_SNDBUF, (char*)&buflen,len);
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] anchao commented on a change in pull request #5770: net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
Posted by GitBox <gi...@apache.org>.
anchao commented on a change in pull request #5770:
URL: https://github.com/apache/incubator-nuttx/pull/5770#discussion_r829016774
##########
File path: net/socket/setsockopt.c
##########
@@ -398,6 +274,130 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
}
break;
#endif
+
+#if CONFIG_NET_RECV_BUFSIZE > 0
+ case SO_RCVBUF: /* Sets receive buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
Review comment:
Done
##########
File path: net/socket/setsockopt.c
##########
@@ -398,6 +274,130 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
}
break;
#endif
+
+#if CONFIG_NET_RECV_BUFSIZE > 0
+ case SO_RCVBUF: /* Sets receive buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
+ {
+ return -EINVAL;
+ }
+
+ net_lock();
+
+#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK)
+ if (psock->s_type == SOCK_STREAM)
+ {
+ FAR struct tcp_conn_s *tcp;
+
+ tcp = (FAR struct tcp_conn_s *)conn;
+
+ /* Save the receive buffer size */
+
+ tcp->rcv_bufs = buffersize;
+ }
+ else
+#endif
+#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK)
+ if (psock->s_type == SOCK_DGRAM)
+ {
+ FAR struct udp_conn_s *udp;
+
+ udp = (FAR struct udp_conn_s *)conn;
+
+ /* Save the receive buffer size */
+
+ udp->rcvbufs = buffersize;
+ }
+ else
+#endif
+ {
+ net_unlock();
+ return -ENOPROTOOPT;
+ }
+
+ net_unlock();
+
+ break;
+ }
+#endif
+
+#if CONFIG_NET_SEND_BUFSIZE > 0
+ case SO_SNDBUF: /* Sets send buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] anchao commented on a change in pull request #5770: net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
Posted by GitBox <gi...@apache.org>.
anchao commented on a change in pull request #5770:
URL: https://github.com/apache/incubator-nuttx/pull/5770#discussion_r829016774
##########
File path: net/socket/setsockopt.c
##########
@@ -398,6 +274,130 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
}
break;
#endif
+
+#if CONFIG_NET_RECV_BUFSIZE > 0
+ case SO_RCVBUF: /* Sets receive buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #5770: net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #5770:
URL: https://github.com/apache/incubator-nuttx/pull/5770
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] anchao commented on a change in pull request #5770: net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
Posted by GitBox <gi...@apache.org>.
anchao commented on a change in pull request #5770:
URL: https://github.com/apache/incubator-nuttx/pull/5770#discussion_r829016867
##########
File path: net/socket/setsockopt.c
##########
@@ -398,6 +274,130 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
}
break;
#endif
+
+#if CONFIG_NET_RECV_BUFSIZE > 0
+ case SO_RCVBUF: /* Sets receive buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
+ {
+ return -EINVAL;
+ }
+
+ net_lock();
+
+#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK)
+ if (psock->s_type == SOCK_STREAM)
+ {
+ FAR struct tcp_conn_s *tcp;
+
+ tcp = (FAR struct tcp_conn_s *)conn;
+
+ /* Save the receive buffer size */
+
+ tcp->rcv_bufs = buffersize;
+ }
+ else
+#endif
+#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK)
+ if (psock->s_type == SOCK_DGRAM)
+ {
+ FAR struct udp_conn_s *udp;
+
+ udp = (FAR struct udp_conn_s *)conn;
+
+ /* Save the receive buffer size */
+
+ udp->rcvbufs = buffersize;
+ }
+ else
+#endif
+ {
+ net_unlock();
+ return -ENOPROTOOPT;
+ }
+
+ net_unlock();
+
+ break;
+ }
+#endif
+
+#if CONFIG_NET_SEND_BUFSIZE > 0
+ case SO_SNDBUF: /* Sets send buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #5770: net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #5770:
URL: https://github.com/apache/incubator-nuttx/pull/5770
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] pkarashchenko commented on a change in pull request #5770: net/sockopt: bypass the SO_RCVBUF/SO_SNDBUF to usrsock
Posted by GitBox <gi...@apache.org>.
pkarashchenko commented on a change in pull request #5770:
URL: https://github.com/apache/incubator-nuttx/pull/5770#discussion_r828983064
##########
File path: net/socket/setsockopt.c
##########
@@ -398,6 +274,130 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
}
break;
#endif
+
+#if CONFIG_NET_RECV_BUFSIZE > 0
+ case SO_RCVBUF: /* Sets receive buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
Review comment:
how `buffersize > INT_MAX` can be satisfied if `buffersize` is `int`?
##########
File path: net/socket/setsockopt.c
##########
@@ -398,6 +274,130 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option,
}
break;
#endif
+
+#if CONFIG_NET_RECV_BUFSIZE > 0
+ case SO_RCVBUF: /* Sets receive buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
+ {
+ return -EINVAL;
+ }
+
+ net_lock();
+
+#if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK)
+ if (psock->s_type == SOCK_STREAM)
+ {
+ FAR struct tcp_conn_s *tcp;
+
+ tcp = (FAR struct tcp_conn_s *)conn;
+
+ /* Save the receive buffer size */
+
+ tcp->rcv_bufs = buffersize;
+ }
+ else
+#endif
+#if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK)
+ if (psock->s_type == SOCK_DGRAM)
+ {
+ FAR struct udp_conn_s *udp;
+
+ udp = (FAR struct udp_conn_s *)conn;
+
+ /* Save the receive buffer size */
+
+ udp->rcvbufs = buffersize;
+ }
+ else
+#endif
+ {
+ net_unlock();
+ return -ENOPROTOOPT;
+ }
+
+ net_unlock();
+
+ break;
+ }
+#endif
+
+#if CONFIG_NET_SEND_BUFSIZE > 0
+ case SO_SNDBUF: /* Sets send buffer size */
+ {
+ int buffersize;
+
+ /* Verify that option is the size of an 'int'. Should also check
+ * that 'value' is properly aligned for an 'int'
+ */
+
+ if (value_len != sizeof(int))
+ {
+ return -EINVAL;
+ }
+
+ /* Get the value. Is the option being set or cleared? */
+
+ buffersize = *(FAR int *)value;
+
+ if (buffersize < 0 || buffersize > INT_MAX)
Review comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org