mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
c40298232a
Mon Sep 23 15:31:04 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/Makefile ($(includedir)/rpc/netdb.h): There is no make variable `top_srcdir' in libc; use $(..) instead. * sysdeps/mach/hurd/Makefile (rtld-installed-name): Delete special definition. It was a *Mistake*. (With a capital M.) * sysdeps/mach/getsysstats.c (__get_nprocs): Renamed from __get_nproc. (__get_nprocs_conf): Renamed from __get_nproc_conf. Fri Sep 27 03:49:56 1996 Ulrich Drepper <drepper@cygnus.com> Add support for cancelable system calls. * csu/initfini.c: Make in crti.o reference to symbol __libc_force_cancel_wrapper when compiling reentrant version. * misc/Makefile (routines): Add force-wrapper. * misc/force-wrapper.c: New file. * posix/system.c: Rename function to __libc_system and make system a weak alias. * sysdeps/stub/system.c: Likewise. * posix/wait.c: Rename function to __libc_wait and make __wait a weak alias. De-ANSI-fy. * sysdeps/standalone/read.c: Rename function to __libc_read and make __read a weak alias. * sysdeps/stub/read.c: Likewise. * sysdeps/standalone/write.c: Rename function to __libc_write and make __write a weak alias. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/tcdrain.c: Rename function to __libc_tcdrain and make tcdrain a weak alias. * sysdeps/unix/bsd/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcdrain.c: Likewise. * sysdeps/unix/sysv/tcdrain.c: Likewise. * sysdeps/unix/sysv/linux/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/wait.c: Rename function to __libc_wait and make __wait a weak alias. * sysdeps/stub/waitpid.c: Rename function to __libc_waitpid and make __waitpid a weak alias. * sysdeps/unix/bsd/bsd4.4/waitpid.c: Likewise. * sysdeps/unix/sysv/linux/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/common/pause.c: Rename function to __libc_pause and make pause a weak alias. De-ANSI-fy. * sysdeps/unix/syscalls.list: Change name for close, fcntl, fsync, lseek, open, read, and write to have __libc_ prefix and make old names a weak alias. * sysdeps/unix/mman/syscalls.list: Likewise for msync. * sysdeps/unix/sysv/linux/syscalls.list: Likewise for nanosleep. * io/creat.c: De-ANSI-fy. * sysdeps/unix/sysv/linux/syscalls.list: Add pause. Thu Sep 26 19:15:55 1996 Ulrich Drepper <drepper@cygnus.com> * misc/mntent.h: Add MNTTYPE_* and MNTOPT_* macros. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. Thu Sep 26 14:40:10 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/pathconf.c: Pass descriptor for just opened file to fpathconf. Reported by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>. Thu Sep 26 04:02:43 1996 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locfile.c (write_locale_data): Allocate room even for file name for LC_MESSAGES locale. (locafile_read): `tok_era' must be handled as a string list. * locale/programs/ld-time.c: Finish correction of handling `era'. * locale/C-time.c (_nl_C_LC_TIME): Add initializer for new fields. * locale/categories.def: Add postload function for LC_TIME. * locale/setlocale.c: Make lock global and rename to __libc_setlocale_lock. * locale/localeinfo.h (struct era_entry): New type. Used in strftime. Add prototypes for _nl_get_era_entry and _nl_get_alt_digit. * locale/lc-time.c (_nl_postload_time): New function. Initialize lazy intialization. (_nl_get_era_entry): New function. Return era entry which corresponds to given year. (_nl_get_alt_digit): New function. Return string with alternate digit representation for given number. * time/strftime.c (strftime): Use _nl_get_alt_digit to get string representing alternate digit notation. Wed Sep 25 17:31:55 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/waitstatus.h (union wait): Add w_status field. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. * elf/rtld.c (dl_main): Process LD_PRELOAD before loading ld.so.preload. Suggested by David Engel <david@elo.ods.com>. Wed Sep 25 13:10:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Change --version again because RMS wants the package name in parentheses. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. Tue Sep 24 01:28:05 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile ($(objpfx)sysd-dirs): Depend on Subdirs files, command rewritten. ($(objpfx)version-info.h): Depend on Banner files, command rewritten. Wed Sep 25 02:44:41 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sleep.c: New file. Based on nanosleep. Tue Sep 24 21:46:02 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/lckpwdf.c (PWD_LOCKFILE): Change to /etc/lock.pwd to be on the same device as the password file. * shadow/shadow.h (struct spwd): Change type of numeric fields to `long int' since there value are days, not seconds. * shadow/putspent.c: Change casts from time_t to `long int'. * shadow/sgetspent_r.c (LINE_READER): Likewise. Mon Sep 23 23:05:24 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/errnos.h: Define __set_errno to make sure the thread specific variable is set as well as the global variable. * sysdeps/mach/hurd/errnos.awk: Define macro for source code compatibility. * sysdeps/stub/errnos.h: Likewise. * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise. * shadow/putspent.c: Don't include <errno.h>. * dirent/scandir.c (scandir): Use __set_errno to set errno variable. * elf/dl-load.c (open_path): Likewise. * inet/rcmd.c (rcmd): Likewise. (rresvport): Likewise. * intl/dcgettext.c [!__set_errno]: Define __set_errno. (DCGETTEXT): Use __set_errno to set errno variable. * io/fts.c (fts_open): Likewise. (fts_close): Likewise. (fts_read): Likewise. (fts_set): Likewise. (fts_children): Likewise. (fts_build): Likewise. (fts_stat): Likewise. * io/ftw.c (ftw_dir): Likewise. (ftw): Likewise. * io/getwd.c (getwd): Likewise. * io/lockf.c (lockf): Likewise. * libio/libioP.h [EINVAL]: Use __set_errno to define MAYBE_SET_EINVAL. * libio/iofdopen.c (_IO_fdopen): Use MAYBE_SET_EINVAL to errno. * libio/iogetdelim.c (_IO_getdelim): Likewise. * libio/fileops.c (_IO_file_open): Use __set_errno to set errno variable. * libio/iofgetpos.c (_IO_fgetpos): Likewise. * libio/iofsetpos.c (_IO_fsetpos): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * locale/nl_langinfo.c (nl_langinfo): Likewise. * locale/setlocale.c (ERROR_RETURN): Likewise. * login/getutid_r (__getutid_r): Likewise. * login/getutline_r (__getutline_r): Likewise. * login/login.c (tty_name): Likewise. * login/oututline_r.c (__pututline_r): Likewise. * malloc/malloc.c (morecore): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * misc/hsearch_r.c (hcreate_r): Likewise. (hdestroy_r): Likewise. (hsearch_r): Likewise. * nss/nsswitch.c (__nss_configure_lookup): Likewise. * nss/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Likewise. (_nss_dns_gethostbyaddr_r): Likewise. * nss/nss_files/files-XXX.c (internal_getent): Likewise. * nss/nss_files/files-parse.c (parse_list): Likewise. * posix/confstr.c (confstr): Likewise. De-ANSI-fy. * posix/execvp.c (execvp): Likewise. * posix/glob.c: Define __set_errno. (glob): Use __set_errno to set errno variable. (glob_in_dir): Likewise. * pwd/getpw.c: Likewise. De-ANSI-fy. * pwd/putpwent.c: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/inet_neta.c: Likewise. * resolv/inet_ntop.c: Likewise. * resolv/inet_pton.c: Likewise. * resolv/res_query.c (res_search): Likewise. * resolv/res_send.c (Aerror): Likewise. (Perror): Likewise. (res_send): Likewise. * signal/sigaddset.c: Likewise. De-ANSI-fy. * signal/sigdelset.c: Likewise. * signal/sigempty.c: Likewise. * signal/sigfillset.c: Likewise. * signal/sigismem.c: Likewise. * stdio/fclose.c: Likewise. * stdio/feof.c: Likewise. * stdio/ferror.c: Likewise. * stdio/fflush.c: Likewise. * stdio/fgetc.c: Likewise. * stdio/fgetpos.c: Likewise. * stdio/fgets.c: Likewise. * stdio/fileno.c: Likewise. * stdio/fmemopen.c: Likewise. * stdio/fopen.c: Likewise. * stdio/fputc.c: Likewise. * stdio/fread.c: Likewise. * stdio/freopen.c: Likewise. * stdio/fseek.c: Likewise. * stdio/fsetpos.c: Likewise. * stdio/ftell.c: Likewise. * stdio/fwrite.c: Likewise. * stdio/getdelim.c: Likewise. * stdio/gets.c: Likewise. * stdio/glue.c: Likewise. * stdio/internals.c: Likewise. * stdio/memstream.c: Likewise. * stdio/setvbuf.c: Likewise. * stdio/ungetc.c: Likewise. * stdio/vsscanf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * stdlib/random_r.c: Likewise. * stdlib/strfmon.c: Likewise. * stdlib/strtod.c: Likewise. * stdlib/strtol.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * time/asctime.c: Likewise. * time/localtime.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wcstok.c: Likewise. * sysdeps/generic/ftime.c: Likewise. * sysdeps/generic/pty.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/generic/speed.c: Likewise. * sysdeps/generic/sysd-stdio.c: Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/libm-ieee754/k_standard.c: Likewise. * sysdeps/libm-ieee754/s_ldexp.c: Likewise. * sysdeps/libm-ieee754/s_ldexpf.c: Likewise. * sysdeps/libm-ieee754/s_ldexpl.c: Likewise. * sysdeps/libm-ieee754/w_scalb.c: Likewise. * sysdeps/libm-ieee754/w_scalbf.c: Likewise. * sysdeps/libm-ieee754/w_scalbl.c: Likewise. * sysdeps/posix/dup2.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/fdopen.c: Likewise. * sysdeps/posix/flock.c: Likewise. * sysdeps/posix/fpathconf.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/gettimeofday.c: Likewise. * sysdeps/posix/isatty.c: Likewise. * sysdeps/posix/isfdtype.c: Likewise. * sysdeps/posix/killpg.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pathconf.c: Likewise. * sysdeps/posix/pipestream.c: Likewise. * sysdeps/posix/remove.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/posix/sigintr.c: Likewise. * sysdeps/posix/signal.c: Likewise. * sysdeps/posix/sigsuspend.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/sleep.c: Likewise. * sysdeps/posix/sysconf.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * sysdeps/posix/truncate.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/wait3.c: Likewise. * sysdeps/standalone/close.c: Likewise. * sysdeps/standalone/open.c: Likewise. * sysdeps/standalone/read.c: Likewise. * sysdeps/standalone/write.c: Likewise. * sysdeps/stub/__longjmp.c: Likewise. * sysdeps/stub/accept.c: Likewise. * sysdeps/stub/access.c: Likewise. * sysdeps/stub/acct.c: Likewise. * sysdeps/stub/adjtime.c: Likewise. * sysdeps/stub/alarm.c: Likewise. * sysdeps/stub/bind.c: Likewise. * sysdeps/stub/brk.c: Likewise. * sysdeps/stub/chdir.c: Likewise. * sysdeps/stub/chflags.c: Likewise. * sysdeps/stub/chmod.c: Likewise. * sysdeps/stub/chown.c: Likewise. * sysdeps/stub/chroot.c: Likewise. * sysdeps/stub/clock.c: Likewise. * sysdeps/stub/close.c: Likewise. * sysdeps/stub/closedir.c: Likewise. * sysdeps/stub/connect.c: Likewise. * sysdeps/stub/ctermid.c: Likewise. * sysdeps/stub/cuserid.c: Likewise. * sysdeps/stub/dirfd.c: Likewise. * sysdeps/stub/dup.c: Likewise. * sysdeps/stub/dup2.c: Likewise. * sysdeps/stub/euidaccess.c: Likewise. * sysdeps/stub/execve.c: Likewise. * sysdeps/stub/fchdir.c: Likewise. * sysdeps/stub/fchflags.c: Likewise. * sysdeps/stub/fchmod.c: Likewise. * sysdeps/stub/fchown.c: Likewise. * sysdeps/stub/fcntl.c: Likewise. * sysdeps/stub/fdopen.c: Likewise. * sysdeps/stub/fexecve.c: Likewise. * sysdeps/stub/flock.c: Likewise. * sysdeps/stub/fork.c: Likewise. * sysdeps/stub/fpathconf.c: Likewise. * sysdeps/stub/fstatfs.c: Likewise. * sysdeps/stub/fsync.c: Likewise. * sysdeps/stub/ftruncate.c: Likewise. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/getcwd.c: Likewise. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/getdomain.c: Likewise. * sysdeps/stub/getdtsz.c: Likewise. * sysdeps/stub/getegid.c: Likewise. * sysdeps/stub/getenv.c: Likewise. * sysdeps/stub/geteuid.c: Likewise. * sysdeps/stub/getgid.c: Likewise. * sysdeps/stub/getgroups.c: Likewise. * sysdeps/stub/gethostid.c: Likewise. * sysdeps/stub/gethostname.c: Likewise. * sysdeps/stub/getitimer.c: Likewise. * sysdeps/stub/getlogin.c: Likewise. * sysdeps/stub/getlogin_r.c: Likewise. * sysdeps/stub/getpagesize.c: Likewise. * sysdeps/stub/getpeername.c: Likewise. * sysdeps/stub/getpid.c: Likewise. * sysdeps/stub/getppid.c: Likewise. * sysdeps/stub/getpriority.c: Likewise. * sysdeps/stub/getrlimit.c: Likewise. * sysdeps/stub/getrusage.c: Likewise. * sysdeps/stub/getsid.c: Likewise. * sysdeps/stub/getsockname.c: Likewise. * sysdeps/stub/getsockopt.c: Likewise. * sysdeps/stub/getsysstats.c: Likewise. * sysdeps/stub/gettimeofday.c: Likewise. * sysdeps/stub/getuid.c: Likewise. * sysdeps/stub/gtty.c: Likewise. * sysdeps/stub/ioctl.c: Likewise. * sysdeps/stub/isatty.c: Likewise. * sysdeps/stub/isfdtype.c: Likewise. * sysdeps/stub/kill.c: Likewise. * sysdeps/stub/killpg.c: Likewise. * sysdeps/stub/link.c: Likewise. * sysdeps/stub/listen.c: Likewise. * sysdeps/stub/lseek.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/madvice.c: Likewise. * sysdeps/stub/mkdir.c: Likewise. * sysdeps/stub/mkfifo.c: Likewise. * sysdeps/stub/mkstemp.c: Likewise. * sysdeps/stub/mktemp.c: Likewise. * sysdeps/stub/mmap.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/mprotect.c: Likewise. * sysdeps/stub/msgctl.c: Likewise. * sysdeps/stub/msgget.c: Likewise. * sysdeps/stub/msgrcv.c: Likewise. * sysdeps/stub/msgsnd.c: Likewise. * sysdeps/stub/msync.c: Likewise. * sysdeps/stub/munmap.c: Likewise. * sysdeps/stub/nanosleep.c: Likewise. * sysdeps/stub/nice.c: Likewise. * sysdeps/stub/nlist.c: Likewise. * sysdeps/stub/open.c: Likewise. * sysdeps/stub/opendir.c: Likewise. * sysdeps/stub/pathconf.c: Likewise. * sysdeps/stub/pause.c: Likewise. * sysdeps/stub/pipe.c: Likewise. * sysdeps/stub/pipestream.c: Likewise. * sysdeps/stub/poll.c: Likewise. * sysdeps/stub/profil.c: Likewise. * sysdeps/stub/ptrace.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/raise.c: Likewise. * sysdeps/stub/read.c: Likewise. * sysdeps/stub/readdir.c: Likewise. * sysdeps/stub/readlink.c: Likewise. * sysdeps/stub/readv.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/recv.c: Likewise. * sysdeps/stub/recvfrom.c: Likewise. * sysdeps/stub/recvmsg.c: Likewise. * sysdeps/stub/remove.c: Likewise. * sysdeps/stub/rename.c: Likewise. * sysdeps/stub/revoke.c: Likewise. * sysdeps/stub/rewinddir.c: Likewise. * sysdeps/stub/rmdir.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/sched_getp.c: Likewise. * sysdeps/stub/sched_gets.c: Likewise. * sysdeps/stub/sched_primax.c: Likewise. * sysdeps/stub/sched_primin.c: Likewise. * sysdeps/stub/sched_rr_gi.c: Likewise. * sysdeps/stub/sched_setp.c: Likewise. * sysdeps/stub/sched_sets.c: Likewise. * sysdeps/stub/sched_yield.c: Likewise. * sysdeps/stub/seekdir.c: Likewise. * sysdeps/stub/select.c: Likewise. * sysdeps/stub/semctl.c: Likewise. * sysdeps/stub/semget.c: Likewise. * sysdeps/stub/semop.c: Likewise. * sysdeps/stub/send.c: Likewise. * sysdeps/stub/sendmsg.c: Likewise. * sysdeps/stub/sendto.c: Likewise. * sysdeps/stub/setdomain.c: Likewise. * sysdeps/stub/setegid.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/seteuid.c: Likewise. * sysdeps/stub/setgid.c: Likewise. * sysdeps/stub/setgroups.c: Likewise. * sysdeps/stub/sethostid.c: Likewise. * sysdeps/stub/sethostname.c: Likewise. * sysdeps/stub/setitimer.c: Likewise. * sysdeps/stub/setjmp.c: Likewise. * sysdeps/stub/setlogin.c: Likewise. * sysdeps/stub/setpgid.c: Likewise. * sysdeps/stub/setpriority.c: Likewise. * sysdeps/stub/setregid.c: Likewise. * sysdeps/stub/setreuid.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * sysdeps/stub/setsid.c: Likewise. * sysdeps/stub/setsockopt.c: Likewise. * sysdeps/stub/settimeofday.c: Likewise. * sysdeps/stub/setuid.c: Likewise. * sysdeps/stub/shmat.c: Likewise. * sysdeps/stub/shmctl.c: Likewise. * sysdeps/stub/shmdt.c: Likewise. * sysdeps/stub/shmget.c: Likewise. * sysdeps/stub/shutdown.c: Likewise. * sysdeps/stub/sigaction.c: Likewise. * sysdeps/stub/sigaltstack.c: Likewise. * sysdeps/stub/sigblock.c: Likewise. * sysdeps/stub/sigintr.c: Likewise. * sysdeps/stub/signal.c: Likewise. * sysdeps/stub/sigpause.c: Likewise. * sysdeps/stub/sigpending.c: Likewise. * sysdeps/stub/sigprocmask.c: Likewise. * sysdeps/stub/sigreturn.c: Likewise. * sysdeps/stub/sigsetmask.c: Likewise. * sysdeps/stub/sigstack.c: Likewise. * sysdeps/stub/sigsuspend.c: Likewise. * sysdeps/stub/sigvec.c: Likewise. * sysdeps/stub/sleep.c: Likewise. * sysdeps/stub/socket.c: Likewise. * sysdeps/stub/socketpair.c: Likewise. * sysdeps/stub/sstk.c: Likewise. * sysdeps/stub/statfs.c: Likewise. * sysdeps/stub/stime.c: Likewise. * sysdeps/stub/stty.c: Likewise. * sysdeps/stub/swapoff.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/symlink.c: Likewise. * sysdeps/stub/sync.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/sysconf.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/system.c: Likewise. * sysdeps/stub/tcdrain.c: Likewise. * sysdeps/stub/tcflow.c: Likewise. * sysdeps/stub/tcflush.c: Likewise. * sysdeps/stub/tcgetattr.c: Likewise. * sysdeps/stub/tcgetpgrp.c: Likewise. * sysdeps/stub/tcsendbrk.c: Likewise. * sysdeps/stub/tcsetattr.c: Likewise. * sysdeps/stub/tcsetpgrp.c: Likewise. * sysdeps/stub/telldir.c: Likewise. * sysdeps/stub/tempname.c: Likewise. * sysdeps/stub/time.c: Likewise. * sysdeps/stub/times.c: Likewise. * sysdeps/stub/truncate.c: Likewise. * sysdeps/stub/ttyname.c: Likewise. * sysdeps/stub/ttyname_r.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/ulimit.c: Likewise. * sysdeps/stub/umask.c: Likewise. * sysdeps/stub/unlink.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/stub/ustat.c: Likewise. * sysdeps/stub/utime.c: Likewise. * sysdeps/stub/utimes.c: Likewise. * sysdeps/stub/vhangup.c: Likewise. * sysdeps/stub/wait.c: Likewise. * sysdeps/stub/wait3.c: Likewise. * sysdeps/stub/wait4.c: Likewise. * sysdeps/stub/waitpid.c: Likewise. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/writev.c: Likewise. * sysdeps/stub/xmknod.c: Likewise. * sysdeps/stub/xstat.c: Likewise. * sysdeps/unix/closedir.c: Likewise. * sysdeps/unix/fxstat.c: Likewise. * sysdeps/unix/getlogin.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/mkdir.c: Likewise. * sysdeps/unix/nice.c: Likewise. * sysdeps/unix/nlist.c: Likewise. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/readdir.c: Likewise. * sysdeps/unix/rmdir.c: Likewise. * sysdeps/unix/stime.c: Likewise. * sysdeps/unix/xmknod.c: Likewise. * sysdeps/unix/xstat.c: Likewise. * sysdeps/unix/bsd/isatty.c: Likewise. * sysdeps/unix/bsd/setegid.c: Likewise. * sysdeps/unix/bsd/seteuid.c: Likewise. * sysdeps/unix/bsd/setsid.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sigprocmask.c: Likewise. * sysdeps/unix/bsd/sigsuspend.c: Likewise. * sysdeps/unix/bsd/tcflow.c: Likewise. * sysdeps/unix/bsd/tcflush.c: Likewise. * sysdeps/unix/bsd/tcgetattr.c: Likewise. * sysdeps/unix/bsd/tcsetattr.c: Likewise. * sysdeps/unix/bsd/times.c: Likewise. * sysdeps/unix/bsd/ulimit.c: Likewise. * sysdeps/unix/common/lxstat.c: Likewise. * sysdeps/unix/common/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/setrlimit.c: Likewise. * sysdeps/unix/sysv/settimeofday.c: Likewise. * sysdeps/unix/sysv/sigaction.c: Likewise. * sysdeps/unix/sysv/tcflow.c: Likewise. * sysdeps/unix/sysv/tcflush.c: Likewise. * sysdeps/unix/sysv/tcgetattr.c: Likewise. * sysdeps/unix/sysv/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/tcsetattr.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/setpriority.c: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/speed.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/sysv4/sigaction.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/speed.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcsetattr.c: Likewise. * sysdeps/unix/sysv/linux/alpha/ioperm.c: Likewise. * sysdeps/unix/sysv/linux/i386/brk.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/m68k/brk.c: Likewise. * sunrpc/clnt_tcp.c: Protect declaration of errno by #ifndef. * sunrpc/clnt_udp.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sysdeps/generic/strtok.c: Don't check argument, just crash. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/stub/start.c: Make __errno a strong alias of errno. * sysdeps/unix/start.c: Likewise. De-ANSI-fy. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/standalone/m68k/m68020/start.S: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. Mon Sep 23 17:54:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Put package name in --version message in parantheses. Reported by Jim Meyering. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * sysdeps/i386/fpu/__math.h (tan): Make sure gcc knows we use two registers. Patch by John Bowman. Sat Sep 21 15:08:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/mach/libc-lock.h: Fix comment. * sysdeps/stubs/libc-lock.h: Likewise. Sat Sep 21 13:50:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/genops.c (_IO_init) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_init macro. (_IO_default_finish) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_fini macro. Sat Sep 21 14:35:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER) [_LIBC_REENTRANT]: Add missing semicolon. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Move inclusion of sysdep.h to the top outside of #ifndef PIC. Don't include errnos.h. Use the ENTRY macro. Sat Sep 21 14:33:41 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/Makefile: Make `all' the default target. * po/Makefile: Likewise. Mon Sep 23 15:49:47 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/test-canon.c: Correct patch from Thu Sep 12 23:01:16 1996. I applied it incorrectly. * sysdeps/m68k/fpu/s_scalbn.c: Likewise. * sysdeps/m68k/fpu/s_scalbnf.c: Likewise. * sysdeps/m68k/fpu/s_scalbnl.c: Likewise. Mon Sep 23 03:00:10 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/sgetspent_r.c (LINE_PARSER): Accept empty 9th field. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * shadow/sgetspent_r.c (LINE_PARSER): Don't accept any chars after 9th field. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==misc] (sysdep_headers): Add sys/debugreg.h, sys/kd.h, sys/soundcard.h, and sys/vt.h. * sysdeps/unix/sysv/linux/sys/debugreg.h: New file. * sysdeps/unix/sysv/linux/sys/kd.h: New file. * sysdeps/unix/sysv/linux/sys/soundcard.h: New file. * sysdeps/unix/sysv/linux/sys/vt.h: New file. Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
477 lines
12 KiB
C
477 lines
12 KiB
C
/* @(#)svc_udp.c 2.2 88/07/29 4.0 RPCSRC */
|
|
/*
|
|
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
|
* unrestricted use provided that this legend is included on all tape
|
|
* media and as a part of the software program in whole or part. Users
|
|
* may copy or modify Sun RPC without charge, but are not authorized
|
|
* to license or distribute it to anyone else except as part of a product or
|
|
* program developed by the user.
|
|
*
|
|
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
|
|
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
|
|
*
|
|
* Sun RPC is provided with no support and without any obligation on the
|
|
* part of Sun Microsystems, Inc. to assist in its use, correction,
|
|
* modification or enhancement.
|
|
*
|
|
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
|
|
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
|
|
* OR ANY PART THEREOF.
|
|
*
|
|
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
|
|
* or profits or other special, indirect and consequential damages, even if
|
|
* Sun has been advised of the possibility of such damages.
|
|
*
|
|
* Sun Microsystems, Inc.
|
|
* 2550 Garcia Avenue
|
|
* Mountain View, California 94043
|
|
*/
|
|
#if !defined(lint) && defined(SCCSIDS)
|
|
static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
|
|
#endif
|
|
|
|
/*
|
|
* svc_udp.c,
|
|
* Server side for UDP/IP based RPC. (Does some caching in the hopes of
|
|
* achieving execute-at-most-once semantics.)
|
|
*
|
|
* Copyright (C) 1984, Sun Microsystems, Inc.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <rpc/rpc.h>
|
|
#include <sys/socket.h>
|
|
#include <errno.h>
|
|
|
|
|
|
#define rpc_buffer(xprt) ((xprt)->xp_p1)
|
|
#define MAX(a, b) ((a > b) ? a : b)
|
|
|
|
static bool_t svcudp_recv();
|
|
static bool_t svcudp_reply();
|
|
static enum xprt_stat svcudp_stat();
|
|
static bool_t svcudp_getargs();
|
|
static bool_t svcudp_freeargs();
|
|
static void svcudp_destroy();
|
|
|
|
static struct xp_ops svcudp_op = {
|
|
svcudp_recv,
|
|
svcudp_stat,
|
|
svcudp_getargs,
|
|
svcudp_reply,
|
|
svcudp_freeargs,
|
|
svcudp_destroy
|
|
};
|
|
|
|
#ifndef errno
|
|
extern int errno;
|
|
#endif
|
|
|
|
/*
|
|
* kept in xprt->xp_p2
|
|
*/
|
|
struct svcudp_data {
|
|
u_int su_iosz; /* byte size of send.recv buffer */
|
|
u_long su_xid; /* transaction id */
|
|
XDR su_xdrs; /* XDR handle */
|
|
char su_verfbody[MAX_AUTH_BYTES]; /* verifier body */
|
|
char * su_cache; /* cached data, NULL if no cache */
|
|
};
|
|
#define su_data(xprt) ((struct svcudp_data *)(xprt->xp_p2))
|
|
|
|
/*
|
|
* Usage:
|
|
* xprt = svcudp_create(sock);
|
|
*
|
|
* If sock<0 then a socket is created, else sock is used.
|
|
* If the socket, sock is not bound to a port then svcudp_create
|
|
* binds it to an arbitrary port. In any (successful) case,
|
|
* xprt->xp_sock is the registered socket number and xprt->xp_port is the
|
|
* associated port number.
|
|
* Once *xprt is initialized, it is registered as a transporter;
|
|
* see (svc.h, xprt_register).
|
|
* The routines returns NULL if a problem occurred.
|
|
*/
|
|
SVCXPRT *
|
|
svcudp_bufcreate(sock, sendsz, recvsz)
|
|
register int sock;
|
|
u_int sendsz, recvsz;
|
|
{
|
|
bool_t madesock = FALSE;
|
|
register SVCXPRT *xprt;
|
|
register struct svcudp_data *su;
|
|
struct sockaddr_in addr;
|
|
int len = sizeof(struct sockaddr_in);
|
|
|
|
if (sock == RPC_ANYSOCK) {
|
|
if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
|
|
perror(_("svcudp_create: socket creation problem"));
|
|
return ((SVCXPRT *)NULL);
|
|
}
|
|
madesock = TRUE;
|
|
}
|
|
bzero((char *)&addr, sizeof (addr));
|
|
addr.sin_family = AF_INET;
|
|
if (bindresvport(sock, &addr)) {
|
|
addr.sin_port = 0;
|
|
(void)bind(sock, (struct sockaddr *)&addr, len);
|
|
}
|
|
if (getsockname(sock, (struct sockaddr *)&addr, &len) != 0) {
|
|
perror(_("svcudp_create - cannot getsockname"));
|
|
if (madesock)
|
|
(void)close(sock);
|
|
return ((SVCXPRT *)NULL);
|
|
}
|
|
xprt = (SVCXPRT *)mem_alloc(sizeof(SVCXPRT));
|
|
if (xprt == NULL) {
|
|
(void)fprintf(stderr, "svcudp_create: out of memory\n");
|
|
return (NULL);
|
|
}
|
|
su = (struct svcudp_data *)mem_alloc(sizeof(*su));
|
|
if (su == NULL) {
|
|
(void)fprintf(stderr, "svcudp_create: out of memory\n");
|
|
return (NULL);
|
|
}
|
|
su->su_iosz = ((MAX(sendsz, recvsz) + 3) / 4) * 4;
|
|
if ((rpc_buffer(xprt) = mem_alloc(su->su_iosz)) == NULL) {
|
|
(void)fprintf(stderr, "svcudp_create: out of memory\n");
|
|
return (NULL);
|
|
}
|
|
xdrmem_create(
|
|
&(su->su_xdrs), rpc_buffer(xprt), su->su_iosz, XDR_DECODE);
|
|
su->su_cache = NULL;
|
|
xprt->xp_p2 = (caddr_t)su;
|
|
xprt->xp_verf.oa_base = su->su_verfbody;
|
|
xprt->xp_ops = &svcudp_op;
|
|
xprt->xp_port = ntohs(addr.sin_port);
|
|
xprt->xp_sock = sock;
|
|
xprt_register(xprt);
|
|
return (xprt);
|
|
}
|
|
|
|
SVCXPRT *
|
|
svcudp_create(sock)
|
|
int sock;
|
|
{
|
|
|
|
return(svcudp_bufcreate(sock, UDPMSGSIZE, UDPMSGSIZE));
|
|
}
|
|
|
|
static enum xprt_stat
|
|
svcudp_stat(xprt)
|
|
SVCXPRT *xprt;
|
|
{
|
|
|
|
return (XPRT_IDLE);
|
|
}
|
|
|
|
static bool_t
|
|
svcudp_recv(xprt, msg)
|
|
register SVCXPRT *xprt;
|
|
struct rpc_msg *msg;
|
|
{
|
|
register struct svcudp_data *su = su_data(xprt);
|
|
register XDR *xdrs = &(su->su_xdrs);
|
|
register int rlen;
|
|
char *reply;
|
|
u_long replylen;
|
|
|
|
again:
|
|
xprt->xp_addrlen = sizeof(struct sockaddr_in);
|
|
rlen = recvfrom(xprt->xp_sock, rpc_buffer(xprt), (int) su->su_iosz,
|
|
0, (struct sockaddr *)&(xprt->xp_raddr), &(xprt->xp_addrlen));
|
|
if (rlen == -1 && errno == EINTR)
|
|
goto again;
|
|
if (rlen < 16) /* < 4 32-bit ints? */
|
|
return (FALSE);
|
|
xdrs->x_op = XDR_DECODE;
|
|
XDR_SETPOS(xdrs, 0);
|
|
if (! xdr_callmsg(xdrs, msg))
|
|
return (FALSE);
|
|
su->su_xid = msg->rm_xid;
|
|
if (su->su_cache != NULL) {
|
|
if (cache_get(xprt, msg, &reply, &replylen)) {
|
|
(void) sendto(xprt->xp_sock, reply, (int) replylen, 0,
|
|
(struct sockaddr *) &xprt->xp_raddr, xprt->xp_addrlen);
|
|
return (TRUE);
|
|
}
|
|
}
|
|
return (TRUE);
|
|
}
|
|
|
|
static bool_t
|
|
svcudp_reply(xprt, msg)
|
|
register SVCXPRT *xprt;
|
|
struct rpc_msg *msg;
|
|
{
|
|
register struct svcudp_data *su = su_data(xprt);
|
|
register XDR *xdrs = &(su->su_xdrs);
|
|
register int slen;
|
|
register bool_t stat = FALSE;
|
|
|
|
xdrs->x_op = XDR_ENCODE;
|
|
XDR_SETPOS(xdrs, 0);
|
|
msg->rm_xid = su->su_xid;
|
|
if (xdr_replymsg(xdrs, msg)) {
|
|
slen = (int)XDR_GETPOS(xdrs);
|
|
if (sendto(xprt->xp_sock, rpc_buffer(xprt), slen, 0,
|
|
(struct sockaddr *)&(xprt->xp_raddr), xprt->xp_addrlen)
|
|
== slen) {
|
|
stat = TRUE;
|
|
if (su->su_cache && slen >= 0) {
|
|
cache_set(xprt, (u_long) slen);
|
|
}
|
|
}
|
|
}
|
|
return (stat);
|
|
}
|
|
|
|
static bool_t
|
|
svcudp_getargs(xprt, xdr_args, args_ptr)
|
|
SVCXPRT *xprt;
|
|
xdrproc_t xdr_args;
|
|
caddr_t args_ptr;
|
|
{
|
|
|
|
return ((*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr));
|
|
}
|
|
|
|
static bool_t
|
|
svcudp_freeargs(xprt, xdr_args, args_ptr)
|
|
SVCXPRT *xprt;
|
|
xdrproc_t xdr_args;
|
|
caddr_t args_ptr;
|
|
{
|
|
register XDR *xdrs = &(su_data(xprt)->su_xdrs);
|
|
|
|
xdrs->x_op = XDR_FREE;
|
|
return ((*xdr_args)(xdrs, args_ptr));
|
|
}
|
|
|
|
static void
|
|
svcudp_destroy(xprt)
|
|
register SVCXPRT *xprt;
|
|
{
|
|
register struct svcudp_data *su = su_data(xprt);
|
|
|
|
xprt_unregister(xprt);
|
|
(void)close(xprt->xp_sock);
|
|
XDR_DESTROY(&(su->su_xdrs));
|
|
mem_free(rpc_buffer(xprt), su->su_iosz);
|
|
mem_free((caddr_t)su, sizeof(struct svcudp_data));
|
|
mem_free((caddr_t)xprt, sizeof(SVCXPRT));
|
|
}
|
|
|
|
|
|
/***********this could be a separate file*********************/
|
|
|
|
/*
|
|
* Fifo cache for udp server
|
|
* Copies pointers to reply buffers into fifo cache
|
|
* Buffers are sent again if retransmissions are detected.
|
|
*/
|
|
|
|
#define SPARSENESS 4 /* 75% sparse */
|
|
|
|
#define CACHE_PERROR(msg) \
|
|
(void) fprintf(stderr,"%s\n", msg)
|
|
|
|
#define ALLOC(type, size) \
|
|
(type *) mem_alloc((unsigned) (sizeof(type) * (size)))
|
|
|
|
#define BZERO(addr, type, size) \
|
|
bzero((char *) addr, sizeof(type) * (int) (size))
|
|
|
|
/*
|
|
* An entry in the cache
|
|
*/
|
|
typedef struct cache_node *cache_ptr;
|
|
struct cache_node {
|
|
/*
|
|
* Index into cache is xid, proc, vers, prog and address
|
|
*/
|
|
u_long cache_xid;
|
|
u_long cache_proc;
|
|
u_long cache_vers;
|
|
u_long cache_prog;
|
|
struct sockaddr_in cache_addr;
|
|
/*
|
|
* The cached reply and length
|
|
*/
|
|
char * cache_reply;
|
|
u_long cache_replylen;
|
|
/*
|
|
* Next node on the list, if there is a collision
|
|
*/
|
|
cache_ptr cache_next;
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
* The entire cache
|
|
*/
|
|
struct udp_cache {
|
|
u_long uc_size; /* size of cache */
|
|
cache_ptr *uc_entries; /* hash table of entries in cache */
|
|
cache_ptr *uc_fifo; /* fifo list of entries in cache */
|
|
u_long uc_nextvictim; /* points to next victim in fifo list */
|
|
u_long uc_prog; /* saved program number */
|
|
u_long uc_vers; /* saved version number */
|
|
u_long uc_proc; /* saved procedure number */
|
|
struct sockaddr_in uc_addr; /* saved caller's address */
|
|
};
|
|
|
|
|
|
/*
|
|
* the hashing function
|
|
*/
|
|
#define CACHE_LOC(transp, xid) \
|
|
(xid % (SPARSENESS*((struct udp_cache *) su_data(transp)->su_cache)->uc_size))
|
|
|
|
|
|
/*
|
|
* Enable use of the cache.
|
|
* Note: there is no disable.
|
|
*/
|
|
svcudp_enablecache(transp, size)
|
|
SVCXPRT *transp;
|
|
u_long size;
|
|
{
|
|
struct svcudp_data *su = su_data(transp);
|
|
struct udp_cache *uc;
|
|
|
|
if (su->su_cache != NULL) {
|
|
CACHE_PERROR(_("enablecache: cache already enabled"));
|
|
return(0);
|
|
}
|
|
uc = ALLOC(struct udp_cache, 1);
|
|
if (uc == NULL) {
|
|
CACHE_PERROR(_("enablecache: could not allocate cache"));
|
|
return(0);
|
|
}
|
|
uc->uc_size = size;
|
|
uc->uc_nextvictim = 0;
|
|
uc->uc_entries = ALLOC(cache_ptr, size * SPARSENESS);
|
|
if (uc->uc_entries == NULL) {
|
|
CACHE_PERROR(_("enablecache: could not allocate cache data"));
|
|
return(0);
|
|
}
|
|
BZERO(uc->uc_entries, cache_ptr, size * SPARSENESS);
|
|
uc->uc_fifo = ALLOC(cache_ptr, size);
|
|
if (uc->uc_fifo == NULL) {
|
|
CACHE_PERROR(_("enablecache: could not allocate cache fifo"));
|
|
return(0);
|
|
}
|
|
BZERO(uc->uc_fifo, cache_ptr, size);
|
|
su->su_cache = (char *) uc;
|
|
return(1);
|
|
}
|
|
|
|
|
|
/*
|
|
* Set an entry in the cache
|
|
*/
|
|
static
|
|
cache_set(xprt, replylen)
|
|
SVCXPRT *xprt;
|
|
u_long replylen;
|
|
{
|
|
register cache_ptr victim;
|
|
register cache_ptr *vicp;
|
|
register struct svcudp_data *su = su_data(xprt);
|
|
struct udp_cache *uc = (struct udp_cache *) su->su_cache;
|
|
u_int loc;
|
|
char *newbuf;
|
|
|
|
/*
|
|
* Find space for the new entry, either by
|
|
* reusing an old entry, or by mallocing a new one
|
|
*/
|
|
victim = uc->uc_fifo[uc->uc_nextvictim];
|
|
if (victim != NULL) {
|
|
loc = CACHE_LOC(xprt, victim->cache_xid);
|
|
for (vicp = &uc->uc_entries[loc];
|
|
*vicp != NULL && *vicp != victim;
|
|
vicp = &(*vicp)->cache_next)
|
|
;
|
|
if (*vicp == NULL) {
|
|
CACHE_PERROR(_("cache_set: victim not found"));
|
|
return;
|
|
}
|
|
*vicp = victim->cache_next; /* remote from cache */
|
|
newbuf = victim->cache_reply;
|
|
} else {
|
|
victim = ALLOC(struct cache_node, 1);
|
|
if (victim == NULL) {
|
|
CACHE_PERROR("cache_set: victim alloc failed");
|
|
return;
|
|
}
|
|
newbuf = mem_alloc(su->su_iosz);
|
|
if (newbuf == NULL) {
|
|
CACHE_PERROR("cache_set: could not allocate new rpc_buffer");
|
|
return;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Store it away
|
|
*/
|
|
victim->cache_replylen = replylen;
|
|
victim->cache_reply = rpc_buffer(xprt);
|
|
rpc_buffer(xprt) = newbuf;
|
|
xdrmem_create(&(su->su_xdrs), rpc_buffer(xprt), su->su_iosz, XDR_ENCODE);
|
|
victim->cache_xid = su->su_xid;
|
|
victim->cache_proc = uc->uc_proc;
|
|
victim->cache_vers = uc->uc_vers;
|
|
victim->cache_prog = uc->uc_prog;
|
|
victim->cache_addr = uc->uc_addr;
|
|
loc = CACHE_LOC(xprt, victim->cache_xid);
|
|
victim->cache_next = uc->uc_entries[loc];
|
|
uc->uc_entries[loc] = victim;
|
|
uc->uc_fifo[uc->uc_nextvictim++] = victim;
|
|
uc->uc_nextvictim %= uc->uc_size;
|
|
}
|
|
|
|
/*
|
|
* Try to get an entry from the cache
|
|
* return 1 if found, 0 if not found
|
|
*/
|
|
static
|
|
cache_get(xprt, msg, replyp, replylenp)
|
|
SVCXPRT *xprt;
|
|
struct rpc_msg *msg;
|
|
char **replyp;
|
|
u_long *replylenp;
|
|
{
|
|
u_int loc;
|
|
register cache_ptr ent;
|
|
register struct svcudp_data *su = su_data(xprt);
|
|
register struct udp_cache *uc = (struct udp_cache *) su->su_cache;
|
|
|
|
# define EQADDR(a1, a2) (bcmp((char*)&a1, (char*)&a2, sizeof(a1)) == 0)
|
|
|
|
loc = CACHE_LOC(xprt, su->su_xid);
|
|
for (ent = uc->uc_entries[loc]; ent != NULL; ent = ent->cache_next) {
|
|
if (ent->cache_xid == su->su_xid &&
|
|
ent->cache_proc == uc->uc_proc &&
|
|
ent->cache_vers == uc->uc_vers &&
|
|
ent->cache_prog == uc->uc_prog &&
|
|
EQADDR(ent->cache_addr, uc->uc_addr)) {
|
|
*replyp = ent->cache_reply;
|
|
*replylenp = ent->cache_replylen;
|
|
return(1);
|
|
}
|
|
}
|
|
/*
|
|
* Failed to find entry
|
|
* Remember a few things so we can do a set later
|
|
*/
|
|
uc->uc_proc = msg->rm_call.cb_proc;
|
|
uc->uc_vers = msg->rm_call.cb_vers;
|
|
uc->uc_prog = msg->rm_call.cb_prog;
|
|
uc->uc_addr = xprt->xp_raddr;
|
|
return(0);
|
|
}
|