Module Name: src
Committed By: christos
Date: Mon Mar 8 18:03:25 UTC 2021
Modified Files:
src/sys/netinet: files.netinet in_var.h ip_input.c
Removed Files:
src/sys/netinet: ip_id.c
Log Message:
remove now unused pseudo-random ip id code.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/netinet/files.netinet
cvs rdiff -u -r1.99 -r1.100 src/sys/netinet/in_var.h
cvs rdiff -u -r1.16 -r0 src/sys/netinet/ip_id.c
cvs rdiff -u -r1.400 -r1.401 src/sys/netinet/ip_input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/files.netinet
diff -u src/sys/netinet/files.netinet:1.28 src/sys/netinet/files.netinet:1.29
--- src/sys/netinet/files.netinet:1.28 Sat Jul 29 01:48:16 2017
+++ src/sys/netinet/files.netinet Mon Mar 8 13:03:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.netinet,v 1.28 2017/07/29 05:48:16 maxv Exp $
+# $NetBSD: files.netinet,v 1.29 2021/03/08 18:03:25 christos Exp $
defflag opt_tcp_debug.h TCP_DEBUG
defparam opt_tcp_debug.h TCP_NDEBUG
@@ -34,7 +34,6 @@ file netinet/in_proto.c inet
file netinet/in_selsrc.c inet & ipselsrc
file netinet/ip_flow.c inet & gateway
file netinet/ip_icmp.c inet
-file netinet/ip_id.c inet
file netinet/ip_input.c inet
file netinet/ip_mroute.c inet & mrouting
file netinet/ip_output.c inet
Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.99 src/sys/netinet/in_var.h:1.100
--- src/sys/netinet/in_var.h:1.99 Mon Mar 8 12:54:23 2021
+++ src/sys/netinet/in_var.h Mon Mar 8 13:03:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.99 2021/03/08 17:54:23 christos Exp $ */
+/* $NetBSD: in_var.h,v 1.100 2021/03/08 18:03:25 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -447,14 +447,6 @@ void in_addrhash_insert(struct in_ifaddr
void in_addrhash_remove(struct in_ifaddr *);
int ipflow_fastforward(struct mbuf *);
-struct ipid_state;
-typedef struct ipid_state ipid_state_t;
-
-ipid_state_t * ip_id_init(void);
-void ip_id_fini(ipid_state_t *);
-uint16_t ip_randomid(ipid_state_t *, uint16_t);
-
-extern ipid_state_t * ip_ids;
extern uint16_t ip_id;
extern int ip_do_randomid;
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.400 src/sys/netinet/ip_input.c:1.401
--- src/sys/netinet/ip_input.c:1.400 Sun Mar 7 09:58:27 2021
+++ src/sys/netinet/ip_input.c Mon Mar 8 13:03:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.400 2021/03/07 14:58:27 christos Exp $ */
+/* $NetBSD: ip_input.c,v 1.401 2021/03/08 18:03:25 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.400 2021/03/07 14:58:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.401 2021/03/08 18:03:25 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -189,7 +189,6 @@ struct rttimer_queue *ip_mtudisc_timeout
pktqueue_t * ip_pktq __read_mostly;
pfil_head_t * inet_pfil_hook __read_mostly;
-ipid_state_t * ip_ids __read_mostly;
percpu_t * ipstat_percpu __read_mostly;
static percpu_t *ipforward_rt_percpu __cacheline_aligned;
@@ -291,7 +290,6 @@ ip_init(void)
ip_reass_init();
- ip_ids = ip_id_init();
ip_id = time_uptime & 0xfffff;
#ifdef GATEWAY
