From be7e3b7e7ef0fb3d632002bda04d0ad0537ced8b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 26 Dec 1995 10:00:22 +0000 Subject: Mon Dec 25 20:56:39 1995 Roland McGrath * sysdeps/mach/hurd/bind.c: Translate EEXIST from dir_link into EADDRINUSE. If translated node doesn't grok ifsock protocol, return EADDRINUSE. * sysdeps/mach/hurd/connect.c: Make address arg `const struct sockaddr_un *'. The redecl is kosher and avoids another variable for AF_LOCAL case. * sysdeps/mach/hurd/sendto.c: Likewise. * sysdeps/mach/hurd/bind.c: Likewise. * socket/sys/socket.h (__SOCKADDR_ARG): Enable transparent_union code for GCC >= 2.7; use __transparent_union__ for name safety; add several sockaddr flavors. (__SOCKADDR_ALLTYPES, __SOCKADDR_ONETYPE): New macros used in constructing the transparent union declarations. (__CONST_SOCKADDR_ARG): New type (or macro if not GCC 2.7). (bind, connect, sendto): Make the sockaddr argument use that. --- sysdeps/mach/hurd/sendto.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sysdeps/mach/hurd/sendto.c') diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c index b468ba7606..3c08f198e0 100644 --- a/sysdeps/mach/hurd/sendto.c +++ b/sysdeps/mach/hurd/sendto.c @@ -30,18 +30,17 @@ Cambridge, MA 02139, USA. */ int DEFUN(sendto, (fd, buf, n, flags, addr, addr_len), int fd AND PTR buf AND size_t n AND int flags AND - struct sockaddr *addr AND size_t addr_len) + const struct sockaddr_un *addr AND size_t addr_len) { addr_port_t aport; error_t err; int wrote; - - if (addr->sa_family == AF_LOCAL) + + if (addr->sun_family == AF_LOCAL) { /* For the local domain, we must look up the name as a file and talk to it with the ifsock protocol. */ - struct sockaddr_un *unaddr = (struct sockaddr_un *) addr; - file_t file = __file_name_lookup (unaddr->sun_path, 0, 0); + file_t file = __file_name_lookup (addr->sun_path, 0, 0); if (file == MACH_PORT_NULL) return -1; err = __ifsock_getsockaddr (file, &aport); @@ -60,7 +59,7 @@ DEFUN(sendto, (fd, buf, n, flags, addr, addr_len), ({ if (err) err = __socket_create_address (port, - addr->sa_family, + addr->sun_family, (char *) addr, addr_len, &aport); -- cgit v1.2.3