diff options
author | Ulrich Drepper <drepper@redhat.com> | 2002-05-15 00:22:23 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2002-05-15 00:22:23 +0000 |
commit | b2bffca2e3b59dd882039e3b0ab835d127bdaf7a (patch) | |
tree | b32fa56b374f7d485b94afe794b82f83e152e26b /include | |
parent | 848438d4e85c57fe47424113fb3d654f444b5327 (diff) | |
download | glibc-b2bffca2e3b59dd882039e3b0ab835d127bdaf7a.zip glibc-b2bffca2e3b59dd882039e3b0ab835d127bdaf7a.tar.gz glibc-b2bffca2e3b59dd882039e3b0ab835d127bdaf7a.tar.bz2 |
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
Diffstat (limited to 'include')
-rw-r--r-- | include/netinet/in.h | 4 | ||||
-rw-r--r-- | include/rpc/auth.h | 9 | ||||
-rw-r--r-- | include/rpc/clnt.h | 22 | ||||
-rw-r--r-- | include/rpc/svc.h | 17 | ||||
-rw-r--r-- | include/rpc/svc_auth.h | 4 | ||||
-rw-r--r-- | include/sys/socket.h | 54 |
6 files changed, 104 insertions, 6 deletions
diff --git a/include/netinet/in.h b/include/netinet/in.h index b85d938..2a57ace 100644 --- a/include/netinet/in.h +++ b/include/netinet/in.h @@ -1,3 +1,7 @@ #include <inet/netinet/in.h> extern const struct in6_addr in6addr_any_internal attribute_hidden; + +/* Bind socket to a privileged IP port. */ +extern int bindresvport_internal (int __sockfd, + struct sockaddr_in *__sock_in) attribute_hidden; diff --git a/include/rpc/auth.h b/include/rpc/auth.h index bc19049..9bfde83 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -19,4 +19,13 @@ DECLARE_NSS_PROTOTYPES (nisplus) extern bool_t xdr_des_block_internal (XDR *__xdrs, des_block *__blkp); extern bool_t xdr_opaque_auth_internal (XDR *, struct opaque_auth *); +extern AUTH *authunix_create_internal (char *__machname, __uid_t __uid, + __gid_t __gid, int __len, + __gid_t *__aup_gids) attribute_hidden; +extern AUTH *authunix_create_default_internal (void) attribute_hidden; +extern AUTH *authnone_create_internal (void) attribute_hidden; +extern AUTH *authdes_pk_create_internal (const char *, netobj *, u_int, + struct sockaddr *, + des_block *) attribute_hidden; + #endif diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 071c008..1384496 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -4,4 +4,26 @@ /* Now define the internal interfaces. */ extern int _openchild (const char *command, FILE **fto, FILE **ffrom); +extern CLIENT *clnt_create_internal (__const char *__host, + __const u_long __prog, + __const u_long __vers, + __const char *__prot) attribute_hidden; +extern CLIENT *clnttcp_create_internal (struct sockaddr_in *__raddr, + u_long __prog, u_long __version, + int *__sockp, u_int __sendsz, + u_int __recvsz) attribute_hidden; +extern CLIENT *clntudp_create_internal (struct sockaddr_in *__raddr, + u_long __program, u_long __version, + struct timeval __wait_resend, + int *__sockp) attribute_hidden; +extern CLIENT *clntudp_bufcreate_internal (struct sockaddr_in *__raddr, + u_long __program, u_long __version, + struct timeval __wait_resend, + int *__sockp, u_int __sendsz, + u_int __recvsz) attribute_hidden; +extern CLIENT *clntunix_create_internal (struct sockaddr_un *__raddr, + u_long __program, u_long __version, + int *__sockp, u_int __sendsz, + u_int __recvsz) attribute_hidden; + #endif diff --git a/include/rpc/svc.h b/include/rpc/svc.h index bf948d5..063e6f3 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -10,5 +10,22 @@ extern SVCXPRT *svcfd_create (int fd, u_int sendsize, u_int recvsize); extern int svcudp_enablecache (SVCXPRT *transp, u_long size); extern SVCXPRT *svcunixfd_create (int fd, u_int sendsize, u_int recvsize); +extern bool_t svc_sendreply_internal (SVCXPRT *xprt, xdrproc_t __xdr_results, + caddr_t __xdr_location) attribute_hidden; +extern void svcerr_decode_internal (SVCXPRT *__xprt) attribute_hidden; +extern void svc_getreq_internal (int __rdfds) attribute_hidden; +extern void svc_getreq_common_internal (const int __fd) attribute_hidden; +extern void svc_getreqset_internal (fd_set *__readfds) attribute_hidden; +extern void svc_getreq_poll_internal (struct pollfd *, + const int) attribute_hidden; +extern bool_t svc_register_internal (SVCXPRT *__xprt, rpcprog_t __prog, + rpcvers_t __vers, + __dispatch_fn_t __dispatch, + rpcprot_t __protocol) attribute_hidden; +extern void svc_unregister_internal (rpcprog_t __prog, + rpcvers_t __vers) attribute_hidden; +extern SVCXPRT *svcudp_create_internal (int __sock) attribute_hidden; +extern SVCXPRT *svcudp_bufcreate_internal (int __sock, u_int __sendsz, + u_int __recvsz) attribute_hidden; #endif diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index 9d2462b..bf5ce91 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -6,7 +6,7 @@ extern enum auth_stat _svcauth_unix (struct svc_req *rqst, struct rpc_msg *msg); extern enum auth_stat _svcauth_short (struct svc_req *rqst, struct rpc_msg *msg); - - +extern enum auth_stat _authenticate_internal (struct svc_req *__rqst, + struct rpc_msg *__msg) attribute_hidden; #endif diff --git a/include/sys/socket.h b/include/sys/socket.h index 5a8169f..b97c354 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -2,22 +2,24 @@ #include <socket/sys/socket.h> /* Now define the internal interfaces. */ -extern int __socket (int __domain, int __type, int __protocol); +extern int __socket (int __domain, int __type, + int __protocol) attribute_hidden; /* Create two new sockets, of type TYPE in domain DOMAIN and using protocol PROTOCOL, which are connected to each other, and put file descriptors for them in FDS[0] and FDS[1]. If PROTOCOL is zero, one will be chosen automatically. Returns 0 on success, -1 for errors. */ extern int __socketpair (int __domain, int __type, int __protocol, - int __fds[2]); + int __fds[2]) attribute_hidden; /* Return a socket of any type. The socket can be used in subsequent ioctl calls to talk to the kernel. */ -extern int __opensock (void) internal_function; +extern int __opensock (void) internal_function attribute_hidden; /* Put the address of the peer connected to socket FD into *ADDR (which is *LEN bytes long), and its actual length into *LEN. */ -extern int __getpeername (int __fd, __SOCKADDR_ARG __addr, socklen_t *__len); +extern int __getpeername (int __fd, __SOCKADDR_ARG __addr, + socklen_t *__len) attribute_hidden; /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ extern ssize_t __send (int __fd, __const void *__buf, size_t __n, int __flags); @@ -30,6 +32,50 @@ extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len); extern int __connect_internal (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) attribute_hidden; +/* Send N bytes of BUF on socket FD to peer at address ADDR (which is + ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ +extern ssize_t __sendto (int __fd, __const void *__buf, size_t __n, + int __flags, __CONST_SOCKADDR_ARG __addr, + socklen_t __addr_len) attribute_hidden; + +/* Read N bytes into BUF through socket FD. + If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of + the sender, and store the actual size of the address in *ADDR_LEN. + Returns the number of bytes read or -1 for errors. */ +extern ssize_t __recvfrom (int __fd, void *__restrict __buf, size_t __n, + int __flags, __SOCKADDR_ARG __addr, + socklen_t *__restrict __addr_len) attribute_hidden; + +/* Send a message described MESSAGE on socket FD. + Returns the number of bytes sent, or -1 for errors. */ +extern ssize_t __sendmsg (int __fd, __const struct msghdr *__message, + int __flags) attribute_hidden; + +/* Receive a message as described by MESSAGE from socket FD. + Returns the number of bytes read or -1 for errors. */ +extern ssize_t __recvmsg (int __fd, struct msghdr *__message, + int __flags) attribute_hidden; + +/* Set socket FD's option OPTNAME at protocol level LEVEL + to *OPTVAL (which is OPTLEN bytes long). + Returns 0 on success, -1 for errors. */ +extern int __setsockopt (int __fd, int __level, int __optname, + __const void *__optval, + socklen_t __optlen) attribute_hidden; + +/* Put the local address of FD into *ADDR and its length in *LEN. */ +extern int __getsockname (int __fd, __SOCKADDR_ARG __addr, + socklen_t *__restrict __len) attribute_hidden; + +/* Give the socket FD the local address ADDR (which is LEN bytes long). */ +extern int __bind (int __fd, __CONST_SOCKADDR_ARG __addr, + socklen_t __len) attribute_hidden; + +/* Prepare to accept connections on socket FD. + N connection requests will be queued before further requests are refused. + Returns 0 on success, -1 for errors. */ +extern int __listen (int __fd, int __n) attribute_hidden; + /* Return the length of a `sockaddr' structure. */ #ifdef _HAVE_SA_LEN # define SA_LEN(_x) (_x)->sa_len |