[hipl-commit] [packaging] Rev 3586: Synchronized to trunk revision 3617

  • From: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 12 Feb 2010 12:48:32 +0200

Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
Date: Fri Feb 12 11:47:40 2010 +0100
Revision: 3586 [merge]
Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: packaging

Log:
  Synchronized to trunk revision 3617
  
  Also needed to remove some more TABs for the commit to go through

Modified:
  D  firewall/firewalldb.c.doxyme
  D  test/sockets_API_statistics/
  D  test/sockets_API_statistics/README
  D  test/sockets_API_statistics/conf_reader.py
  D  test/sockets_API_statistics/database_engine.py
  D  test/sockets_API_statistics/directory_walking.py
  D  test/sockets_API_statistics/egrep_regular_expression
  D  test/sockets_API_statistics/fetch_files.py
  D  test/sockets_API_statistics/file_input.py
  D  test/sockets_API_statistics/run.py
  D  test/sockets_API_statistics/search_engine.py
  D  test/sockets_API_statistics/sockets_analysis.conf
  D  test/sockets_API_statistics/string_token.py
  D  test/sockets_API_statistics/test.c
  D  test/sockets_API_statistics/test.py
  A  dot_uncrustify.cfg
  M  agent/agent.c
  M  agent/agent.h
  M  agent/connhipd.c
  M  agent/connhipd.h
  M  agent/gui_interface.c
  M  agent/gui_interface.h
  M  agent/hitdb.c
  M  agent/hitdb.h
  M  agent/lang_english.h
  M  agent/lang_finnish.h
  M  agent/language.c
  M  agent/language.h
  M  agent/str_var.c
  M  agent/str_var.h
  M  agent/tools.c
  M  agent/tools.h
  M  configure.ac
  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_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.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.c
  M  firewall/helpers.c.doxyme
  M  firewall/helpers.h
  M  firewall/hslist.c
  M  firewall/hslist.c.doxyme
  M  firewall/hslist.h
  M  firewall/lsi.c
  M  firewall/lsi.c.doxyme
  M  firewall/lsi.h
  M  firewall/midauth.c
  M  firewall/midauth.c.doxyme
  M  firewall/midauth.h
  M  firewall/opptcp.c
  M  firewall/opptcp.c.doxyme
  M  firewall/opptcp.h
  M  firewall/pisa.c
  M  firewall/pisa.c.doxyme
  M  firewall/pisa.h
  M  firewall/pisa_cert.c
  M  firewall/pisa_cert.c.doxyme
  M  firewall/pisa_cert.h
  M  firewall/proxy.c
  M  firewall/proxy.c.doxyme
  M  firewall/proxy.h
  M  firewall/proxyconndb.c
  M  firewall/proxyconndb.h
  M  firewall/proxydb.c
  M  firewall/proxydb.c.doxyme
  M  firewall/proxydb.h
  M  firewall/rule_management.c
  M  firewall/rule_management.c.doxyme
  M  firewall/rule_management.h
  M  firewall/sava_api.c
  M  firewall/sava_api.h
  M  firewall/savah_gateway.c
  M  firewall/savah_gateway.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.c.doxyme
  M  firewall/user_ipsec_fw_msg.h
  M  firewall/user_ipsec_sadb.c
  M  firewall/user_ipsec_sadb.h
  M  hipd/accessor.c
  M  hipd/accessor.c.doxyme
  M  hipd/accessor.h
  M  hipd/accessor.h.doxyme
  M  hipd/blind.c
  M  hipd/blind.c.doxyme
  M  hipd/blind.h
  M  hipd/blind.h.doxyme
  M  hipd/bos.c
  M  hipd/bos.c.doxyme
  M  hipd/bos.h
  M  hipd/bos.h.doxyme
  M  hipd/cert.c
  M  hipd/cert.c.doxyme
  M  hipd/cert.h
  M  hipd/cert.h.doxyme
  M  hipd/close.c
  M  hipd/close.c.doxyme
  M  hipd/close.h.doxyme
  M  hipd/configfilereader.c
  M  hipd/configfilereader.c.doxyme
  M  hipd/configfilereader.h
  M  hipd/configfilereader.h.doxyme
  M  hipd/cookie.c
  M  hipd/cookie.c.doxyme
  M  hipd/cookie.h
  M  hipd/cookie.h.doxyme
  M  hipd/dh.c
  M  hipd/dh.c.doxyme
  M  hipd/dh.h
  M  hipd/dh.h.doxyme
  M  hipd/dht.c
  M  hipd/dhtqueue.c
  M  hipd/dhtqueue.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.c
  M  hipd/hadb.c.doxyme
  M  hipd/hadb.h
  M  hipd/hadb.h.doxyme
  M  hipd/hadb_legacy.c
  M  hipd/hadb_legacy.c.doxyme
  M  hipd/hadb_legacy.h
  M  hipd/hadb_legacy.h.doxyme
  M  hipd/heartbeat.c
  M  hipd/hi3.c
  M  hipd/hi3.c.doxyme
  M  hipd/hi3.h
  M  hipd/hi3.h.doxyme
  M  hipd/hidb.c
  M  hipd/hidb.c.doxyme
  M  hipd/hidb.h
  M  hipd/hidb.h.doxyme
  M  hipd/hipd.c
  M  hipd/hipd.c.doxyme
  M  hipd/hipd.h
  M  hipd/hipd.h.doxyme
  M  hipd/hipqueue.c.doxyme
  M  hipd/hipqueue.h.doxyme
  M  hipd/hiprelay.c
  M  hipd/hiprelay.c.doxyme
  M  hipd/hiprelay.h
  M  hipd/hiprelay.h.doxyme
  M  hipd/hit_to_ip.c
  M  hipd/hit_to_ip.h
  M  hipd/icookie.c
  M  hipd/icookie.c.doxyme
  M  hipd/icookie.h.doxyme
  M  hipd/init.c
  M  hipd/init.c.doxyme
  M  hipd/init.h
  M  hipd/init.h.doxyme
  M  hipd/input.c
  M  hipd/input.c.doxyme
  M  hipd/input.h
  M  hipd/input.h.doxyme
  M  hipd/keymat.c
  M  hipd/keymat.c.doxyme
  M  hipd/keymat.h
  M  hipd/keymat.h.doxyme
  M  hipd/maintenance.c
  M  hipd/maintenance.c.doxyme
  M  hipd/maintenance.h
  M  hipd/maintenance.h.doxyme
  M  hipd/nat.c
  M  hipd/nat.c.doxyme
  M  hipd/nat.h
  M  hipd/nat.h.doxyme
  M  hipd/netdev.c
  M  hipd/netdev.c.doxyme
  M  hipd/netdev.h
  M  hipd/netdev.h.doxyme
  M  hipd/nsupdate.c
  M  hipd/nsupdate.h
  M  hipd/oppdb.c
  M  hipd/oppdb.c.doxyme
  M  hipd/oppdb.h
  M  hipd/oppdb.h.doxyme
  M  hipd/oppipdb.c
  M  hipd/oppipdb.c.doxyme
  M  hipd/oppipdb.h
  M  hipd/oppipdb.h.doxyme
  M  hipd/output.c
  M  hipd/output.c.doxyme
  M  hipd/output.h
  M  hipd/output.h.doxyme
  M  hipd/pfkeyapi.c
  M  hipd/pfkeyapi.c.doxyme
  M  hipd/pisa.c
  M  hipd/pisa.c.doxyme
  M  hipd/pisa.h.doxyme
  M  hipd/registration.c
  M  hipd/registration.c.doxyme
  M  hipd/registration.h
  M  hipd/registration.h.doxyme
  M  hipd/tcptimeout.c
  M  hipd/tcptimeout.c.doxyme
  M  hipd/tcptimeout.h
  M  hipd/tcptimeout.h.doxyme
  M  hipd/update.c
  M  hipd/update.c.doxyme
  M  hipd/update.h
  M  hipd/update.h.doxyme
  M  hipd/update_legacy.c
  M  hipd/update_legacy.c.doxyme
  M  hipd/update_legacy.h.doxyme
  M  hipd/user.c
  M  hipd/user.c.doxyme
  M  hipd/user.h
  M  hipd/user.h.doxyme
  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/aeshash/aes.h
  M  i3/aeshash/aescpp.h
  M  i3/aeshash/aescrypp.c
  M  i3/aeshash/aescrypt.c
  M  i3/aeshash/aeshash.c
  M  i3/aeshash/aeskey.c
  M  i3/aeshash/aeskeypp.c
  M  i3/aeshash/aesopt.h
  M  i3/aeshash/aestab.c
  M  i3/chord/api.c
  M  i3/chord/chord.c
  M  i3/chord/chord.h
  M  i3/chord/chord_api.h
  M  i3/chord/chord_getfingers.c
  M  i3/chord/chord_traceroute.c
  M  i3/chord/debug.h
  M  i3/chord/eprintf.c
  M  i3/chord/eprintf.h
  M  i3/chord/finger.c
  M  i3/chord/gen_conf.c
  M  i3/chord/gen_conf_same.c
  M  i3/chord/hosts.c
  M  i3/chord/join.c
  M  i3/chord/pack.c
  M  i3/chord/process.c
  M  i3/chord/sendpkt.c
  M  i3/chord/stabilize.c
  M  i3/chord/test.c
  M  i3/chord/util.c
  M  i3/i3/debug_fns.h
  M  i3/i3/i3.h
  M  i3/i3/i3_addr.c
  M  i3/i3/i3_addr.h
  M  i3/i3/i3_api.c
  M  i3/i3/i3_api.h
  M  i3/i3/i3_config.c
  M  i3/i3/i3_config.h
  M  i3/i3/i3_debug.c
  M  i3/i3/i3_debug.h
  M  i3/i3/i3_fun.h
  M  i3/i3/i3_header.c
  M  i3/i3/i3_header.h
  M  i3/i3/i3_id.c
  M  i3/i3/i3_id.h
  M  i3/i3/i3_misc.c
  M  i3/i3/i3_misc.h
  M  i3/i3/i3_options.c
  M  i3/i3/i3_options.h
  M  i3/i3/i3_ping.c
  M  i3/i3/i3_ping.h
  M  i3/i3/i3_stack.c
  M  i3/i3/i3_stack.h
  M  i3/i3/i3_tcp_fns.c
  M  i3/i3/i3_tcp_fns.h
  M  i3/i3/i3_trigger.c
  M  i3/i3/i3_trigger.h
  M  i3/i3/i3_utils.c
  M  i3/i3/i3_utils.h
  M  i3/i3/token_bucket.c
  M  i3/i3/token_bucket.h
  M  i3/i3_client/coordinates.c
  M  i3/i3_client/coordinates.h
  M  i3/i3_client/downhill_simplex.c
  M  i3/i3_client/downhill_simplex.h
  M  i3/i3_client/http.c
  M  i3/i3_client/http.h
  M  i3/i3_client/i3_client.h
  M  i3/i3_client/i3_client_api.c
  M  i3/i3_client/i3_client_api.h
  M  i3/i3_client/i3_client_api_ctx.c
  M  i3/i3_client/i3_client_api_ctx.h
  M  i3/i3_client/i3_client_api_ext.c
  M  i3/i3_client/i3_client_callback.c
  M  i3/i3_client/i3_client_callback.h
  M  i3/i3_client/i3_client_context.c
  M  i3/i3_client/i3_client_context.h
  M  i3/i3_client/i3_client_fd.c
  M  i3/i3_client/i3_client_fd.h
  M  i3/i3_client/i3_client_fun.h
  M  i3/i3_client/i3_client_id.c
  M  i3/i3_client/i3_client_id.h
  M  i3/i3_client/i3_client_params.h
  M  i3/i3_client/i3_client_pkt.c
  M  i3/i3_client/i3_client_pkt.h
  M  i3/i3_client/i3_client_timer.c
  M  i3/i3_client/i3_client_timer.h
  M  i3/i3_client/i3_client_trigger.c
  M  i3/i3_client/i3_client_trigger.h
  M  i3/i3_client/i3server_list.c
  M  i3/i3_client/i3server_list.h
  M  i3/i3_client/ping.c
  M  i3/i3_client/ping.h
  M  i3/i3_client/ping_thread.c
  M  i3/i3_client/ping_thread.h
  M  i3/i3_client/qsort.c
  M  i3/utils/byteorder.c
  M  i3/utils/byteorder.h
  M  i3/utils/eprintf.c
  M  i3/utils/eprintf.h
  M  i3/utils/event.c
  M  i3/utils/event.h
  M  i3/utils/fwint.h
  M  i3/utils/gen_utils.c
  M  i3/utils/gen_utils.h
  M  i3/utils/inetfns.c
  M  i3/utils/inetfns.h
  M  i3/utils/netwrap.h
  M  i3/utils/netwrap_posix.c
  M  i3/utils/netwrap_win32.c
  M  i3/utils/utils.h
  M  lib/conf/hipconf.c
  M  lib/conf/hipconf.h
  M  lib/core/builder.c
  M  lib/core/builder.c.doxyme
  M  lib/core/builder.h
  M  lib/core/builder.h.doxyme
  M  lib/core/certtools.c
  M  lib/core/certtools.c.doxyme
  M  lib/core/certtools.h
  M  lib/core/certtools.h.doxyme
  M  lib/core/common_defines.h
  M  lib/core/common_defines.h.doxyme
  M  lib/core/debug.c
  M  lib/core/debug.c.doxyme
  M  lib/core/debug.h
  M  lib/core/debug.h.doxyme
  M  lib/core/esp_prot_common.c
  M  lib/core/esp_prot_common.h
  M  lib/core/getendpointinfo.c
  M  lib/core/getendpointinfo.c.doxyme
  M  lib/core/getendpointinfo.h
  M  lib/core/getendpointinfo.h.doxyme
  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.c
  M  lib/core/hashtable.c.doxyme
  M  lib/core/hashtable.h
  M  lib/core/hashtable.h.doxyme
  M  lib/core/hashtree.c
  M  lib/core/hashtree.h
  M  lib/core/hip_capability.c
  M  lib/core/hip_capability.c.doxyme
  M  lib/core/hip_capability.h
  M  lib/core/hip_capability.h.doxyme
  M  lib/core/hip_statistics.c
  M  lib/core/hip_statistics.c.doxyme
  M  lib/core/hip_statistics.h
  M  lib/core/hip_statistics.h.doxyme
  M  lib/core/icomm.h
  M  lib/core/icomm.h.doxyme
  M  lib/core/ife.h
  M  lib/core/ife.h.doxyme
  M  lib/core/kerncompat.h
  M  lib/core/kerncompat.h.doxyme
  M  lib/core/linkedlist.c
  M  lib/core/linkedlist.c.doxyme
  M  lib/core/linkedlist.h
  M  lib/core/linkedlist.h.doxyme
  M  lib/core/list.h
  M  lib/core/list.h.doxyme
  M  lib/core/message.c
  M  lib/core/message.c.doxyme
  M  lib/core/message.h
  M  lib/core/message.h.doxyme
  M  lib/core/misc.c
  M  lib/core/misc.c.doxyme
  M  lib/core/misc.h
  M  lib/core/misc.h.doxyme
  M  lib/core/protodefs.h
  M  lib/core/protodefs.h.doxyme
  M  lib/core/sqlitedbapi.c
  M  lib/core/sqlitedbapi.c.doxyme
  M  lib/core/sqlitedbapi.h
  M  lib/core/sqlitedbapi.h.doxyme
  M  lib/core/state.h
  M  lib/core/state.h.doxyme
  M  lib/core/utils.c
  M  lib/core/utils.c.doxyme
  M  lib/core/utils.h
  M  lib/core/utils.h.doxyme
  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/dragndrop.h
  M  lib/gui/events.c
  M  lib/gui/events.h
  M  lib/gui/hipgui.c
  M  lib/gui/hipgui.h
  M  lib/gui/tools.c
  M  lib/gui/tools.h
  M  lib/gui/widgets.c
  M  lib/gui/widgets.h
  M  lib/ipsec/ipsec_strerror.c
  M  lib/ipsec/ipsec_strerror.h
  M  lib/ipsec/libpfkey.h
  M  lib/ipsec/pfkey.c
  M  lib/ipsec/policy_parse.h
  M  lib/opphip/wrap.c
  M  lib/opphip/wrap_db.c
  M  lib/opphip/wrap_db.h
  M  lib/performance/performance.c
  M  lib/performance/performance.h
  M  lib/tool/crypto.c
  M  lib/tool/crypto.c.doxyme
  M  lib/tool/crypto.h
  M  lib/tool/lutil.c
  M  lib/tool/lutil.c.doxyme
  M  lib/tool/lutil.h
  M  lib/tool/nlink.c
  M  lib/tool/nlink.c.doxyme
  M  lib/tool/nlink.h
  M  lib/tool/pk.c
  M  lib/tool/pk.c.doxyme
  M  lib/tool/xfrmapi.c
  M  lib/tool/xfrmapi.c.doxyme
  M  lib/tool/xfrmapi.h
  M  test/HipClient.java
  M  test/HipServer.java
  M  test/HipUserkeyClient.java
  M  test/auth_performance.c
  M  test/certteststub.c
  M  test/conntest-client-hip.c
  M  test/conntest-client-native-user-key.c
  M  test/conntest-client-native.c
  M  test/conntest-client-opp.c
  M  test/conntest-server-native.c
  M  test/conntest-server.c
  M  test/conntest.c
  M  test/conntest.h
  M  test/cookietest.c
  M  test/dh_performance.c
  M  test/dhtteststub.c
  M  test/first_test.c
  M  test/hadb_deprecated.c
  M  test/hadb_old.c
  M  test/hashtest.c
  M  test/hc_performance.c
  M  test/hipsetup.c
  M  test/keygentest.c
  M  test/listtest.c
  M  test/misc_install.c
  M  test/sqliteteststub.c
  M  tools/hipconftool.c
  M  tools/pisacert.c

Merge from following parent revisions and branches:
  - packaging     (parent-id: hummen@scratchy-20100210204442-qu3g7to1bsbwcl6u)  
  
  - trunk         (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    

Other related posts:

  • » [hipl-commit] [packaging] Rev 3586: Synchronized to trunk revision 3617 - Rene Hummen