Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: 14/05/2010 at 22:39:10 Revision: 3779 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 4507. Modified: D doc/openwrt/ D doc/openwrt/FoneraHack/ D doc/openwrt/FoneraHack/dropbear.html D doc/openwrt/FoneraHack/enableSSH.html D doc/openwrt/FoneraHack/lafonera.pdf D doc/openwrt/Page-Background.png D doc/openwrt/index.html D doc/openwrt/openwrt-hipl.pdf D hipd/pfkeyapi.c D lib/ipsec/ D lib/ipsec/ipsec_set_policy.3 D lib/ipsec/ipsec_strerror.3 D lib/ipsec/ipsec_strerror.c D lib/ipsec/ipsec_strerror.h D lib/ipsec/libpfkey.h D lib/ipsec/pfkey.c D lib/ipsec/pfkeyv2.h D lib/ipsec/policy_parse.c D lib/ipsec/policy_parse.h D lib/ipsec/policy_parse.y D lib/ipsec/policy_token.l D lib/tool/pfkeysadb.c D lib/tool/pfkeysadb.h D patches/kernel/2.6.22.6/pfkey_xfrmuser_interfamily-2.6.22.6.patch D patches/misc/ D patches/opendht/ D patches/opendht/bamboo-orig-cvs-2006-03-03-ipv6-luxiaopeng.diff D patches/opendht/bamboo_changes_TO_ipv4-20060303_FOR_fedora-script.diff D patches/opendht/bamboo_changes_TO_ipv6-20080612_FOR_fedora-script.diff D patches/opendht/bamboo_diff_FROM_ipv4-20060303_TO_ipv6-20080612.diff D patches/opendht/bamboo_fix_TO_ipv4-20060303_FOR_assertion.diff D patches/opendht/bamboo_fix_TO_ipv6-20080612_FOR_assertion.diff D patches/opendht/how-to-steps D patches/tcpdump/tcpdump-4.0.0-hip.01.patch D patches/tcpdump/tcpdump-4.0.0-hip.02.patch D patches/tcpdump/tcpdump-4.0.0-hip.03.patch D patches/tcpdump/tcpdump-4.0.0-hip.beta.patch D patches/wireshark/wireshark-1.1.0-hip-midauth-updated.patch D patches/wireshark/wireshark-1.1.0-hip-midauth.patch D patches/wireshark/wireshark-1.1.0-hip-updated.patch D patches/wireshark/wireshark-1.1.0-hip.patch D patches/wireshark/wireshark-1.1.0-i3-hi3.patch D patches/wireshark/wireshark-1.1.2-hip.patch D test/cleanincludesforgraph.py D test/docbook2doxygen.pl D test/graphviz_script.sh D test/subst-gpl.sh A packaging/debian-init.d/ A packaging/fedora-init.d/ R lib/core/hip_capability.c => lib/core/capability.c R lib/core/hip_capability.h => lib/core/capability.h R lib/core/hip_statistics.c => lib/core/statistics.c R lib/core/hip_statistics.h => lib/core/statistics.h R packaging/debian-init.d-dnsproxy => packaging/debian-init.d/dnsproxy R packaging/debian-init.d-hipd => packaging/debian-init.d/hipd R packaging/debian-init.d-hipfw => packaging/debian-init.d/hipfw R packaging/rh-init.d-dnsproxy => packaging/fedora-init.d/dnsproxy R packaging/rh-init.d-hipd => packaging/fedora-init.d/hipd R packaging/rh-init.d-hipfw => packaging/fedora-init.d/hipfw R patches/openwrt/ => packaging/openwrt/ R patches/wireshark/README.about.version-1.1.0 => patches/wireshark/README R tools/build-maemo.sh => packaging/build-maemo.sh R tools/esp_prot_config.cfg => firewall/esp_prot_config.cfg M .bzrignore M COPYING M INSTALL M Makefile.am M configure.ac M debian/rules M doc/HACKING M doc/HOWTO.xml M firewall/esp_prot_config.c M firewall/firewall.c M hipd/accessor.c M hipd/accessor.h M hipd/hadb.c M hipd/hipd.c M hipd/hit_to_ip.c M hipd/init.c M hipd/init.h M hipd/input.c M hipd/input.h M hipd/maintenance.h M hipd/netdev.c M hipd/nsupdate.c M hipd/oppdb.c M hipd/oppdb.h M hipd/user.c M lib/conf/conf.c M lib/conf/conf.h M lib/core/builder.c M lib/core/builder.h M lib/core/icomm.h M lib/core/prefix.h M lib/core/protodefs.h M lib/core/state.h M lib/tool/xfrmapi.c M modules/heartbeat/hipd/heartbeat.c M packaging/hipl-deb.spec M packaging/hipl-rpm.spec M packaging/openwrt/package/Makefile M packaging/openwrt/package/files/test/firewall.start M test/auth_performance.c M test/certteststub.c M test/hc_performance.c M tools/hipl_autobuild.sh M lib/core/capability.c M lib/core/capability.h M lib/core/statistics.c M lib/core/statistics.h M patches/wireshark/README Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: mircea.gherzan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)