diff options
author | Ed Schouten <ed@FreeBSD.org> | 2009-04-05 22:08:18 +0000 |
---|---|---|
committer | Ed Schouten <ed@FreeBSD.org> | 2009-04-05 22:08:18 +0000 |
commit | d2a0bb080329ea491a0cbb90ee35c7c9ab9815d9 (patch) | |
tree | 8a97b6bb04afecdfb70c99fe4302c043d6d240e0 /usr.sbin/pppd/magic.c | |
parent | 029c6e958cf5c424720b989501626fad7b3951e2 (diff) |
Remove if_ppp(4) and if_sl(4).
Not only did these two drivers depend on IFF_NEEDSGIANT, they were
broken 7 months ago during the MPSAFE TTY import. if_ppp(4) has been
replaced by ppp(8). There is no replacement for if_sl(4).
If we see regressions in for example the ports tree, we should just use
__FreeBSD_version 800045 to check whether if_ppp(4) and if_sl(4) are
present. Version 800045 is used to denote the import of MPSAFE TTY.
Discussed with: rwatson, but also rwatson's IFF_NEEDSGIANT emails on the
lists.
Notes
Notes:
svn path=/head/; revision=190751
Diffstat (limited to 'usr.sbin/pppd/magic.c')
-rw-r--r-- | usr.sbin/pppd/magic.c | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c deleted file mode 100644 index b4627b105de1..000000000000 --- a/usr.sbin/pppd/magic.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * magic.c - PPP Magic Number routines. - * - * Copyright (c) 1989 Carnegie Mellon University. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by Carnegie Mellon University. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif - -#include <stdio.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/time.h> - -#include "pppd.h" -#include "magic.h" - -extern long mrand48(void); -extern void srand48(long); - -/* - * magic_init - Initialize the magic number generator. - * - * Attempts to compute a random number seed which will not repeat. - * The current method uses the current hostid, current process ID - * and current time, currently. - */ -void -magic_init() -{ - long seed; - struct timeval t; - - gettimeofday(&t, NULL); - seed = get_host_seed() ^ t.tv_sec ^ t.tv_usec ^ getpid(); - srand48(seed); -} - -/* - * magic - Returns the next magic number. - */ -u_int32_t -magic() -{ - return (u_int32_t) mrand48(); -} - -#ifdef NO_DRAND48 -/* - * Substitute procedures for those systems which don't have - * drand48 et al. - */ - -double -drand48() -{ - return (double)random() / (double)0x7fffffffL; /* 2**31-1 */ -} - -long -mrand48() -{ - return random(); -} - -void -srand48(seedval) -long seedval; -{ - srandom((int)seedval); -} - -#endif |