Committer: Miika Komu <miika@xxxxxx> Date: 18/03/2010 at 20:10:10 Revision: 495 [merge] Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: update Log: Synchronized to trunk revision 4016 Modified: D debian/README.Debian D debian/cron.d.ex D debian/emacsen-install.ex D debian/emacsen-remove.ex D debian/emacsen-startup.ex D debian/manpage.1.ex D debian/manpage.sgml.ex D debian/manpage.xml.ex D debian/menu.ex D debian/watch.ex D doc/TODO D firewall/proxy.c.doxyme D firewall/proxydb.c.doxyme D firewall/sava_api.c D firewall/sava_api.h D firewall/savah_gateway.c D firewall/savah_gateway.h D hipd/accessor.c.doxyme D hipd/blind.c.doxyme D hipd/bos.c.doxyme D hipd/close.c.doxyme D hipd/cookie.c.doxyme D hipd/dh.c.doxyme D hipd/hadb.c.doxyme D hipd/hadb_legacy.c.doxyme D hipd/hi3.c.doxyme D hipd/hidb.c.doxyme D hipd/hipd.c.doxyme D hipd/hipqueue.c.doxyme D hipd/hipqueue.h.doxyme D hipd/hiprelay.c.doxyme D hipd/icookie.c D hipd/icookie.c.doxyme D hipd/icookie.h D hipd/icookie.h.doxyme D hipd/init.c.doxyme D hipd/keymat.c.doxyme D hipd/maintenance.c.doxyme D hipd/oppdb.c.doxyme D hipd/oppipdb.c.doxyme D hipd/registration.c.doxyme D hipd/tcptimeout.c D hipd/tcptimeout.h D hipd/update.c.doxyme D hipd/update_legacy.c.doxyme D hipsock/ D hipsock/Makefile D hipsock/af_hip.c D hipsock/af_hip.h D hipsock/debug.c D hipsock/debug.h D hipsock/eid_db.c D hipsock/eid_db.h D hipsock/usercompat.h D jip/ D jip/HipAddress.java D jip/HipServerSocket.java D jip/HipServerSocketFactory.java D jip/HipSocket.java D jip/HipSocketFactory.java D jip/HipSocketImpl.java D jip/HipSocketImplFactory.java D jip/Makefile D jip/NativeInputStream.java D jip/NativeOutputStream.java D jip/hip-address.c D jip/hip-socket-impl.c D jip/hip-socket.c D jip/native-stream.c D jip/package-list D jip/package.html D lib/core/getendpointinfo.c D lib/core/getendpointinfo.c.doxyme D lib/core/getendpointinfo.h D lib/core/getendpointinfo.h.doxyme D lib/core/hip_statistics.c.doxyme D lib/core/hip_statistics.h.doxyme D lib/core/kerncompat.h D lib/core/kerncompat.h.doxyme D lib/core/misc.c D lib/core/misc.c.doxyme D lib/core/misc.h D lib/core/misc.h.doxyme D lib/core/utils.h.doxyme D lib/tool/crypto.c.doxyme D libinet6/ D libinet6/COPYING.LIB D libinet6/FILES D libinet6/Makefile.am D libinet6/README.USAGI D libinet6/cmsg_nxthdr.c D libinet6/getaddrinfo.c D libinet6/getaddrinfo.h D libinet6/getifaddrs.3 D libinet6/getnameinfo.c D libinet6/ifaddrs.c D libinet6/ifnames.c D libinet6/include@ D libinet6/include_glibc/ D libinet6/include_glibc/bits/ D libinet6/include_glibc/bits/in.h D libinet6/include_glibc/bits/sockaddr.h D libinet6/include_glibc/netinet/ D libinet6/include_glibc/netinet/icmp6.h D libinet6/include_glibc/netinet/ip6.h D libinet6/include_glibc21/ D libinet6/include_glibc21/Makefile.am D libinet6/include_glibc21/bits/ D libinet6/include_glibc21/bits/socket.h D libinet6/include_glibc21/ifaddrs.h D libinet6/include_glibc21/net/ D libinet6/include_glibc21/net/if.h D libinet6/include_glibc21/netdb.h D libinet6/include_glibc21/netinet/ D libinet6/include_glibc21/netinet/in.h D libinet6/include_glibc22/ D libinet6/include_glibc22/Makefile.am D libinet6/include_glibc22/bits/ D libinet6/include_glibc22/bits/socket.h D libinet6/include_glibc22/ifaddrs.h D libinet6/include_glibc22/net/ D libinet6/include_glibc22/net/if.h D libinet6/include_glibc22/netdb.h D libinet6/include_glibc22/netinet/ D libinet6/include_glibc22/netinet/in.h D libinet6/include_glibc23/ D libinet6/include_glibc23/Makefile.am D libinet6/include_glibc23/bits/ D libinet6/include_glibc23/bits/socket.h D libinet6/include_glibc23/ifaddrs.h D libinet6/include_glibc23/net/ D libinet6/include_glibc23/net/pfkeyv2.h D libinet6/include_glibc23/netdb.h D libinet6/include_glibc23/netinet/ D libinet6/include_glibc23/netinet/in.h D libinet6/include_glibc23/netinet/ipsec.h D libinet6/install-sh D libinet6/ip6opt.c D libinet6/libc-compat.h D libinet6/rcmd.c D libinet6/rexec.c D libinet6/rthdr.c D libinet6/sa_len.c D libinet6/scripts/ D libinet6/scripts/lorder.pl D libinet6/scripts/mkdiff D libinet6/tempname.c D libinet6/usagi.c D test/HipClient.java D test/HipServer.java D test/Makefile.old D test/conntest-client-native-user-key.c D test/conntest-server-native.c D test/first_test.c D test/first_test.h D test/hipsetup.c D test/hipsetup.h D test/java D test/packaging/hipl-userspace-1.0-1.spec.old D test/telnet/ D test/telnet/Makefile.in D test/telnet/array.h D test/telnet/authenc.cc D test/telnet/commands.cc D test/telnet/configure D test/telnet/configure.in D test/telnet/defines.h D test/telnet/environ.cc D test/telnet/environ.h D test/telnet/externs.h D test/telnet/fdset.h D test/telnet/general.h D test/telnet/genget.cc D test/telnet/genget.h D test/telnet/main.cc D test/telnet/netlink.cc D test/telnet/netlink.h D test/telnet/network.cc D test/telnet/proto.h D test/telnet/ptrarray.h D test/telnet/ring.cc D test/telnet/ring.h D test/telnet/sys_bsd.cc D test/telnet/telnet.1 D test/telnet/telnet.cc D test/telnet/telnetlogin.8 D test/telnet/telnetlogin.c D test/telnet/terminal.cc D test/telnet/terminal.h D test/telnet/tn3270.cc D test/telnet/types.h D test/telnet/utilities.cc D test/telnet/version.h D test/telnetd/ D test/telnetd/Makefile.in D test/telnetd/authenc.c D test/telnetd/configure D test/telnetd/configure.in D test/telnetd/defs.h D test/telnetd/ext.h D test/telnetd/getent.c D test/telnetd/global.c D test/telnetd/issue.net.5 D test/telnetd/login.3 D test/telnetd/logout.h D test/telnetd/logwtmp.h D test/telnetd/pathnames.h D test/telnetd/setproctitle.3 D test/telnetd/setproctitle.c D test/telnetd/setproctitle.h D test/telnetd/slc.c D test/telnetd/state.c D test/telnetd/sys_term.c D test/telnetd/telnetd.8 D test/telnetd/telnetd.c D test/telnetd/telnetd.h D test/telnetd/termstat.c D test/telnetd/utility.c D test/telnetd/version.h A lib/core/filemanip.c A lib/core/filemanip.h A lib/core/hip_udp.c A lib/core/hip_udp.h A lib/core/hit.c A lib/core/hit.h A lib/core/hostid.c A lib/core/hostid.h A lib/core/hostsfiles.c A lib/core/hostsfiles.h A lib/core/keylen.c A lib/core/keylen.h A lib/core/solve.c A lib/core/solve.h A lib/core/straddr.c A lib/core/straddr.h A lib/core/transform.c A lib/core/transform.h A lib/ipsec/pfkeyv2.h A lib/tool/checksum.c A lib/tool/checksum.h A lib/tool/pfkeysadb.c A lib/tool/pfkeysadb.h A patches/kernel/2.6.20/ A patches/kernel/2.6.20/beet-2.6.20.21.patch A patches/kernel/2.6.20/beet-2.6.20.patch A patches/kernel/2.6.20/notes.txt A patches/openwrt/README A patches/openwrt/package/ A patches/openwrt/package/Makefile A patches/openwrt/package/files/ A patches/openwrt/package/files/hipd.init A patches/openwrt/package/files/hipfw.init A patches/openwrt/package/files/hipl.modules A patches/openwrt/package/files/test/ A patches/openwrt/package/files/test/firewall.flush A patches/openwrt/package/files/test/firewall.init A patches/openwrt/package/files/test/firewall.rules A patches/openwrt/package/files/test/firewall.start A test/performance/perf_measure.sh M .bzrignore M Android.mk M Makefile.am M agent/agent.c M agent/connhipd.c M autogen.sh M check_header_verbosity.sh* M configure.ac M debian/changelog M debian/control M debian/copyright M debian/dirs M debian/docs M debian/rules M doc/HACKING M doc/HOWTO.xml M doc/doxygen.h M doc/hipl.tex M doc/testing.txt M doc/verbose-header-files.txt M doc/verbose-headers.txt M firewall/cache.c M firewall/cache_port.c M firewall/common_hipd_msg.c M firewall/conntrack.c M firewall/conntrack.h M firewall/datapkt.c M firewall/esp_prot_api.c M firewall/esp_prot_config.h M firewall/esp_prot_conntrack.c M firewall/esp_prot_conntrack.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.c M firewall/lsi.c M firewall/lsi.h M firewall/midauth.c M firewall/midauth.h M firewall/opptcp.c M firewall/pisa.c M firewall/proxy.c M firewall/proxy.h M firewall/proxydb.c M firewall/rule_management.c M firewall/sysopp.c 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 firewall/user_ipsec_sadb.h M hipd/accessor.c M hipd/accessor.h M hipd/blind.c 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.c M hipd/dh.h M hipd/dht.c M hipd/dht.h M hipd/dhtqueue.c M hipd/esp_prot_anchordb.c M hipd/esp_prot_hipd_msg.c M hipd/esp_prot_light_update.c M hipd/hadb.c M hipd/hadb.h M hipd/hadb_legacy.c M hipd/hi3.c M hipd/hi3.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.c 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/registration.c M hipd/registration.h 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_sadb_api.c M i3/i3/i3_api.c M i3/i3_client/http.c M i3/i3_client/i3_client_context.c M i3/i3_client/i3_client_pkt.c M i3/i3_client/i3_client_trigger.c M i3/i3_client/i3server_list.c M i3/i3_client/ping.c M i3/i3_client/ping_thread.c M lib/android/regex.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/crypto.c M lib/core/crypto.h M lib/core/debug.c M lib/core/debug.h M lib/core/hashtable.c M lib/core/hashtable.h M lib/core/hip_capability.c M lib/core/hip_statistics.c M lib/core/hip_statistics.h M lib/core/icomm.h M lib/core/ife.h M lib/core/list.h M lib/core/message.c M lib/core/message.h M lib/core/prefix.c M lib/core/prefix.h M lib/core/protodefs.h M lib/core/sqlitedbapi.c M lib/core/sqlitedbapi.h M lib/core/state.h M lib/dht/libhipdht.c M lib/dht/libhipdht.h M lib/dht/libhipdhtxml.c 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/opphip/wrap.c M lib/opphip/wrap_db.c M lib/performance/performance.c M lib/tool/lutil.c M lib/tool/lutil.h M lib/tool/nlink.c M lib/tool/nlink.h M lib/tool/pk.c M lib/tool/xfrmapi.c M lib/tool/xfrmapi.h 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/dh_performance.c M test/dhtteststub.c M test/handovers.sh* M test/hipsetup.old* M test/iperf_handovers.sh* M test/keygentest.c M test/maintainer/fix-archive-perms* M test/maintainer/sync-all* M test/maintainer/tla-find-revision-locks* M test/packaging/create-deb.sh 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/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_v4* M test/packaging/ubuntu-init.d-bamboo_v6* M test/performance/clock_test.awk* M test/performance/genstats.awk* M test/performance/parser.awk* 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/hipl_autobuild M tools/hosts.py* M tools/nsupdate.pl* M tools/pisacert.c M verbose-headers.txt Merge from following parent revisions and branches: - update (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)