diff options
| author | ume <ume@FreeBSD.org> | 2003-10-01 20:24:20 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-10-01 20:24:20 +0000 |
| commit | 57a2e3592f572897442a9c10e336c3c3df363a48 (patch) | |
| tree | cf681d1e1570e7e42ca400ca709e73ed5c4c09ed /sys | |
| parent | f0203cacdc680fe2483bf0372c13927040629be5 (diff) | |
| download | FreeBSD-src-57a2e3592f572897442a9c10e336c3c3df363a48.zip FreeBSD-src-57a2e3592f572897442a9c10e336c3c3df363a48.tar.gz | |
- include opt_random_ip_id.h
- we don't need to obtain microtime when using ip6_randomid.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet6/frag6.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 1 | ||||
| -rw-r--r-- | sys/netinet6/ipsec.c | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 4285b1f..1a35eb5 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -30,6 +30,8 @@ * SUCH DAMAGE. */ +#include "opt_random_ip_id.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -80,16 +82,18 @@ static MALLOC_DEFINE(M_FTABLE, "fragment", "fragment reassembly header"); void frag6_init() { +#ifndef RANDOM_IP_ID struct timeval tv; +#endif ip6_maxfragpackets = nmbclusters / 4; +#ifndef RANDOM_IP_ID /* * in many cases, random() here does NOT return random number * as initialization during bootstrap time occur in fixed order. */ microtime(&tv); -#ifndef RANDOM_IP_ID ip6_id = random() ^ tv.tv_usec; #endif ip6q.ip6q_next = ip6q.ip6q_prev = &ip6q; diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 20a53b3..89374d2 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -68,6 +68,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_random_ip_id.h" #include <sys/param.h> #include <sys/socket.h> diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c index 6ae18f0..1e05d6e 100644 --- a/sys/netinet6/ipsec.c +++ b/sys/netinet6/ipsec.c @@ -37,6 +37,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_random_ip_id.h" #include <sys/param.h> #include <sys/systm.h> |
