[hipl-commit] [esp] Rev 2336: synchronized to trunk revision 4117

  • From: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 31 Mar 2010 15:18:11 +0300

Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
Date: 31/03/2010 at 15:18:11
Revision: 2336 [merge]
Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: esp

Log:
  synchronized to trunk revision 4117

Modified:
  D  Android.mk
  D  autogen.sh
  D  check_header_verbosity.sh
  D  doc/README
  D  doc/acronyms.tex
  D  doc/agent-gui-doc.odt
  D  doc/catalogue.tex
  D  doc/crypto.txt
  D  doc/daemon-agent-gui.odg
  D  doc/design_choices.bib
  D  doc/design_choices.tex
  D  doc/design_choices_macros.tex
  D  doc/fig/
  D  doc/fig/absproto.fig
  D  doc/fig/base_exchange.fig
  D  doc/fig/bind_diagram.fig
  D  doc/fig/collaboration.fig
  D  doc/fig/connect_diagram.fig
  D  doc/fig/hooks.fig
  D  doc/fig/input.fig
  D  doc/fig/kernel_model.fig
  D  doc/fig/mm-update.fig
  D  doc/fig/output.fig
  D  doc/fig/rea.fig
  D  doc/fig/recv_diagram.fig
  D  doc/fig/send_diagram.fig
  D  doc/fig/stack_model.fig
  D  doc/hip-state/
  D  doc/hip-state/hip-state-e0.dia
  D  doc/hip-state/hip-state-e1.dia
  D  doc/hip-state/hip-state-e2.dia
  D  doc/hip-state/hip-state-e3.dia
  D  doc/hip-state/hip-state-e4a.dia
  D  doc/hip-state/hip-state-e4b.dia
  D  doc/hipl.tex
  D  doc/src-chgs-filelist
  D  doc/testing.txt
  D  doc/userspace.txt
  D  doc/verbose-header-files.txt
  D  doc/verbose-headers.txt
  D  i3/utils/fwint.h
  D  lib/android/
  D  lib/android/icmp6.h
  D  lib/android/libhipandroid.c
  D  lib/android/libhipandroid.h
  D  lib/android/libipq.c
  D  lib/android/regex.c
  D  lib/android/regex.h
  D  tcp
  D  test/HipUserkeyClient.java
  D  test/maintainer/fix-archive-perms
  D  test/maintainer/fixate-hipl-tla
  D  test/maintainer/gen-archzoom-cache
  D  test/maintainer/tla-clean-up
  D  test/maintainer/tla-find-revision-locks
  D  test/maintainer/tla-update-cachedrevs
  D  test/maintainer/tla-update-hipl
  D  test/maintainer/viewarch-update
  D  test/patch/
  D  test/tla-hook
  D  verbose-headers.txt
  A  INSTALL
  R  i3-cfg-PL.xml => i3/i3-cfg-PL.xml
  R  i3/aeshash/aescpp.h => i3/aeshash/aescpp.hh
  M  COPYING
  M  Makefile.am
  M  configure.ac
  M  doc/Doxyfile
  M  doc/HACKING
  M  doc/HOWTO.xml
  M  doc/Makefile
  M  doc/doxygen.h
  M  firewall/esp_prot_api.c
  M  firewall/esp_prot_config.c
  M  firewall/esp_prot_fw_msg.c
  M  firewall/firewall.c
  M  firewall/pisa.c
  M  firewall/proxydb.c
  M  firewall/rule_management.c
  M  firewall/user_ipsec_api.c
  M  firewall/user_ipsec_esp.c
  M  firewall/user_ipsec_sadb.c
  M  firewall/user_ipsec_sadb.h
  M  hipd/cookie.c
  M  hipd/dhtqueue.c
  M  hipd/hadb.c
  M  hipd/hi3.c
  M  hipd/hiprelay.c
  M  hipd/init.c
  M  hipd/maintenance.c
  M  hipd/nat.c
  M  hipd/nsupdate.c
  M  hipd/pfkeyapi.c
  M  hipd/registration.c
  M  hipd/update.c
  M  i3/aeshash/aesopt.h
  M  i3/chord/eprintf.h
  M  i3/chord/util.c
  M  i3/i3/i3.h
  M  i3/i3/i3_addr.c
  M  i3/i3/i3_addr.h
  M  i3/i3/i3_config.c
  M  i3/i3/i3_header.c
  M  i3/i3/i3_header.h
  M  i3/i3/i3_id.c
  M  i3/i3/i3_options.c
  M  i3/i3/i3_options.h
  M  i3/i3/i3_ping.h
  M  i3/i3/i3_stack.c
  M  i3/i3/i3_stack.h
  M  i3/i3/i3_trigger.c
  M  i3/i3/i3_trigger.h
  M  i3/i3/token_bucket.c
  M  i3/i3/token_bucket.h
  M  i3/i3_client/coordinates.h
  M  i3/i3_client/i3_client_api.c
  M  i3/i3_client/i3_client_callback.h
  M  i3/i3_client/i3_client_context.c
  M  i3/i3_client/i3_client_fd.h
  M  i3/i3_client/i3_client_id.c
  M  i3/i3_client/i3_client_id.h
  M  i3/i3_client/i3_client_pkt.h
  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.h
  M  i3/i3_client/ping_thread.c
  M  i3/i3_client/qsort.h
  M  i3/utils/byteorder.c
  M  i3/utils/byteorder.h
  M  i3/utils/event.c
  M  i3/utils/event.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_win32.c
  M  lib/core/crypto.c
  M  lib/core/filemanip.h
  M  lib/core/hip_udp.c
  M  lib/gui/hipgui.h
  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/ipsec/policy_parse.y
  M  lib/ipsec/policy_token.l
  M  lib/opphip/wrap_db.c
  M  lib/opphip/wrap_db.h
  M  lib/tool/checksum.h
  M  lib/tool/pfkeysadb.c
  M  lib/tool/pfkeysadb.h
  M  lib/tool/xfrmapi.c
  M  patches/openwrt/package/Makefile
  M  test/maintainer/sync-all
  M  test/misc_install.c
  M  test/packaging/create-deb.sh
  M  test/packaging/create-package.sh
  M  test/packaging/hipl-deb.spec
  M  test/packaging/hipl-rpm.spec
  M  tools/hipl_autobuild.sh

Merge from following parent revisions and branches:
  - esp   (parent-id: 
rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    
  - trunk         (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    

Other related posts:

  • » [hipl-commit] [esp] Rev 2336: synchronized to trunk revision 4117 - Rene Hummen