[src/trunk]: src/sys/netipsec Use ip_randomid(), dependent on either __NetBSD...

[jonathan <jonathan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c3418992dc3d
branches:  trunk
changeset: 555313:c3418992dc3d
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Fri Nov 14 07:15:28 2003 +0000

description:
Use ip_randomid(), dependent on either __NetBSD__ preprocessor
token or FreeBSD RANDOM_IP_ID config option.

diffstat:

 sys/netipsec/xform_ipip.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r bb4386f3ca05 -r c3418992dc3d sys/netipsec/xform_ipip.c
--- a/sys/netipsec/xform_ipip.c Fri Nov 14 07:13:25 2003 +0000
+++ b/sys/netipsec/xform_ipip.c Fri Nov 14 07:15:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipip.c,v 1.5 2003/10/06 22:05:15 tls Exp $       */
+/*     $NetBSD: xform_ipip.c,v 1.6 2003/11/14 07:15:28 jonathan Exp $  */
 /*     $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
 /*     $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.5 2003/10/06 22:05:15 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.6 2003/11/14 07:15:28 jonathan Exp $");
 
 /*
  * IP-inside-IP processing
@@ -484,7 +484,7 @@
                ipo->ip_src = saidx->src.sin.sin_addr;
                ipo->ip_dst = saidx->dst.sin.sin_addr;
 
-#ifdef RANDOM_IP_ID
+#if defined(__NetBSD__) || defined(RANDOM_IP_ID)
                ipo->ip_id = ip_randomid();
 #else
                ipo->ip_id = htons(ip_id++);