mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	Every file that uses libc_hidden_nolink_sunrpc or libnsl_hidden_nolink_def needs to include shlib-compat.h. Currently, most of them are getting it via stdio.h, because libio.h refers to SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h. My experimental patch to not install libio.h breaks that chain; stdio.h no longer pulls in libio.h even for internal users. Accordingly, this patch adds #include <shlib-compat.h> to many files in sunrpc/ and nis/. There are also a small number of really obvious fixups to includes that caught my eye while proofreading the patch - not including headers twice in a row, not worrying about portability to Ultrix anymore, sort of thing. * nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c * nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c * nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c * nis/nis_destroygroup.c, nis/nis_domain_of.c * nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c * nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c * nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c * nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c * nis/nis_print_group_entry.c, nis/nis_remove.c * nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c * nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c * nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c * nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c * sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c * sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c * sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c * sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c * sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c * sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c * sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c * sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c * sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c * sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c * sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c * sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c * sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c * sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c * sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c * sunrpc/xdr_stdio.c: Include shlib-compat.h. * sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include abi-versions.h as well as shlib-compat.h. * sunrpc/get_myaddr.c: Remove obsolete comment. * sunrpc/pmap_rmt.c: Remove obsolete comment and #undef. * sunrpc/rpc_thread.c: Include libc-lock.h only once. * resolv/res_libc.c: Include shlib-compat.h only once.
		
			
				
	
	
		
			146 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			146 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2010, Oracle America, Inc.
 | |
|  *
 | |
|  * Redistribution and use in source and binary forms, with or without
 | |
|  * modification, are permitted provided that the following conditions are
 | |
|  * met:
 | |
|  *
 | |
|  *     * Redistributions of source code must retain the above copyright
 | |
|  *       notice, this list of conditions and the following disclaimer.
 | |
|  *     * Redistributions in binary form must reproduce the above
 | |
|  *       copyright notice, this list of conditions and the following
 | |
|  *       disclaimer in the documentation and/or other materials
 | |
|  *       provided with the distribution.
 | |
|  *     * Neither the name of the "Oracle America, Inc." nor the names of its
 | |
|  *       contributors may be used to endorse or promote products derived
 | |
|  *       from this software without specific prior written permission.
 | |
|  *
 | |
|  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 | |
|  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 | |
|  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 | |
|  *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 | |
|  *   COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
 | |
|  *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | |
|  *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 | |
|  *   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 | |
|  *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 | |
|  *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 | |
|  *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 | |
|  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 | |
|  */
 | |
| /*
 | |
|  * rtime - get time from remote machine
 | |
|  *
 | |
|  * gets time, obtaining value from host
 | |
|  * on the udp/time socket.  Since timeserver returns
 | |
|  * with time of day in seconds since Jan 1, 1900,  must
 | |
|  * subtract seconds before Jan 1, 1970 to get
 | |
|  * what unix uses.
 | |
|  */
 | |
| #include <stdio.h>
 | |
| #include <unistd.h>
 | |
| #include <stdint.h>
 | |
| #include <rpc/rpc.h>
 | |
| #include <rpc/clnt.h>
 | |
| #include <sys/types.h>
 | |
| #include <sys/poll.h>
 | |
| #include <sys/socket.h>
 | |
| #include <sys/time.h>
 | |
| #include <rpc/auth_des.h>
 | |
| #include <errno.h>
 | |
| #include <netinet/in.h>
 | |
| #include <shlib-compat.h>
 | |
| 
 | |
| #define NYEARS	(u_long)(1970 - 1900)
 | |
| #define TOFFSET (u_long)(60*60*24*(365*NYEARS + (NYEARS/4)))
 | |
| 
 | |
| static void do_close (int);
 | |
| 
 | |
| static void
 | |
| do_close (int s)
 | |
| {
 | |
|   int save;
 | |
| 
 | |
|   save = errno;
 | |
|   __close (s);
 | |
|   __set_errno (save);
 | |
| }
 | |
| 
 | |
| int
 | |
| rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
 | |
|        struct rpc_timeval *timeout)
 | |
| {
 | |
|   int s;
 | |
|   struct pollfd fd;
 | |
|   int milliseconds;
 | |
|   int res;
 | |
|   /* RFC 868 says the time is transmitted as a 32-bit value.  */
 | |
|   uint32_t thetime;
 | |
|   struct sockaddr_in from;
 | |
|   socklen_t fromlen;
 | |
|   int type;
 | |
| 
 | |
|   if (timeout == NULL)
 | |
|     type = SOCK_STREAM;
 | |
|   else
 | |
|     type = SOCK_DGRAM;
 | |
| 
 | |
|   s = __socket (AF_INET, type, 0);
 | |
|   if (s < 0)
 | |
|     return (-1);
 | |
| 
 | |
|   addrp->sin_family = AF_INET;
 | |
|   addrp->sin_port = htons (IPPORT_TIMESERVER);
 | |
|   if (type == SOCK_DGRAM)
 | |
|     {
 | |
|       res = __sendto (s, (char *) &thetime, sizeof (thetime), 0,
 | |
| 		      (struct sockaddr *) addrp, sizeof (*addrp));
 | |
|       if (res < 0)
 | |
| 	{
 | |
| 	  do_close (s);
 | |
| 	  return -1;
 | |
| 	}
 | |
|       milliseconds = (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000);
 | |
|       fd.fd = s;
 | |
|       fd.events = POLLIN;
 | |
|       do
 | |
| 	res = __poll (&fd, 1, milliseconds);
 | |
|       while (res < 0 && errno == EINTR);
 | |
|       if (res <= 0)
 | |
| 	{
 | |
| 	  if (res == 0)
 | |
| 	    __set_errno (ETIMEDOUT);
 | |
| 	  do_close (s);
 | |
| 	  return (-1);
 | |
| 	}
 | |
|       fromlen = sizeof (from);
 | |
|       res = __recvfrom (s, (char *) &thetime, sizeof (thetime), 0,
 | |
| 			(struct sockaddr *) &from, &fromlen);
 | |
|       do_close (s);
 | |
|       if (res < 0)
 | |
| 	return -1;
 | |
|     }
 | |
|   else
 | |
|     {
 | |
|       if (__connect (s, (struct sockaddr *) addrp, sizeof (*addrp)) < 0)
 | |
| 	{
 | |
| 	  do_close (s);
 | |
| 	  return -1;
 | |
| 	}
 | |
|       res = __read (s, (char *) &thetime, sizeof (thetime));
 | |
|       do_close (s);
 | |
|       if (res < 0)
 | |
| 	return (-1);
 | |
|     }
 | |
|   if (res != sizeof (thetime))
 | |
|     {
 | |
|       __set_errno (EIO);
 | |
|       return -1;
 | |
|     }
 | |
|   thetime = ntohl (thetime);
 | |
|   timep->tv_sec = thetime - TOFFSET;
 | |
|   timep->tv_usec = 0;
 | |
|   return 0;
 | |
| }
 | |
| libc_hidden_nolink_sunrpc (rtime, GLIBC_2_1)
 |