From 13d63ccc620150f11691378273277b3412137109 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 27 Jul 2013 19:01:01 +0800 Subject: [PATCH] Usermode/libpsocket - Fixed accept()'s prototype --- Usermode/Libraries/libpsocket.so_src/include_exp/netinet/in.h | 3 +++ Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h | 2 +- Usermode/Libraries/libpsocket.so_src/socket.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Usermode/Libraries/libpsocket.so_src/include_exp/netinet/in.h b/Usermode/Libraries/libpsocket.so_src/include_exp/netinet/in.h index 9323f246..94655e14 100644 --- a/Usermode/Libraries/libpsocket.so_src/include_exp/netinet/in.h +++ b/Usermode/Libraries/libpsocket.so_src/include_exp/netinet/in.h @@ -28,6 +28,9 @@ struct sockaddr_in #define INADDR_ANY 0x00000000 #define INADDR_BROADCAST 0xFFFFFFFF +#define IPPORT_RESERVED 1024 +#define IPPORT_UNRESERVED 0xC000 + // getsockopt/setsockopt(level) enum { IPPROTO_IP = 1, diff --git a/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h b/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h index 70eafd18..bba73978 100644 --- a/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h +++ b/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h @@ -136,7 +136,7 @@ extern int listen(int sockfd, int backlog); /** * \brief Accept an incoming connection */ -extern int accept(int sockfd, struct sockaddr *clientaddr, socklen_t addrlen); +extern int accept(int sockfd, struct sockaddr *clientaddr, socklen_t *addrlen); extern int recvfrom(int sockfd, void *buffer, size_t length, int flags, struct sockaddr *clientaddr, socklen_t *addrlen); extern int recv(int sockfd, void *buffer, size_t length, int flags); diff --git a/Usermode/Libraries/libpsocket.so_src/socket.c b/Usermode/Libraries/libpsocket.so_src/socket.c index 586176dc..747ebe45 100644 --- a/Usermode/Libraries/libpsocket.so_src/socket.c +++ b/Usermode/Libraries/libpsocket.so_src/socket.c @@ -268,7 +268,7 @@ void _CommitClient(int sockfd) _ClearInfo(si); } -int accept(int sockfd, struct sockaddr *clientaddr, socklen_t addrlen) +int accept(int sockfd, struct sockaddr *clientaddr, socklen_t *addrlen) { _CommitServer(sockfd); int child; -- 2.20.1