aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-10 23:47:39 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-10 23:47:39 +0000
commitb1eab230118c7d65223927486afb7fe0b531bf33 (patch)
tree51c458add3ac839f3b4fd09e3d9ced303536cdf4
parent963100c9f9f079aac1cd891255d0eec5230052ae (diff)
downloadglibc-b1eab230118c7d65223927486afb7fe0b531bf33.tar
glibc-b1eab230118c7d65223927486afb7fe0b531bf33.tar.gz
glibc-b1eab230118c7d65223927486afb7fe0b531bf33.tar.bz2
glibc-b1eab230118c7d65223927486afb7fe0b531bf33.zip
Update.
* sysdeps/ia64/dl-machine.h (TRAMPOLINE_TEMPLATE): Also preserve r9, r10 and r11 for language specific registers. 2001-01-10 Jakub Jelinek <jakub@redhat.com> * sunrpc/clnt_udp.c (clntudp_bufcreate): Set IP_RECVERR on the UDP socket. (clntudp_call): Handle MSG_ERRQUEUE. * sysdeps/generic/errqueue.h: New file. * sysdeps/unix/sysv/linux/errqueue.h: New file. 2001-01-10 H.J. Lu <hjl@gnu.org>
-rw-r--r--ChangeLog13
-rw-r--r--sunrpc/clnt_udp.c52
-rw-r--r--sysdeps/generic/errqueue.h7
-rw-r--r--sysdeps/ia64/dl-machine.h12
-rw-r--r--sysdeps/unix/sysv/linux/errqueue.h46
5 files changed, 129 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e0be44d386..1e6f88b175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2001-01-10 H.J. Lu <hjl@gnu.org>
+ * sysdeps/ia64/dl-machine.h (TRAMPOLINE_TEMPLATE): Also preserve
+ r9, r10 and r11 for language specific registers.
+
+2001-01-10 Jakub Jelinek <jakub@redhat.com>
+
+ * sunrpc/clnt_udp.c (clntudp_bufcreate): Set IP_RECVERR on the
+ UDP socket.
+ (clntudp_call): Handle MSG_ERRQUEUE.
+ * sysdeps/generic/errqueue.h: New file.
+ * sysdeps/unix/sysv/linux/errqueue.h: New file.
+
+2001-01-10 H.J. Lu <hjl@gnu.org>
+
* sysdeps/unix/sysv/linux/ia64/syscalls.list (s_getpagesize): Removed.
2001-01-10 Joseph S. Myers <jsm28@cam.ac.uk>
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index 0733206c9b..f951923052 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -51,6 +51,11 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
#include <rpc/pmap_clnt.h>
#include <net/if.h>
+#ifdef IP_RECVERR
+#include <errqueue.h>
+#include <sys/uio.h>
+#endif
+
extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *);
extern u_long _create_xid (void);
@@ -186,6 +191,12 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
(void) bindresvport (*sockp, (struct sockaddr_in *) 0);
/* the sockets rpc controls are non-blocking */
(void) __ioctl (*sockp, FIONBIO, (char *) &dontblock);
+#ifdef IP_RECVERR
+ {
+ int on = 1;
+ setsockopt(*sockp, SOL_IP, IP_RECVERR, &on, sizeof(on));
+ }
+#endif
cu->cu_closeit = TRUE;
}
else
@@ -361,6 +372,47 @@ send_again:
cu->cu_error.re_errno = errno;
return (cu->cu_error.re_status = RPC_CANTRECV);
}
+#ifdef IP_RECVERR
+ if (fd.revents & POLLERR)
+ {
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ struct sock_extended_err *e;
+ struct sockaddr_in err_addr;
+ struct iovec iov;
+ char *cbuf = (char *) alloca (outlen + 256);
+ int ret;
+
+ iov.iov_base = cbuf + 256;
+ iov.iov_len = outlen;
+ msg.msg_name = (void *) &err_addr;
+ msg.msg_namelen = sizeof (err_addr);
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+ msg.msg_flags = 0;
+ msg.msg_control = cbuf;
+ msg.msg_controllen = 256;
+ ret = recvmsg (cu->cu_sock, &msg, MSG_ERRQUEUE);
+ if (ret >= 0
+ && memcmp (cbuf + 256, cu->cu_outbuf, ret) == 0
+ && (msg.msg_flags & MSG_ERRQUEUE)
+ && ((msg.msg_namelen == 0
+ && ret >= 12)
+ || (msg.msg_namelen == sizeof (err_addr)
+ && err_addr.sin_family == AF_INET
+ && memcmp (&err_addr.sin_addr, &cu->cu_raddr.sin_addr,
+ sizeof (err_addr.sin_addr)) == 0
+ && err_addr.sin_port == cu->cu_raddr.sin_port)))
+ for (cmsg = CMSG_FIRSTHDR (&msg); cmsg;
+ cmsg = CMSG_NXTHDR (&msg, cmsg))
+ if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR)
+ {
+ e = (struct sock_extended_err *) CMSG_DATA(cmsg);
+ cu->cu_error.re_errno = e->ee_errno;
+ return (cu->cu_error.re_status = RPC_CANTRECV);
+ }
+ }
+#endif
do
{
fromlen = sizeof (struct sockaddr);
diff --git a/sysdeps/generic/errqueue.h b/sysdeps/generic/errqueue.h
new file mode 100644
index 0000000000..dac2bd3863
--- /dev/null
+++ b/sysdeps/generic/errqueue.h
@@ -0,0 +1,7 @@
+#ifndef _BITS_ERRQUEUE_H
+#define _BITS_ERRQUEUE_H 1
+
+/* This platform does not support socket error reporting
+ via MSG_ERRQUEUE. */
+
+#endif /* bits/errqueue.h */
diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h
index 0b0352083c..17e77084d8 100644
--- a/sysdeps/ia64/dl-machine.h
+++ b/sysdeps/ia64/dl-machine.h
@@ -163,7 +163,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
.proc " #tramp_name "#
" #tramp_name ":
{ .mmi
- alloc loc0 = ar.pfs, 8, 3, 3, 0
+ alloc loc0 = ar.pfs, 8, 6, 3, 0
adds r2 = -144, r12
adds r3 = -128, r12
}
@@ -178,6 +178,11 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
nop.f 0
nop.b 0
}
+ { .mii
+ mov loc3 = r9 /* preserve language specific register */
+ mov loc4 = r10 /* preserve language specific register */
+ mov loc5 = r11 /* preserve language specific register */
+ }
{ .mmi
stf.spill [r2] = f8, 32
stf.spill [r3] = f9, 32
@@ -232,6 +237,11 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
;;
}
{ .mii
+ mov r9 = loc3 /* restore language specific register */
+ mov r10 = loc4 /* restore language specific register */
+ mov r11 = loc5 /* restore language specific register */
+ }
+ { .mii
ld8 gp = [ret0]
mov r8 = loc2 /* restore struct value register */
;;
diff --git a/sysdeps/unix/sysv/linux/errqueue.h b/sysdeps/unix/sysv/linux/errqueue.h
new file mode 100644
index 0000000000..66c19a61dc
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/errqueue.h
@@ -0,0 +1,46 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* Linux version. */
+
+#ifndef _BITS_ERRQUEUE_H
+#define _BITS_ERRQUEUE_H 1
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+struct sock_extended_err
+ {
+ u_int32_t ee_errno;
+ u_int8_t ee_origin;
+ u_int8_t ee_type;
+ u_int8_t ee_code;
+ u_int8_t ee_pad;
+ u_int32_t ee_info;
+ u_int32_t ee_data;
+ };
+
+#define SO_EE_ORIGIN_NONE 0
+#define SO_EE_ORIGIN_LOCAL 1
+#define SO_EE_ORIGIN_ICMP 2
+#define SO_EE_ORIGIN_ICMP6 3
+
+#define SO_EE_OFFENDER(see) \
+ ((struct sockaddr *)(((struct sock_extended_err)(see))+1))
+
+#endif /* bits/errqueue.h */