sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/tcp: set/get TCP_KEEPINTVL/IDLE value as BSD style

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2021-05-11 20:20:05 +08:00 committed by Xiang Xiao
parent 86523318fc
commit 48b0e48cd4
2 changed files with 83 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
net/tcp/tcp_getsockopt.c
View File

@ -144,65 +144,51 @@ int tcp_getsockopt(FAR struct socket *psock, int option,
break;
case TCP_KEEPIDLE: /* Start keepalives after this IDLE period */
if (*value_len < sizeof(struct timeval))
{
/* REVISIT: POSIX says that we should truncate the value if it
* is larger than value_len. That just doesn't make sense
* to me in this case.
*/
ret = -EINVAL;
}
else
{
FAR struct timeval *tv = (FAR struct timeval *)value;
if (tv == NULL)
{
ret = -EINVAL;
}
else
{
/* Convert the KeepIdle time from deciseconds to struct
* timeval.
*/
net_dsec2timeval(conn->keepidle, tv);
*value_len = sizeof(struct timeval);
ret = OK;
}
}
break;
case TCP_KEEPINTVL: /* Interval between keepalives */
if (*value_len < sizeof(struct timeval))
{
/* REVISIT: POSIX says that we should truncate the value if it
* is larger than value_len. That just doesn't make sense
* to me in this case.
*/
{
int dsecs;
ret = -EINVAL;
}
else
{
FAR struct timeval *tv = (FAR struct timeval *)value;
if (option == TCP_KEEPIDLE)
{
dsecs = conn->keepidle;
}
else
{
dsecs = conn->keepintvl;
}
if (tv == NULL)
{
ret = -EINVAL;
}
else
{
/* Convert the KeepIdle time from deciseconds to struct
* timeval.
*/
if (value == NULL)
{
ret = -EINVAL;
}
else if (*value_len == sizeof(struct timeval))
{
FAR struct timeval *tv = (FAR struct timeval *)value;
net_dsec2timeval(conn->keepintvl, tv);
*value_len = sizeof(struct timeval);
ret = OK;
}
}
/* Convert the KeepIdle time from deciseconds to struct
* timeval.
*/
net_dsec2timeval(dsecs, tv);
*value_len = sizeof(struct timeval);
ret = OK;
}
else if (*value_len == sizeof(int))
{
FAR int *pdsecs = (FAR int *)value;
*pdsecs = dsecs;
ret = OK;
}
else
{
/* REVISIT: POSIX says that we should truncate the value if it
* is larger than value_len. That just doesn't make sense
* to me in this case.
*/
ret = -EINVAL;
}
}
break;
case TCP_KEEPCNT: /* Number of keepalives before death */

111
net/tcp/tcp_setsockopt.c
View File

@ -138,79 +138,52 @@ int tcp_setsockopt(FAR struct socket *psock, int option,
break;
case TCP_KEEPIDLE: /* Start keepalives after this IDLE period */
if (value_len != sizeof(struct timeval))
{
ret = -EDOM;
}
else
{
FAR struct timeval *tv = (FAR struct timeval *)value;
if (tv == NULL)
{
ret = -EINVAL;
}
else
{
unsigned int dsecs;
/* Get the IDLE time value. Any microsecond remainder will
* be forced to the next larger, whole decisecond value.
*/
dsecs = (socktimeo_t)net_timeval2dsec(tv, TV2DS_CEIL);
if (dsecs > UINT16_MAX)
{
nwarn("WARNING: TCP_KEEPIDLE value out of range: %u\n",
dsecs);
ret = -EDOM;
}
else
{
conn->keepidle = (uint16_t)dsecs;
conn->keeptime = clock_systime_ticks(); /* Reset start time */
ret = OK;
}
}
}
break;
case TCP_KEEPINTVL: /* Interval between keepalives */
if (value_len != sizeof(struct timeval))
{
ret = -EDOM;
}
else
{
FAR struct timeval *tv = (FAR struct timeval *)value;
{
unsigned int dsecs;
if (tv == NULL)
{
ret = -EINVAL;
}
else
{
unsigned int dsecs;
if (value == NULL)
{
return -EINVAL;
}
else if (value_len == sizeof(struct timeval))
{
FAR struct timeval *tv = (FAR struct timeval *)value;
/* Get the IDLE time value. Any microsecond remainder will
* be forced to the next larger, whole decisecond value.
*/
/* Get the IDLE time value. Any microsecond remainder will
* be forced to the next larger, whole decisecond value.
*/
dsecs = (socktimeo_t)net_timeval2dsec(tv, TV2DS_CEIL);
if (dsecs > UINT16_MAX)
{
nwarn("WARNING: TCP_KEEPINTVL value out of range: %u\n",
dsecs);
ret = -EDOM;
}
else
{
conn->keepintvl = (uint16_t)dsecs;
conn->keeptime = clock_systime_ticks(); /* Reset start time */
ret = OK;
}
}
}
dsecs = (socktimeo_t)net_timeval2dsec(tv, TV2DS_CEIL);
}
else if (value_len == sizeof(int))
{
dsecs = *(FAR int *)value;
}
else
{
return -EDOM;
}
if (dsecs > UINT16_MAX)
{
nwarn("WARNING: value out of range: %u\n", dsecs);
return -EDOM;
}
if (option == TCP_KEEPIDLE)
{
conn->keepidle = (uint16_t)dsecs;
}
else
{
conn->keepintvl = (uint16_t)dsecs;
}
conn->keeptime = clock_systime_ticks(); /* Reset start time */
ret = OK;
}
break;
case TCP_KEEPCNT: /* Number of keepalives before death */