oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup getsockopt and add SO_TYPE

Browse Source
This commit is contained in:
Erik van der Kouwe 2009-12-04 07:26:56 +00:00
parent ec1fec6c3f
commit 150dfbe96d
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/socket.h
View File

@ -24,6 +24,7 @@ sys/socket.h
#define SO_DEBUG 0x0001 #define SO_DEBUG 0x0001
#define SO_REUSEADDR 0x0004 #define SO_REUSEADDR 0x0004
#define SO_KEEPALIVE 0x0008 #define SO_KEEPALIVE 0x0008
#define SO_TYPE 0x0010 /* get socket type, SOCK_STREAM or SOCK_DGRAM */
#define SO_SNDBUF 0x1001 /* send buffer size */ #define SO_SNDBUF 0x1001 /* send buffer size */
#define SO_RCVBUF 0x1002 /* receive buffer size */ #define SO_RCVBUF 0x1002 /* receive buffer size */

70
lib/ip/getsockopt.c
View File

@ -19,6 +19,8 @@ static int _tcp_getsockopt(int socket, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len); void *_RESTRICT option_value, socklen_t *_RESTRICT option_len);
static int _udp_getsockopt(int socket, int level, int option_name, static int _udp_getsockopt(int socket, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len); void *_RESTRICT option_value, socklen_t *_RESTRICT option_len);
static void getsockopt_copy(void *return_value, size_t return_len,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len);
int getsockopt(int socket, int level, int option_name, int getsockopt(int socket, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len) void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
@ -58,6 +60,19 @@ int getsockopt(int socket, int level, int option_name,
return -1; return -1;
} }
static void getsockopt_copy(void *return_value, size_t return_len,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
{
/* copy as much data as possible */
if (*option_len < return_len)
memcpy(option_value, return_value, *option_len);
else
memcpy(option_value, return_value, return_len);
/* return length */
*option_len = return_len;
}
static int _tcp_getsockopt(int socket, int level, int option_name, static int _tcp_getsockopt(int socket, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len) void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
{ {
@ -65,56 +80,41 @@ static int _tcp_getsockopt(int socket, int level, int option_name,
if (level == SOL_SOCKET && option_name == SO_KEEPALIVE) if (level == SOL_SOCKET && option_name == SO_KEEPALIVE)
{ {
i= 1; /* Keepalive is always on */ i = 1; /* Keepalive is always on */
if (*option_len < sizeof(i)) getsockopt_copy(&i, sizeof(i), option_value, option_len);
memcpy(option_value, &i, *option_len);
else
memcpy(option_value, &i, sizeof(i));
*option_len= sizeof(i);
return 0; return 0;
} }
if (level == SOL_SOCKET && option_name == SO_ERROR) if (level == SOL_SOCKET && option_name == SO_ERROR)
{ {
r= ioctl(socket, NWIOTCPGERROR, &err); r = ioctl(socket, NWIOTCPGERROR, &err);
if (r != 0) if (r != 0)
return r; return r;
if (*option_len < sizeof(err))
memcpy(option_value, &err, *option_len); getsockopt_copy(&err, sizeof(err), option_value, option_len);
else
memcpy(option_value, &err, sizeof(err));
*option_len= sizeof(err);
return 0; return 0;
} }
if (level == SOL_SOCKET && option_name == SO_RCVBUF) if (level == SOL_SOCKET && option_name == SO_RCVBUF)
{ {
i= 32*1024; /* Receive buffer in the current i = 32 * 1024; /* Receive buffer in the current implementation */
* implementation getsockopt_copy(&i, sizeof(i), option_value, option_len);
*/
if (*option_len < sizeof(i))
memcpy(option_value, &i, *option_len);
else
memcpy(option_value, &i, sizeof(i));
*option_len= sizeof(i);
return 0; return 0;
} }
if (level == SOL_SOCKET && option_name == SO_SNDBUF) if (level == SOL_SOCKET && option_name == SO_SNDBUF)
{ {
i= 32*1024; /* Send buffer in the current implementation */ i = 32 * 1024; /* Send buffer in the current implementation */
if (*option_len < sizeof(i)) getsockopt_copy(&i, sizeof(i), option_value, option_len);
memcpy(option_value, &i, *option_len); return 0;
else }
memcpy(option_value, &i, sizeof(i)); if (level == SOL_SOCKET && option_name == SO_TYPE)
*option_len= sizeof(i); {
i = SOCK_STREAM; /* this is a TCP socket */
getsockopt_copy(&i, sizeof(i), option_value, option_len);
return 0; return 0;
} }
if (level == IPPROTO_TCP && option_name == TCP_NODELAY) if (level == IPPROTO_TCP && option_name == TCP_NODELAY)
{ {
i= 0; /* nodelay is always off */ i = 0; /* nodelay is always off */
if (*option_len < sizeof(i)) getsockopt_copy(&i, sizeof(i), option_value, option_len);
memcpy(option_value, &i, *option_len);
else
memcpy(option_value, &i, sizeof(i));
*option_len= sizeof(i);
return 0; return 0;
} }
#if DEBUG #if DEBUG
@ -131,6 +131,12 @@ static int _udp_getsockopt(int socket, int level, int option_name,
{ {
int i; int i;
if (level == SOL_SOCKET && option_name == SO_TYPE)
{
i = SOCK_DGRAM; /* this is a TCP socket */
getsockopt_copy(&i, sizeof(i), option_value, option_len);
return 0;
}
#if DEBUG #if DEBUG
fprintf(stderr, "_udp_getsocketopt: level %d, name %d\n", fprintf(stderr, "_udp_getsocketopt: level %d, name %d\n",
level, option_name); level, option_name);