diff options
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/net.h | 17 | ||||
| -rw-r--r-- | nuttx/include/sys/socket.h | 42 |
2 files changed, 37 insertions, 22 deletions
diff --git a/nuttx/include/nuttx/net.h b/nuttx/include/nuttx/net.h index ab6b4b93a..ce21f4984 100644 --- a/nuttx/include/nuttx/net.h +++ b/nuttx/include/nuttx/net.h @@ -67,15 +67,22 @@ * Public Types ****************************************************************************/ +/* This defines a bitmap big enough for one bit for each socket option */ + +typedef uint16 sockopt_t; + /* This is the internal representation of a socket reference by a file * descriptor. */ struct socket { - int s_crefs; /* Reference count on the socket */ - uint8 s_type; /* Protocol type: Only SOCK_STREAM or SOCK_DGRAM */ - void *s_conn; /* Connection: struct uip_conn * or uip_udp_conn * */ + int s_crefs; /* Reference count on the socket */ + uint8 s_type; /* Protocol type: Only SOCK_STREAM or SOCK_DGRAM */ +#ifdef CONFIG_NET_SOCKOPTS + sockopt_t s_options; /* Selected socket options */ +#endif + void *s_conn; /* Connection: struct uip_conn * or uip_udp_conn * */ }; /* This defines a list of sockets indexed by the socket descriptor */ @@ -89,6 +96,10 @@ struct socketlist }; #endif +/* This defines a bitmap big enough for one bit for each socket option */ + +typedef uint16 sockopt_t; + /**************************************************************************** * Public Function Prototypes ****************************************************************************/ diff --git a/nuttx/include/sys/socket.h b/nuttx/include/sys/socket.h index 776c0f403..1de251129 100644 --- a/nuttx/include/sys/socket.h +++ b/nuttx/include/sys/socket.h @@ -1,5 +1,5 @@ /**************************************************************************** - * socket.h + * sys/socket.h * * Copyright (C) 2007 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -117,38 +117,42 @@ /* Socket options */ -#define SO_DEBUG 1 /* Enables recording of debugging information (get/set). +#define SO_DEBUG 0 /* Enables recording of debugging information (get/set). * arg: integer contain boolean value */ -#define SO_ACCEPTCONN 2 /* Reports whether socket listening is enabled (get only). +#define SO_ACCEPTCONN 1 /* Reports whether socket listening is enabled (get only). * arg: returns integer contain boolean value */ -#define SO_BROADCAST 3 /* Permits sending of broadcast messages (get/set). +#define SO_BROADCAST 2 /* Permits sending of broadcast messages (get/set). * arg: integer contain boolean value */ -#define SO_REUSEADDR 4 /* Allow reuse of local addresses (get/set) +#define SO_REUSEADDR 3 /* Allow reuse of local addresses (get/set) * arg: integer contain boolean value */ -#define SO_KEEPALIVE 5 /* Keeps connections active by enabling the periodic transmission +#define SO_KEEPALIVE 4 /* Keeps connections active by enabling the periodic transmission * of messages (get/set). arg: int */ -#define SO_LINGER 6 /* Lingers on a close() if data is present (get/set) +#define SO_LINGER 5 /* Lingers on a close() if data is present (get/set) * arg: struct linger */ -#define SO_OOBINLINE 7 /* Leaves received out-of-band data (data marked urgent) inline +#define SO_OOBINLINE 6 /* Leaves received out-of-band data (data marked urgent) inline * (get/set) arg: integer contain boolean value */ -#define SO_SNDBUF 8 /* Sets send buffer size. arg: integer value (get/set). */ -#define SO_RCVBUF 9 /* Sets receive buffer size. arg: integer value (get/set). */ -#define SO_ERROR 10 /* Reports and clears error statust (get only). arg: returns +#define SO_SNDBUF 7 /* Sets send buffer size. arg: integer value (get/set). */ +#define SO_RCVBUF 8 /* Sets receive buffer size. arg: integer value (get/set). */ +#define SO_ERROR 9 /* Reports and clears error statust (get only). arg: returns * an integer value -#define SO_TYPE 11 /* Reports the socket type (get only). return: int */ -#define SO_DONTROUTE 12 /* equests that outgoing messages bypass standard routing +#define SO_TYPE 10 /* Reports the socket type (get only). return: int */ +#define SO_DONTROUTE 11 /* equests that outgoing messages bypass standard routing (get/set) * arg: integer contain boolean value */ -#define SO_RCVLOWAT 13 /* Sets the minimum number of bytes to process for socket input +#define SO_RCVLOWAT 12 /* Sets the minimum number of bytes to process for socket input * (get/set). arg: integer value */ -#define SO_RCVTIMEO 14 /* Sets the timeout value that specifies the maximum amount of time +#define SO_RCVTIMEO 13 /* Sets the timeout value that specifies the maximum amount of time * an input function waits until it completes (get/set). * arg: struct timeval */ -#define SO_SNDLOWAT 15 /* Sets the minimum number of bytes to process for socket output +#define SO_SNDLOWAT 14 /* Sets the minimum number of bytes to process for socket output * (get/set). arg: integer value */ -#define SO_SNDTIMEO 16 /* Sets the timeout value specifying the amount of time that an +#define SO_SNDTIMEO 15 /* Sets the timeout value specifying the amount of time that an * output function blocks because flow control prevents data from * being sent(get/set). arg: struct timeval */ +/* Protocol levels supported by get/setsockopt(): */ + +#define SOL_SOCKET 0 /* Only socket-level options supported */ + /**************************************************************************** * Type Definitions ****************************************************************************/ @@ -185,8 +189,8 @@ EXTERN ssize_t recvfrom(int sockfd, void *buf, size_t len, int flags, EXTERN int setsockopt(int sockfd, int level, int option, const void *value, socklen_t value_len); -EXTERN int setsockopt(int sockfd, int level, int option, - const void *value, socklen_t value_len); +EXTERN int getsockopt(int sockfd, int level, int option, + void *value, socklen_t *value_len); #undef EXTERN #if defined(__cplusplus) |