CVS commit: src

[Jonathan Stone <jonathan%netbsd.org@localhost>]

Module Name:    src
Committed By:   jonathan
Date:           Fri May  7 00:55:15 UTC 2004

Modified Files:
        src/distrib/sets/lists/comp: mi
        src/etc/mtree: NetBSD.dist
        src/sys: Makefile
        src/sys/netinet: in.h raw_ip.c tcp_input.c udp_usrreq.c
        src/sys/netipsec: ah_var.h esp_var.h ipcomp_var.h ipip_var.h ipsec.c
            ipsec.h ipsec_mbuf.c ipsec_netbsd.c ipsec_output.c
        src/usr.bin/netstat: Makefile main.c netstat.h
Added Files:
        src/sys/netipsec: Makefile ipsec_var.h
        src/usr.bin/netstat: fast_ipsec.c

Log Message:
Redo net.inet.* sysctl subtree for fast-ipsec from scratch.
Attach FAST-IPSEC statistics with 64-bit counters to new sysctl MIB.
Rework netstat to show FAST_IPSEC statistics, via sysctl,  for
netstat -p ipsec.

New kernel files:
        sys/netipsec/Makefile           (new file; install *_var.h includes)
        sys/netipsec/ipsec_var.h        (new 64-bit mib counter struct)

Changed kernel files:
        sys/Makefile                    (recurse into sys/netipsec/)
        sys/netinet/in.h                (fake IP_PROTO name for fast_ipsec
                                        sysctl subtree.)
        sys/netipsec/ipsec.h            (minimal userspace inclusion)
        sys/netipsec/ipsec_osdep.h      (minimal userspace inclusion)
        sys/netipsec/ipsec_netbsd.c     (redo sysctl subtree from scratch)
        sys/netipsec/key*.c             (fix broken net.key subtree)

        sys/netipsec/ah_var.h           (increase all counters to 64 bits)
        sys/netipsec/esp_var.h          (increase all counters to 64 bits)
        sys/netipsec/ipip_var.h         (increase all counters to 64 bits)
        sys/netipsec/ipcomp_var.h       (increase all counters to 64 bits)

        sys/netipsec/ipsec.c            (add #include netipsec/ipsec_var.h)
        sys/netipsec/ipsec_mbuf.c       (add #include netipsec/ipsec_var.h)
        sys/netipsec/ipsec_output.c     (add #include netipsec/ipsec_var.h)

        sys/netinet/raw_ip.c            (add #include netipsec/ipsec_var.h)
        sys/netinet/tcp_input.c         (add #include netipsec/ipsec_var.h)
        sys/netinet/udp_usrreq.c        (add #include netipsec/ipsec_var.h)

Changes to usr.bin/netstat to print the new fast-ipsec sysctl tree
for "netstat -s -p ipsec":

New file:
        usr.bin/netstat/fast_ipsec.c    (print fast-ipsec counters)

Changed files:
        usr.bin/netstat/Makefile        (add fast_ipsec.c)
        usr.bin/netstat/netstat.h       (declarations for fast_ipsec.c)
        usr.bin/netstat/main.c          (call KAME-vs-fast-ipsec dispatcher)


To generate a diff of this commit:
cvs rdiff -r1.697 -r1.698 src/distrib/sets/lists/comp/mi
cvs rdiff -r1.260 -r1.261 src/etc/mtree/NetBSD.dist
cvs rdiff -r1.54 -r1.55 src/sys/Makefile
cvs rdiff -r1.66 -r1.67 src/sys/netinet/in.h
cvs rdiff -r1.79 -r1.80 src/sys/netinet/raw_ip.c
cvs rdiff -r1.204 -r1.205 src/sys/netinet/tcp_input.c
cvs rdiff -r1.120 -r1.121 src/sys/netinet/udp_usrreq.c
cvs rdiff -r0 -r1.1 src/sys/netipsec/Makefile src/sys/netipsec/ipsec_var.h
cvs rdiff -r1.1 -r1.2 src/sys/netipsec/ah_var.h src/sys/netipsec/esp_var.h \
    src/sys/netipsec/ipcomp_var.h src/sys/netipsec/ipip_var.h
cvs rdiff -r1.12 -r1.13 src/sys/netipsec/ipsec.c \
    src/sys/netipsec/ipsec_output.c
cvs rdiff -r1.9 -r1.10 src/sys/netipsec/ipsec.h \
    src/sys/netipsec/ipsec_netbsd.c
cvs rdiff -r1.4 -r1.5 src/sys/netipsec/ipsec_mbuf.c
cvs rdiff -r1.22 -r1.23 src/usr.bin/netstat/Makefile
cvs rdiff -r0 -r1.1 src/usr.bin/netstat/fast_ipsec.c
cvs rdiff -r1.43 -r1.44 src/usr.bin/netstat/main.c
cvs rdiff -r1.28 -r1.29 src/usr.bin/netstat/netstat.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.