patch from Olivier Coursiere for better error output in ping

change the size parameter type of several functions in sys/socket.h to match POSIX
compat libs and legacy headers keep the original R5 type (though I make a change for this)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17911 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/posix/sys/socket.h

@@ -265,22 +265,22 @@ struct cmsghdr {
 /* Function declarations */
 int     socket (int, int, int);
 int	socketpair(int domain, int type, int protocol, int socket_vector[2]);
-int     bind(int, const struct sockaddr *, int);
-int     connect(int, const struct sockaddr *, int);
+int     bind(int, const struct sockaddr *, socklen_t);
+int     connect(int, const struct sockaddr *, socklen_t);
 int 	listen(int, int);
-int 	accept(int, struct sockaddr *, int *);
+int 	accept(int, struct sockaddr *, socklen_t *);
 int     closesocket(int);
 int     shutdown(int sock, int how);
 
 ssize_t send(int, const void *, size_t, int);
 ssize_t recv(int, void *, size_t, int);
-ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *, int);
-ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, int *);
+ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t);
+ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
 
-int     setsockopt(int, int, int, const void *, size_t);
-int     getsockopt(int, int, int, void *, size_t *);
-int     getpeername(int, struct sockaddr *, int *);
-int     getsockname(int, struct sockaddr *, int *);
+int     setsockopt(int, int, int, const void *, socklen_t);
+int     getsockopt(int, int, int, void *, socklen_t *);
+int     getpeername(int, struct sockaddr *, socklen_t *);
+int     getsockname(int, struct sockaddr *, socklen_t *);
 #endif /* _KERNEL_MODE */
 
 #if __cplusplus

headers/private/net/net_stack_driver.h

@@ -7,6 +7,7 @@
 
 #include <OS.h>			
 #include <sys/select.h>
+#include <sys/socket.h>
 
 // Forward declaration
 struct sockaddr; 
@@ -56,7 +57,7 @@ enum {
 
 struct sockaddr_args {	// used by NET_STACK_CONNECT/_BIND/_GETSOCKNAME/_GETPEERNAME
 	struct sockaddr *addr;
-	int addrlen;
+	socklen_t addrlen;
 };
 
 struct sockopt_args {	// used by NET_STACK_SETSOCKOPT/_GETSOCKOPT
@@ -87,7 +88,7 @@ struct socketpair_args {	// used by NET_STACK_SOCKETPAIR
 struct accept_args {  // used by NET_STACK_ACCEPT 
 	void *cookie; 
 	struct sockaddr *addr; 
-	int addrlen; 
+	socklen_t addrlen; 
 };
 
 struct sysctl_args {	// used by NET_STACK_SYSCTL

src/bin/ping/ping.c

@@ -177,6 +177,7 @@ static void errx(int exitval, char *fmt_string, char *value)
 {
 	printf("error: ");
 	printf(fmt_string, value);
+	printf("\n");
 	exit(exitval);
 }
 
@@ -483,7 +484,7 @@ int main(int argc, char **argv)
 	for (;;) {
 		struct sockaddr_in from;
 		int cc;
-		size_t fromlen;
+		socklen_t fromlen;
 		sigset_t omask, nmask;
 
 		if (options & F_FLOOD) {

src/kits/network/compat/libbind/Jamfile

@@ -43,7 +43,7 @@ SEARCH_SOURCE += [ FDirName $(LIBNETWORK_DNS_DIR) resolv ] ;
 	LINKFLAGS on libbind.so = [ on libbind.so return $(LINKFLAGS) ] -nodefaultlibs ;
  
 	# we want to have the xxx_r functions, too
-	local defines = _REENTRANT=1 NO_SOCKADDR_UN=1 ;
+	local defines = _REENTRANT=1 NO_SOCKADDR_UN=1 ISC_SOCKLEN_T=int ;
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) ;
 	SubDirC++Flags $(defines) ;

src/kits/network/compat/libnet/res_send.c

@@ -560,7 +560,7 @@ read_len:
 			struct timeval timeout;
 			fd_set *dsmaskp;
 			struct sockaddr_storage from;
-			size_t fromlen;
+			int fromlen;
 
 			if ((s < 0) || vc || (af != nsap->sa_family)) {
 				if (vc)

src/kits/network/libnetwork/dns/port_before.h

@@ -128,7 +128,9 @@ struct timezone;        /* silence warning */
 #define UNUSED(x) (x) = (x)
 
 #undef NEED_SOLARIS_BITTYPES
-#define ISC_SOCKLEN_T int
+#ifndef ISC_SOCKLEN_T
+#define ISC_SOCKLEN_T socklen_t
+#endif
 
 #ifdef __GNUC__
 #define ISC_FORMAT_PRINTF(fmt, args) \

src/kits/network/libnetwork/socket/socket.c

@@ -47,7 +47,7 @@ _EXPORT int socket(int family, int type, int protocol)
 }
 
 
-_EXPORT int bind(int sock, const struct sockaddr *addr, int addrlen)
+_EXPORT int bind(int sock, const struct sockaddr *addr, socklen_t addrlen)
 {
 	struct stack_driver_args args;
 	
@@ -68,7 +68,7 @@ _EXPORT int shutdown(int sock, int how)
 }
 
 
-_EXPORT int connect(int sock, const struct sockaddr *addr, int addrlen)
+_EXPORT int connect(int sock, const struct sockaddr *addr, socklen_t addrlen)
 {
 	struct stack_driver_args args;
 	
@@ -89,7 +89,7 @@ _EXPORT int listen(int sock, int backlog)
 }
 
 
-_EXPORT int accept(int sock, struct sockaddr *addr, int *addrlen)
+_EXPORT int accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
 {
 	struct stack_driver_args args;
 	int rv;
@@ -128,7 +128,7 @@ _EXPORT int accept(int sock, struct sockaddr *addr, int *addrlen)
 
 
 _EXPORT ssize_t recvfrom(int sock, void *buffer, size_t buflen, int flags,
-             struct sockaddr *addr, int *addrlen)
+             struct sockaddr *addr, socklen_t *addrlen)
 {
 	struct msghdr mh;
 	struct iovec iov;
@@ -156,7 +156,7 @@ _EXPORT ssize_t recvfrom(int sock, void *buffer, size_t buflen, int flags,
 }
 
 _EXPORT ssize_t sendto(int sock, const void *buffer, size_t buflen, int flags,
-           const struct sockaddr *addr, int addrlen)
+           const struct sockaddr *addr, socklen_t addrlen)
 {
 	struct msghdr mh;
 	struct iovec iov;
@@ -248,7 +248,7 @@ _EXPORT int setsockopt(int sock, int level, int option, const void *optval, size
 }
 
 
-_EXPORT int getpeername(int sock, struct sockaddr *addr, int *addrlen)
+_EXPORT int getpeername(int sock, struct sockaddr *addr, socklen_t *addrlen)
 {
 	struct stack_driver_args args;
 	int rv;
@@ -265,7 +265,7 @@ _EXPORT int getpeername(int sock, struct sockaddr *addr, int *addrlen)
 	return rv;
 }
 
-_EXPORT int getsockname(int sock, struct sockaddr *addr, int *addrlen)
+_EXPORT int getsockname(int sock, struct sockaddr *addr, socklen_t *addrlen)
 {
 	struct stack_driver_args args;
 	int rv;