Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: 23/04/2010 at 18:11:31 Revision: 3768 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 4405. Modified: D test/configs/ D test/configs/CONFIG_2_6_9 D test/configs/CONFIG_KNOPPIX_2_6_9 D test/configs/README D test/configs/config-2.6.10-1.770_FC3_HIP R Doxyfile.in => doc/Doxyfile.in M .bzrignore M INSTALL M Makefile.am M configure.ac M doc/HACKING M doc/HOWTO.xml M doc/doxygen.h M firewall/cache.c M firewall/cache.h M firewall/cache_port.c M firewall/cache_port.h M firewall/common_hipd_msg.c M firewall/common_hipd_msg.h M firewall/common_types.h M firewall/conntrack.c M firewall/conntrack.h M firewall/datapkt.c M firewall/datapkt.h M firewall/dlist.c M firewall/dlist.h M firewall/esp_prot_config.c M firewall/esp_prot_conntrack.c M firewall/esp_prot_conntrack.h M firewall/esp_prot_defines.h M firewall/esp_prot_fw_msg.c M firewall/firewall.c M firewall/firewall.h M firewall/firewall_control.c M firewall/firewall_control.h M firewall/firewall_defines.h M firewall/firewalldb.c M firewall/firewalldb.h M firewall/helpers.h M firewall/hslist.c M firewall/hslist.h M firewall/lsi.c M firewall/lsi.h M firewall/midauth.c M firewall/midauth.h M firewall/pisa.c M firewall/pisa.h M firewall/pisa_cert.h M firewall/rule_management.c M firewall/rule_management.h M firewall/sysopp.h M firewall/user_ipsec_api.c M firewall/user_ipsec_api.h M firewall/user_ipsec_esp.c M firewall/user_ipsec_esp.h M firewall/user_ipsec_fw_msg.c M firewall/user_ipsec_sadb.c M hipd/accessor.c M hipd/accessor.h M hipd/bos.c M hipd/bos.h M hipd/cert.c M hipd/cert.h M hipd/close.c M hipd/close.h M hipd/configfilereader.c M hipd/configfilereader.h M hipd/cookie.c M hipd/cookie.h M hipd/dh.h M hipd/esp_prot_anchordb.c M hipd/esp_prot_hipd_msg.c M hipd/hadb.c M hipd/hadb.h M hipd/hadb_legacy.c M hipd/hadb_legacy.h M hipd/hidb.c M hipd/hidb.h M hipd/hipd.c M hipd/hipd.h M hipd/hiprelay.c M hipd/hiprelay.h M hipd/init.c M hipd/init.h M hipd/input.c M hipd/input.h M hipd/keymat.c M hipd/keymat.h M hipd/maintenance.c M hipd/maintenance.h M hipd/nat.h M hipd/netdev.c M hipd/netdev.h M hipd/nsupdate.c M hipd/oppdb.c M hipd/oppdb.h M hipd/oppipdb.c M hipd/output.c M hipd/output.h M hipd/pfkeyapi.c M hipd/pfkeyapi.h M hipd/pisa.c M hipd/pisa.h M hipd/pkt_handling.c M hipd/registration.c M hipd/registration.h M hipd/user.c M hipd/user.h M hipd/user_ipsec_hipd_msg.c M lib/conf/hipconf.c M lib/conf/hipconf.h M lib/core/builder.c M lib/core/builder.h M lib/core/certtools.c M lib/core/certtools.h M lib/core/common_defines.h M lib/core/crypto.h M lib/core/debug.c M lib/core/debug.h M lib/core/filemanip.c M lib/core/filemanip.h M lib/core/hashchain.c M lib/core/hashchain_store.c M lib/core/hashtable.c M lib/core/hashtable.h M lib/core/hashtree.c M lib/core/hip_capability.c M lib/core/hip_capability.h M lib/core/hip_statistics.h M lib/core/hip_udp.h M lib/core/hit.h M lib/core/hostid.c M lib/core/hostid.h M lib/core/hostsfiles.c M lib/core/hostsfiles.h M lib/core/icomm.h M lib/core/ife.h M lib/core/keylen.h M lib/core/linkedlist.c M lib/core/linkedlist.h M lib/core/list.h M lib/core/message.c M lib/core/message.h M lib/core/performance.c M lib/core/performance.h M lib/core/prefix.h M lib/core/protodefs.h M lib/core/solve.c M lib/core/solve.h M lib/core/state.h M lib/core/straddr.c M lib/core/straddr.h M lib/core/transform.h M lib/core/util.c M lib/ipsec/ipsec_strerror.h M lib/ipsec/libpfkey.h M lib/ipsec/pfkey.c M lib/ipsec/policy_parse.c M lib/ipsec/policy_parse.h M lib/tool/checksum.h M lib/tool/lutil.c M lib/tool/lutil.h M lib/tool/nlink.c M lib/tool/nlink.h M lib/tool/pfkeysadb.c M lib/tool/pfkeysadb.h M lib/tool/pk.c M lib/tool/xfrmapi.c M lib/tool/xfrmapi.h M modules/heartbeat/hipd/heartbeat.h M modules/update/hipd/update.c M modules/update/hipd/update.h M modules/update/hipd/update_legacy.c M modules/update/hipd/update_legacy.h M test/auth_performance.c M test/certteststub.c M test/dh_performance.c M test/hc_performance.c M test/packaging/hipl-deb.spec M test/packaging/hipl-rpm.spec M test/performance/cookiesolver.c M tools/hipconftool.c M tools/pisacert.c M doc/Doxyfile.in Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)