X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=pppd%2Fmagic.c;h=2e0426c5c6af9839469c7568206541a6977a1138;hb=c942484570a7644e4e833bfe60cb1c0fdc462ed6;hp=20dfd6fe3a4823ee285fce41f89705ac35f3bddb;hpb=0b63a24d54ba4708c88e31bdd74b0145956c1478;p=ppp.git

diff --git a/pppd/magic.c b/pppd/magic.c
index 20dfd6f..2e0426c 100644
--- a/pppd/magic.c
+++ b/pppd/magic.c
@@ -1,70 +1,110 @@
 /*
  * magic.c - PPP Magic Number routines.
  *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: magic.c,v 1.1 1993/11/11 03:54:25 paulus Exp $";
-#endif
+#define RCSID	"$Id: magic.c,v 1.10 2002/12/04 23:03:32 paulus Exp $"
 
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
+#include "pppd.h"
 #include "magic.h"
 
+static const char rcsid[] = RCSID;
 
-static u_long next;		/* Next value to return */
-
-extern u_long gethostid __ARGS((void));
-extern long random __ARGS((void));
-extern void srandom __ARGS((int));
-
+extern long mrand48 __P((void));
+extern void srand48 __P((long));
 
 /*
  * magic_init - Initialize the magic number generator.
  *
- * Computes first magic number and seed for random number generator.
  * Attempts to compute a random number seed which will not repeat.
- * The current method uses the current hostid and current time.
+ * The current method uses the current hostid, current process ID
+ * and current time, currently.
  */
-void magic_init()
+void
+magic_init()
 {
-    struct timeval tv;
-
-    next = gethostid();
-    if (gettimeofday(&tv, NULL)) {
-	perror("gettimeofday");
-	exit(1);
-    }
-    next ^= (u_long) tv.tv_sec ^ (u_long) tv.tv_usec;
+    long seed;
+    struct timeval t;
 
-    srandom((int) next);
+    gettimeofday(&t, NULL);
+    seed = get_host_seed() ^ t.tv_sec ^ t.tv_usec ^ getpid();
+    srand48(seed);
 }
 
-
 /*
  * magic - Returns the next magic number.
  */
-u_long magic()
+u_int32_t
+magic()
 {
-    u_long m;
+    return (u_int32_t) mrand48();
+}
 
-    m = next;
-    next = (u_long) random();
-    return (m);
+#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