<sys/socket.h>, <netinet/{in,tcp,udp,udp_var}.h>

. add sa_len to sockaddr, sin_len to sockaddr_in
	. rename SCM_CREDENTIALS to SCM_CREDS
	. retire PF_FILE (same as PF_UNIX)

Change-Id: Id3ec63fe2556fc7ceb48de8ad4e80736df3ddfc7

lib/libc/net/minix/getpeereid.c

@@ -2,6 +2,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
+#include <sys/ucred.h>
 
 /*
  * get the effective user ID and effective group ID of a peer

lib/libc/sys-minix/getpeername.c

@@ -95,6 +95,7 @@ static int _tcp_getpeername(int sock, struct sockaddr *__restrict address,
 	sin.sin_family= AF_INET;
 	sin.sin_addr.s_addr= tcpconfp->nwtc_remaddr;
 	sin.sin_port= tcpconfp->nwtc_remport;
+	sin.sin_len = sizeof(sin);
 
 	len= *address_len;
 	if (len > sizeof(sin))
@@ -122,6 +123,7 @@ static int _udp_getpeername(int sock, struct sockaddr *__restrict address,
 	sin.sin_family= AF_INET;
 	sin.sin_addr.s_addr= udpopt->nwuo_remaddr;
 	sin.sin_port= udpopt->nwuo_remport;
+	sin.sin_len = sizeof(sin);
 
 	len= *address_len;
 	if (len > sizeof(sin))

lib/libc/sys-minix/getsockname.c

@@ -111,6 +111,7 @@ static int _tcp_getsockname(int fd, struct sockaddr *__restrict address,
 	sin.sin_family= AF_INET;
 	sin.sin_addr.s_addr= tcpconf->nwtc_locaddr ;
 	sin.sin_port= tcpconf->nwtc_locport;
+	sin.sin_len= sizeof(sin);
 
 	len= *address_len;
 	if (len > sizeof(sin))
@@ -140,6 +141,7 @@ static int _udp_getsockname(int fd, struct sockaddr *__restrict address,
 	sin.sin_family= AF_INET;
 	sin.sin_addr.s_addr= udpopt->nwuo_locaddr ;
 	sin.sin_port= udpopt->nwuo_locport;
+	sin.sin_len= sizeof(sin);
 
 	len= *address_len;
 	if (len > sizeof(sin))

lib/libc/sys-minix/recvfrom.c

@@ -117,6 +117,7 @@ static ssize_t _tcp_recvfrom(int sock, void *__restrict buffer, size_t length,
 		sin.sin_family= AF_INET;
 		sin.sin_addr.s_addr= tcpconfp->nwtc_remaddr;
 		sin.sin_port= tcpconfp->nwtc_remport;
+		sin.sin_len= sizeof(sin);
 		len= *address_len;
 		if (len > sizeof(sin))
 			len= sizeof(sin);
@@ -170,6 +171,7 @@ static ssize_t _udp_recvfrom(int sock, void *__restrict buffer, size_t length,
 			sin.sin_family= AF_INET;
 			sin.sin_addr.s_addr= udpoptp->nwuo_remaddr;
 			sin.sin_port= udpoptp->nwuo_remport;
+			sin.sin_len= sizeof(sin);
 			len= *address_len;
 			if (len > sizeof(sin))
 				len= sizeof(sin);
@@ -216,6 +218,7 @@ static ssize_t _udp_recvfrom(int sock, void *__restrict buffer, size_t length,
 		sin.sin_family= AF_INET;
 		sin.sin_addr.s_addr= io_hdrp->uih_src_addr;
 		sin.sin_port= io_hdrp->uih_src_port;
+		sin.sin_len= sizeof(sin);
 		len= *address_len;
 		if (len > sizeof(sin))
 			len= sizeof(sin);

lib/libc/sys-minix/socket.c

@@ -2,7 +2,7 @@
 #include "namespace.h"
 
 #ifdef __weak_alias
-__weak_alias(socket, _socket)
+__weak_alias(socket, __socket30)
 #endif
 
 #include <errno.h>