mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-04-24 06:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

socket functions use socklen_t, patch from floriZ.Also set/getsockopt use void * instead of char * as fourth arg

Browse Source
This commit is contained in:
jani 2003-03-03 10:29:21 +00:00
parent ee2c049518
commit eb1a41f3c9
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/sockets.c
View File

@ -152,7 +152,7 @@ alloc_socket(struct netconn *newconn)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
int int
lwip_accept(int s, struct sockaddr *addr, int *addrlen) lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
{ {
struct lwip_socket *sock; struct lwip_socket *sock;
struct netconn *newconn; struct netconn *newconn;
@ -208,7 +208,7 @@ lwip_accept(int s, struct sockaddr *addr, int *addrlen)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
int int
lwip_bind(int s, struct sockaddr *name, int namelen) lwip_bind(int s, struct sockaddr *name, socklen_t namelen)
{ {
struct lwip_socket *sock; struct lwip_socket *sock;
struct ip_addr local_addr; struct ip_addr local_addr;
@ -273,7 +273,7 @@ lwip_close(int s)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
int int
lwip_connect(int s, struct sockaddr *name, int namelen) lwip_connect(int s, struct sockaddr *name, socklen_t namelen)
{ {
struct lwip_socket *sock; struct lwip_socket *sock;
err_t err; err_t err;
@ -339,7 +339,7 @@ lwip_listen(int s, int backlog)
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
int int
lwip_recvfrom(int s, void *mem, int len, unsigned int flags, lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
struct sockaddr *from, int *fromlen) struct sockaddr *from, socklen_t *fromlen)
{ {
struct lwip_socket *sock; struct lwip_socket *sock;
struct netbuf *buf; struct netbuf *buf;
@ -512,7 +512,7 @@ lwip_send(int s, void *data, int size, unsigned int flags)
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
int int
lwip_sendto(int s, void *data, int size, unsigned int flags, lwip_sendto(int s, void *data, int size, unsigned int flags,
struct sockaddr *to, int tolen) struct sockaddr *to, socklen_t tolen)
{ {
struct lwip_socket *sock; struct lwip_socket *sock;
struct ip_addr remote_addr, addr; struct ip_addr remote_addr, addr;
@ -881,7 +881,7 @@ int lwip_shutdown(int s, int how)
return lwip_close(s); /* XXX temporary hack until proper implementation */ return lwip_close(s); /* XXX temporary hack until proper implementation */
} }
int lwip_getpeername (int s, struct sockaddr *name, int *namelen) int lwip_getpeername (int s, struct sockaddr *name, socklen_t *namelen)
{ {
struct lwip_socket *sock; struct lwip_socket *sock;
struct sockaddr_in sin; struct sockaddr_in sin;
@ -916,7 +916,7 @@ int lwip_getpeername (int s, struct sockaddr *name, int *namelen)
return 0; return 0;
} }
int lwip_getsockname (int s, struct sockaddr *name, int *namelen) int lwip_getsockname (int s, struct sockaddr *name, socklen_t *namelen)
{ {
struct lwip_socket *sock; struct lwip_socket *sock;
struct sockaddr_in sin; struct sockaddr_in sin;
@ -951,7 +951,7 @@ int lwip_getsockname (int s, struct sockaddr *name, int *namelen)
return 0; return 0;
} }
int lwip_getsockopt (int s, int level, int optname, char *optval, int *optlen) int lwip_getsockopt (int s, int level, int optname, void *optval, socklen_t *optlen)
{ {
int err = ENOSYS; int err = ENOSYS;
struct lwip_socket *sock = get_socket(s); struct lwip_socket *sock = get_socket(s);
@ -983,7 +983,7 @@ int lwip_getsockopt (int s, int level, int optname, char *optval, int *optlen)
return err ? -1 : 0; return err ? -1 : 0;
} }
int lwip_setsockopt (int s, int level, int optname, const char *optval, int optlen) int lwip_setsockopt (int s, int level, int optname, const void *optval, socklen_t optlen)
{ {
struct lwip_socket *sock = get_socket(s); struct lwip_socket *sock = get_socket(s);
int err = ENOSYS; int err = ENOSYS;

18
src/include/lwip/sockets.h
View File

@ -183,23 +183,23 @@ struct linger {
#endif #endif
int lwip_accept(int s, struct sockaddr *addr, int *addrlen); int lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
int lwip_bind(int s, struct sockaddr *name, int namelen); int lwip_bind(int s, struct sockaddr *name, socklen_t namelen);
int lwip_shutdown(int s, int how); int lwip_shutdown(int s, int how);
int lwip_getpeername (int s, struct sockaddr *name, int *namelen); int lwip_getpeername (int s, struct sockaddr *name, socklen_t *namelen);
int lwip_getsockname (int s, struct sockaddr *name, int *namelen); int lwip_getsockname (int s, struct sockaddr *name, socklen_t *namelen);
int lwip_getsockopt (int s, int level, int optname, char *optval, int *optlen); int lwip_getsockopt (int s, int level, int optname, void *optval, socklen_t *optlen);
int lwip_setsockopt (int s, int level, int optname, const char *optval, int optlen); int lwip_setsockopt (int s, int level, int optname, const void *optval, socklen_t optlen);
int lwip_close(int s); int lwip_close(int s);
int lwip_connect(int s, struct sockaddr *name, int namelen); int lwip_connect(int s, struct sockaddr *name, socklen_t namelen);
int lwip_listen(int s, int backlog); int lwip_listen(int s, int backlog);
int lwip_recv(int s, void *mem, int len, unsigned int flags); int lwip_recv(int s, void *mem, int len, unsigned int flags);
int lwip_read(int s, void *mem, int len); int lwip_read(int s, void *mem, int len);
int lwip_recvfrom(int s, void *mem, int len, unsigned int flags, int lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
struct sockaddr *from, int *fromlen); struct sockaddr *from, socklen_t *fromlen);
int lwip_send(int s, void *dataptr, int size, unsigned int flags); int lwip_send(int s, void *dataptr, int size, unsigned int flags);
int lwip_sendto(int s, void *dataptr, int size, unsigned int flags, int lwip_sendto(int s, void *dataptr, int size, unsigned int flags,
struct sockaddr *to, int tolen); struct sockaddr *to, socklen_t tolen);
int lwip_socket(int domain, int type, int protocol); int lwip_socket(int domain, int type, int protocol);
int lwip_write(int s, void *dataptr, int size); int lwip_write(int s, void *dataptr, int size);
int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset, int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,