CVS commit: [netbsd-2-0] src/sys/netipsec

[Matthias Scheler <tron%netbsd.org@localhost>]

Module Name:    src
Committed By:   tron
Date:           Mon May 10 15:00:45 UTC 2004

Modified Files:
        src/sys/netipsec [netbsd-2-0]: ah_var.h esp_var.h ipcomp_var.h
            ipip_var.h

Log Message:
Pull up revision 1.2 (requested by jonathan in ticket #280):
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.1 -r1.1.2.1 src/sys/netipsec/ah_var.h \
    src/sys/netipsec/esp_var.h src/sys/netipsec/ipcomp_var.h \
    src/sys/netipsec/ipip_var.h

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