[hipl-commit] [update] Rev 492: synchronized to trunk revision 3778

  • From: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 3 Mar 2010 15:17:03 +0200

Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
Date: Wed Mar 03 14:16:18 2010 +0100
Revision: 492 [merge]
Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: update

Log:
  synchronized to trunk revision 3778

Modified:
  D  hipd/input.c.doxyme
  D  lib/core/builder.c.doxyme
  D  lib/core/debug.c.doxyme
  D  lib/core/hashtable.c.doxyme
  D  lib/core/hip_capability.c.doxyme
  D  lib/core/message.c.doxyme
  D  lib/core/utils.c.doxyme
  A  .vimrc
  A  tools/hipl_autobuild
  R  lib/core/utils.c => lib/core/prefix.c
  R  lib/core/utils.h => lib/core/prefix.h
  M  .bzrignore
  M  Makefile.am
  M  agent/agent.c
  M  agent/connhipd.c
  M  agent/english-example.lang
  M  autogen.sh
  M  check_header_verbosity.sh*
  M  configure.ac
  M  debian/cron.d.ex
  M  debian/emacsen-startup.ex
  M  debian/init.d.ex
  M  debian/manpage.sgml.ex
  M  debian/manpage.xml.ex
  M  debian/rules
  M  doc/HACKING
  M  doc/HOWTO.xml
  M  doc/Makefile
  M  doc/TODO
  M  doc/crypto.txt
  M  doc/design_choices.tex
  M  doc/drafts/draft-ietf-hip-arch-02.txt
  M  doc/drafts/draft-ietf-hip-base-00.txt
  M  doc/drafts/draft-ietf-hip-base-01.txt
  M  doc/drafts/draft-ietf-hip-mm-01.txt
  M  doc/drafts/draft-moskowitz-hip-05.txt
  M  doc/drafts/draft-moskowitz-hip-10-pre4.txt
  M  doc/drafts/draft-moskowitz-hip-impl-01.txt
  M  doc/drafts/draft-nikander-esp-beet-mode-03.txt
  M  doc/drafts/draft-nikander-hip-mm-01.txt
  M  doc/drafts/draft-nikander-hip-mm-02.txt
  M  doc/hip-php-test-site.php
  M  doc/openwrt/FoneraHack/dropbear.html
  M  doc/openwrt/FoneraHack/enableSSH.html
  M  doc/openwrt/index.html
  M  doc/reg_lifetimes.txt
  M  doc/userspace.txt
  M  firewall/cache.c
  M  firewall/cache.h
  M  firewall/firewall.c
  M  firewall/firewall_control.c
  M  firewall/firewalldb.c
  M  firewall/helpers.c
  M  firewall/lsi.c
  M  firewall/lsi.h
  M  firewall/proxy.c
  M  firewall/proxyconndb.c
  M  firewall/rule_management.c
  M  firewall/sava_api.c
  M  firewall/savah_gateway.h
  M  firewall/user_ipsec_esp.c
  M  hipd/accessor.c
  M  hipd/cert.c
  M  hipd/cookie.c
  M  hipd/hadb.c
  M  hipd/heartbeat.c
  M  hipd/hipd.c
  M  hipd/hiprelay.c
  M  hipd/hit_to_ip.c
  M  hipd/hit_to_ip.h
  M  hipd/init.c
  M  hipd/init.h
  M  hipd/input.c
  M  hipd/input.h
  M  hipd/maintenance.c
  M  hipd/maintenance.h
  M  hipd/netdev.c
  M  hipd/netdev.h
  M  hipd/oppdb.c
  M  hipd/oppdb.h
  M  hipd/output.c
  M  hipd/pfkeyapi.c
  M  hipd/tcptimeout.c
  M  hipext/src/content/hipext.css
  M  hipfwmi/ConfigurationInterface.py*
  M  hipfwmi/Makefile.am
  M  hipfwmi/Makefile.old
  M  hipfwmi/ManagementConsole.py*
  M  hipfwmi/ManagementLogic.py*
  M  hipfwmi/Rules.py
  M  hipfwmi/report.tex
  M  hipfwmi/rulefile.ebnf
  M  hipfwmi/test/test_all.py
  M  hipsock/Makefile
  M  hipsock/debug.h
  M  hipsock/eid_db.c
  M  i3-cfg-PL.xml
  M  jip/HipAddress.java
  M  jip/HipServerSocket.java
  M  jip/HipServerSocketFactory.java
  M  jip/HipSocket.java
  M  jip/HipSocketFactory.java
  M  jip/HipSocketImpl.java
  M  jip/HipSocketImplFactory.java
  M  jip/Makefile
  M  jip/NativeInputStream.java
  M  jip/NativeOutputStream.java
  M  jip/hip-address.c
  M  jip/hip-socket-impl.c
  M  jip/hip-socket.c
  M  jip/native-stream.c
  M  lib/android/icmp6.h
  M  lib/android/libhipandroid.c
  M  lib/android/libipq.c
  M  lib/android/regex.c
  M  lib/android/regex.h
  M  lib/conf/hipconf.c
  M  lib/core/builder.c
  M  lib/core/certtools.c
  M  lib/core/debug.c
  M  lib/core/debug.h
  M  lib/core/esp_prot_common.c
  M  lib/core/hashchain.c
  M  lib/core/hashchain_store.c
  M  lib/core/hashtable.c
  M  lib/core/hashtree.c
  M  lib/core/hip_capability.c
  M  lib/core/kerncompat.h
  M  lib/core/linkedlist.c
  M  lib/core/linkedlist.h
  M  lib/core/message.c
  M  lib/core/message.h
  M  lib/core/misc.c
  M  lib/core/misc.h
  M  lib/dht/example_xml_rpc_packets.txt
  M  lib/dht/libhipdht.c
  M  lib/gui/create.c
  M  lib/gui/hipgui.c
  M  lib/gui/tools.c
  M  lib/ipsec/ipsec_set_policy.3
  M  lib/ipsec/ipsec_strerror.3
  M  lib/ipsec/ipsec_strerror.c
  M  lib/ipsec/pfkey.c
  M  lib/ipsec/policy_parse.c
  M  lib/ipsec/policy_parse.y
  M  lib/ipsec/policy_token.l
  M  lib/performance/performance.c
  M  lib/tool/nlink.c
  M  lib/tool/nlink.h
  M  lib/tool/xfrmapi.c
  M  lib/tool/xfrmapi.h
  M  libinet6/Makefile.am
  M  libinet6/ifaddrs.c
  M  libinet6/ifnames.c
  M  patches/bind/named.conf
  M  patches/kernel/2.6.18.0/README
  M  patches/misc/README.SPAMASS.HIPL
  M  patches/opendht/bamboo_diff_FROM_ipv4-20060303_TO_ipv6-20080612.diff
  M  patches/opendht/how-to-steps
  M  patches/openwrt/2.6.25/README
  M  patches/tcpdump/README
  M  patches/tcpdump/README.outdated
  M  patches/wireshark/ethereal-0.10.14-hip.patch
  M  patches/wireshark/ethereal-0.10.14-i3.patch
  M  patches/wireshark/ethereal-0.99.0-hip-base05.patch
  M  patches/wireshark/wireshark-0.99.5-hip-base05-fixed-locator.patch
  M  release.version
  M  test/Makefile.old
  M  test/auth_eval.sh
  M  test/demo/soap-client.sh
  M  test/demo/stdinserver.c
  M  test/handovers.sh*
  M  test/hashlinediff.pl*
  M  test/hashtest.c
  M  test/hc_performance.c
  M  test/hipsetup.old*
  M  test/iperf_handovers.sh*
  M  test/java*
  M  test/maintainer/do-all
  M  test/maintainer/fix-archive-perms*
  M  test/maintainer/gen-archzoom-cache
  M  test/maintainer/scptar
  M  test/maintainer/sync-all*
  M  test/maintainer/tla-update-cachedrevs
  M  test/maintainer/update-html-howto
  M  test/packaging/armel/DEBIAN-FW/changelog
  M  test/packaging/armel/DEBIAN-FW/control
  M  test/packaging/armel/DEBIAN-FW/control-src
  M  test/packaging/armel/DEBIAN-FW/postinst
  M  test/packaging/armel/DEBIAN-FW/postrm
  M  test/packaging/armel/DEBIAN-FW/preinst
  M  test/packaging/armel/DEBIAN-FW/prerm
  M  test/packaging/armel/DEBIAN-dnsproxy/changelog
  M  test/packaging/armel/DEBIAN-dnsproxy/postrm
  M  test/packaging/armel/DEBIAN-dnsproxy/prerm
  M  test/packaging/armel/DEBIAN-gconf/changelog
  M  test/packaging/armel/DEBIAN/changelog
  M  test/packaging/armel/DEBIAN/postinst
  M  test/packaging/armel/DEBIAN/postrm
  M  test/packaging/armel/DEBIAN/preinst
  M  test/packaging/armel/DEBIAN/prerm
  M  test/packaging/create-deb.sh
  M  test/packaging/create-package.sh
  M  test/packaging/debbuild
  M  test/packaging/debian-init.d-dnsproxy*
  M  test/packaging/debian-init.d-hipd*
  M  test/packaging/debian-init.d-hipfw*
  M  test/packaging/fedora-init.d-bamboo_v4
  M  test/packaging/fedora-init.d-bamboo_v6
  M  test/packaging/hipl-deb.spec
  M  test/packaging/hipl-rpm.spec
  M  test/packaging/kernel-2.6.17.14.spec
  M  test/packaging/rh-init.d-dnsproxy*
  M  test/packaging/rh-init.d-hipd*
  M  test/packaging/rh-init.d-hipfw*
  M  test/packaging/ubuntu-init.d-bamboo_v6
  M  test/packets/description
  M  test/performance/README
  M  test/performance/clock_test.awk*
  M  test/performance/cookiesolver.c
  M  test/performance/eval_me.sh
  M  test/performance/firewall.init
  M  test/performance/firewall.rules
  M  test/performance/genstats.awk*
  M  test/performance/keygenstats.sh
  M  test/performance/measure_me.sh
  M  test/performance/memo*
  M  test/performance/parser.awk*
  M  test/performance/plot-no_midfw
  M  test/performance/plot-with_pcfw
  M  test/performance/stats.pl*
  M  test/performance/switch-ip*
  M  test/performance/visualize-daemon.sh*
  M  test/pfkeysettest*
  M  test/sqliteteststub.c
  M  test/test-run-daemon*
  M  test/tla-hook*
  M  tools/DNS/Base.py
  M  tools/DNS/Lib.py
  M  tools/DNS/Type.py
  M  tools/DNS/pyip6.py
  M  tools/esp_prot_config.cfg
  M  tools/hosts.py*
  M  tools/nsupdate.pl*
  M  tools/pyip6.py*
  M  tools/wget-dht-servers.sh
  M  lib/core/prefix.c
  M  lib/core/prefix.h

Merge from following parent revisions and branches:
  - update        (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    
  - trunk         (parent-id: 
heer@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    

Other related posts:

  • » [hipl-commit] [update] Rev 492: synchronized to trunk revision 3778 - Rene Hummen