Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: Fri Mar 05 18:28:01 2010 +0100 Revision: 3625 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 3827. Modified: D doc/TODO D hipd/accessor.c.doxyme D lib/core/getendpointinfo.c D lib/core/getendpointinfo.c.doxyme D lib/core/getendpointinfo.h D lib/core/hip_statistics.c.doxyme D lib/core/hip_statistics.h.doxyme D lib/core/kerncompat.h D lib/ipsec/pfkeyv2.h A patches/openwrt/README A patches/openwrt/package/ A patches/openwrt/package/Makefile A patches/openwrt/package/files/ A patches/openwrt/package/files/hipd.init A patches/openwrt/package/files/hipfw.init A patches/openwrt/package/files/hipl.modules A patches/openwrt/package/files/test/ A patches/openwrt/package/files/test/firewall.flush A patches/openwrt/package/files/test/firewall.init A patches/openwrt/package/files/test/firewall.rules A patches/openwrt/package/files/test/firewall.start A test/performance/perf_measure.sh M Android.mk M Makefile.am M autogen.sh M check_header_verbosity.sh* M debian/rules M doc/HACKING M doc/HOWTO.xml M doc/doxygen.h M doc/hipl.tex M doc/testing.txt M doc/verbose-header-files.txt M doc/verbose-headers.txt M firewall/conntrack.c M firewall/esp_prot_fw_msg.c M firewall/firewalldb.c M firewall/firewalldb.h M firewall/helpers.c M firewall/lsi.c M firewall/pisa.c M hipd/accessor.c M hipd/cert.c M hipd/cookie.c M hipd/dh.c M hipd/dh.h M hipd/hadb.c M hipd/hadb.h M hipd/hidb.c M hipd/hidb.h M hipd/init.c M hipd/input.c M hipd/input.h M hipd/keymat.c M hipd/keymat.h M hipd/netdev.c M hipd/output.c M hipd/pfkeyapi.c M hipd/registration.h M hipd/user.c M lib/conf/hipconf.c M lib/core/builder.c M lib/core/builder.h M lib/core/crypto.c M lib/core/crypto.h M lib/core/hip_statistics.c M lib/core/hip_statistics.h M lib/core/icomm.h M lib/core/ife.h M lib/core/list.h M lib/core/misc.c M lib/core/misc.h M lib/core/prefix.h M lib/core/protodefs.h M lib/core/state.h M lib/ipsec/pfkey.c M lib/ipsec/policy_parse.y M lib/tool/lutil.h M lib/tool/nlink.c M lib/tool/nlink.h M lib/tool/pk.c M lib/tool/xfrmapi.c M lib/tool/xfrmapi.h M modules/update/hipd/update.c M release.version M test/dh_performance.c M test/iperf_handovers.sh* M test/maintainer/fix-archive-perms* M test/maintainer/sync-all* M test/maintainer/tla-find-revision-locks* M test/packaging/create-deb.sh M test/packaging/debian-init.d-dnsproxy* M test/packaging/debian-init.d-hipd* M test/packaging/debian-init.d-hipfw* M test/packaging/hipl-deb.spec M test/packaging/hipl-rpm.spec M test/packaging/rh-init.d-dnsproxy* M test/packaging/rh-init.d-hipd* M test/packaging/rh-init.d-hipfw* M test/performance/clock_test.awk* M test/performance/genstats.awk* M test/performance/parser.awk* M test/performance/stats.pl* M test/performance/switch-ip* M test/performance/visualize-daemon.sh* M tools/hipl_autobuild M tools/hosts.py* M tools/nsupdate.pl* Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: mkomu@halko-20100305125831-a8xbfxuhoppjsi4t)