Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: 25/03/2010 at 12:18:18 Revision: 1670 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: midauth Log: synchronized to trunk revision 4047 Modified: D firewall/lsi.c.doxyme D hipd/accessor.h.doxyme D hipd/blind.h.doxyme D hipd/bos.h.doxyme D hipd/cert.c.doxyme D hipd/cert.h.doxyme D hipd/close.h.doxyme D hipd/configfilereader.c.doxyme D hipd/configfilereader.h.doxyme D hipd/cookie.h.doxyme D hipd/dh.h.doxyme D hipd/hadb.h.doxyme D hipd/hadb_legacy.h.doxyme D hipd/hi3.h.doxyme D hipd/hidb.h.doxyme D hipd/hipd.h.doxyme D hipd/hiprelay.h.doxyme D hipd/init.h.doxyme D hipd/input.h.doxyme D hipd/keymat.h.doxyme D hipd/maintenance.h.doxyme D hipd/nat.c.doxyme D hipd/nat.h.doxyme D hipd/netdev.c.doxyme D hipd/netdev.h.doxyme D hipd/oppdb.h.doxyme D hipd/oppipdb.h.doxyme D hipd/output.c.doxyme D hipd/output.h.doxyme D hipd/pfkeyapi.c.doxyme D hipd/registration.c.doxyme D hipd/registration.h.doxyme D hipd/tcptimeout.c D hipd/tcptimeout.c.doxyme D hipd/tcptimeout.h D hipd/tcptimeout.h.doxyme D hipd/update.c.doxyme D hipd/update.h.doxyme D hipd/update_legacy.c.doxyme D hipd/update_legacy.h.doxyme D hipd/user.c.doxyme D hipd/user.h.doxyme D lib/core/builder.h.doxyme D lib/core/certtools.c.doxyme D lib/core/certtools.h.doxyme D lib/core/common_defines.h.doxyme D lib/core/debug.h.doxyme D lib/core/hashtable.h.doxyme D lib/core/hip_capability.h.doxyme D lib/core/icomm.h.doxyme D lib/core/ife.h.doxyme D lib/core/linkedlist.c.doxyme D lib/core/linkedlist.h.doxyme D lib/core/list.h.doxyme D lib/core/message.h.doxyme D lib/core/protodefs.h.doxyme D lib/core/sqlitedbapi.c.doxyme D lib/core/sqlitedbapi.h.doxyme D lib/core/state.h.doxyme D lib/tool/lutil.c.doxyme D lib/tool/nlink.c.doxyme D lib/tool/pk.c.doxyme D lib/tool/xfrmapi.c.doxyme R doc/COPYING => COPYING M Android.mk M Makefile.am M agent/agent.c M agent/connhipd.c M agent/gui_interface.c M agent/hitdb.c M agent/hitdb.h M agent/language.c M agent/str_var.c M agent/tools.c M doc/HOWTO.xml M doc/doxygen.h M doc/verbose-header-files.txt 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_api.c M firewall/esp_prot_api.h M firewall/esp_prot_config.c M firewall/esp_prot_config.h 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/esp_prot_fw_msg.h 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.c 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/opptcp.c M firewall/opptcp.h M firewall/pisa.c M firewall/pisa.h M firewall/pisa_cert.c M firewall/pisa_cert.h M firewall/proxy.h M firewall/proxyconndb.c M firewall/proxyconndb.h M firewall/proxydb.h M firewall/rule_management.c M firewall/rule_management.h M firewall/sysopp.c 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_fw_msg.h M firewall/user_ipsec_sadb.c M firewall/user_ipsec_sadb.h M hipd/accessor.h M hipd/blind.h M hipd/bos.h M hipd/cert.c M hipd/cert.h M hipd/close.h M hipd/cookie.h M hipd/dh.h M hipd/dht.c M hipd/dht.h M hipd/esp_prot_anchordb.c M hipd/esp_prot_anchordb.h M hipd/esp_prot_hipd_msg.c M hipd/esp_prot_hipd_msg.h M hipd/esp_prot_light_update.c M hipd/esp_prot_light_update.h M hipd/hadb.h M hipd/hadb_legacy.h M hipd/heartbeat.c M hipd/heartbeat.h M hipd/hi3.h M hipd/hidb.h M hipd/hipd.c M hipd/hipd.h M hipd/hit_to_ip.c M hipd/hit_to_ip.h M hipd/init.c M hipd/init.h M hipd/keymat.h M hipd/maintenance.h M hipd/netdev.c M hipd/netdev.h M hipd/nsupdate.c M hipd/nsupdate.h M hipd/oppdb.h M hipd/pfkeyapi.h M hipd/pisa.c M hipd/pisa.h M hipd/registration.c M hipd/update.c M hipd/update_legacy.c M hipd/update_legacy.h M hipd/user.c M hipd/user.h M hipd/user_ipsec_hipd_msg.c M hipd/user_ipsec_hipd_msg.h M hipd/user_ipsec_sadb_api.c M hipd/user_ipsec_sadb_api.h M i3/utils/netwrap.h M lib/conf/hipconf.c M lib/core/builder.c M lib/core/certtools.c M lib/core/certtools.h M lib/core/common_defines.h M lib/core/crypto.c M lib/core/crypto.h M lib/core/debug.h M lib/core/esp_prot_common.h M lib/core/filemanip.h M lib/core/hashchain.c M lib/core/hashchain.h M lib/core/hashchain_store.c M lib/core/hashchain_store.h M lib/core/hashtable.h M lib/core/hashtree.c M lib/core/hashtree.h M lib/core/hip_statistics.c M lib/core/hip_statistics.h M lib/core/hip_udp.h M lib/core/hit.h M lib/core/hostid.h M lib/core/hostsfiles.h M lib/core/icomm.h M lib/core/ife.h M lib/core/keylen.h M lib/core/list.h M lib/core/prefix.h M lib/core/protodefs.h M lib/core/solve.h M lib/core/sqlitedbapi.c M lib/core/sqlitedbapi.h M lib/core/straddr.h M lib/core/transform.h M lib/dht/libhipdht.c M lib/dht/libhipdht.h M lib/dht/libhipdhtxml.c M lib/dht/libhipdhtxml.h M lib/gui/create.c M lib/gui/dragndrop.c M lib/gui/events.c M lib/gui/hipgui.c M lib/gui/tools.c M lib/gui/widgets.c M lib/opphip/wrap_db.h M lib/performance/performance.h M lib/tool/lutil.c M lib/tool/nlink.c M lib/tool/pfkeysadb.c M lib/tool/pk.c M lib/tool/xfrmapi.c M release.version M test/auth_performance.c M test/certteststub.c M test/conntest-client-hip.c M test/conntest-client-native.c M test/conntest-client-opp.c M test/conntest-server.c M test/conntest.c M test/conntest.h M test/cookietest.c M test/demo/stdinclient.c M test/demo/stdinserver.c M test/dhtteststub.c M test/hadb_deprecated.c M test/hadb_old.c M test/hadb_old.h M test/hashtest.c M test/hc_performance.c M test/keygentest.c M test/listtest.c M test/misc_install.c M test/misc_install.h M test/performance/cookiesolver.c M test/sqliteteststub.c M tools/hipl_autobuild M tools/pisacert.c M verbose-headers.txt M COPYING Merge from following parent revisions and branches: - midauth (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)