diff options
| author | phk <phk@FreeBSD.org> | 1998-03-30 09:56:58 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1998-03-30 09:56:58 +0000 |
| commit | 9b703b14551addf9806978973e2ddc427d4908b4 (patch) | |
| tree | 91f2de8432f719153d0de9465a9ebeee33c29077 /sys/net/if_spppsubr.c | |
| parent | add2782c4ec0d7c4447da2b33d1413a2754f8a3e (diff) | |
| download | FreeBSD-src-9b703b14551addf9806978973e2ddc427d4908b4.zip FreeBSD-src-9b703b14551addf9806978973e2ddc427d4908b4.tar.gz | |
Eradicate the variable "time" from the kernel, using various measures.
"time" wasn't a atomic variable, so splfoo() protection were needed
around any access to it, unless you just wanted the seconds part.
Most uses of time.tv_sec now uses the new variable time_second instead.
gettime() changed to getmicrotime(0.
Remove a couple of unneeded splfoo() protections, the new getmicrotime()
is atomic, (until Bruce sets a breakpoint in it).
A couple of places needed random data, so use read_random() instead
of mucking about with time which isn't random.
Add a new nfs_curusec() function.
Mark a couple of bogosities involving the now disappeard time variable.
Update ffs_update() to avoid the weird "== &time" checks, by fixing the
one remaining call that passwd &time as args.
Change profiling in ncr.c to use ticks instead of time. Resolution is
the same.
Add new function "tvtohz()" to avoid the bogus "splfoo(), add time, call
hzto() which subtracts time" sequences.
Reviewed by: bde
Diffstat (limited to 'sys/net/if_spppsubr.c')
| -rw-r--r-- | sys/net/if_spppsubr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 441eb7c..0f890cb 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -17,7 +17,7 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $Id: if_spppsubr.c,v 1.33 1998/02/28 21:01:09 phk Exp $ + * $Id: if_spppsubr.c,v 1.34 1998/03/01 06:01:33 bde Exp $ */ #include "opt_inet.h" @@ -29,6 +29,7 @@ #include <sys/sockio.h> #include <sys/socket.h> #include <sys/syslog.h> +#include <machine/random.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/md5.h> @@ -989,7 +990,7 @@ sppp_cisco_input(struct sppp *sp, struct mbuf *m) ++sp->pp_loopcnt; /* Generate new local sequence number */ - sp->pp_seq ^= time.tv_sec ^ time.tv_usec; + read_random((char*)&sp->pp_seq, sizeof sp->pp_seq); break; } sp->pp_loopcnt = 0; @@ -1017,7 +1018,7 @@ sppp_cisco_send(struct sppp *sp, int type, long par1, long par2) struct ppp_header *h; struct cisco_packet *ch; struct mbuf *m; - u_long t = (time.tv_sec - boottime.tv_sec) * 1000; + u_long t = (time_second - boottime.tv_sec) * 1000; MGETHDR (m, M_DONTWAIT, MT_DATA); if (! m) @@ -2114,7 +2115,7 @@ sppp_lcp_RCN_nak(struct sppp *sp, struct lcp_header *h, int len) if (magic == ~sp->lcp.magic) { if (debug) addlog("magic glitch "); - sp->lcp.magic += time.tv_sec + time.tv_usec; + read_random((char*)&sp->lcp.magic, sizeof sp->lcp.magic); } else { sp->lcp.magic = magic; if (debug) @@ -2274,7 +2275,7 @@ sppp_lcp_scr(struct sppp *sp) if (sp->lcp.opts & (1 << LCP_OPT_MAGIC)) { if (! sp->lcp.magic) - sp->lcp.magic = time.tv_sec + time.tv_usec; + read_random((char*)&sp->lcp.magic, sizeof sp->lcp.magic); opt[i++] = LCP_OPT_MAGIC; opt[i++] = 6; opt[i++] = sp->lcp.magic >> 24; |
