Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: 17/03/2010 at 18:30:21 Revision: 1668 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: midauth Log: synchronized to trunk revision 3990 Modified: D firewall/proxy.c.doxyme D firewall/proxydb.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/hidb.c.doxyme D hipd/hipqueue.c.doxyme D hipd/hipqueue.h.doxyme D hipd/hiprelay.c.doxyme D lib/core/getendpointinfo.h.doxyme D lib/core/kerncompat.h.doxyme D lib/core/misc.c.doxyme D lib/core/misc.h.doxyme D lib/core/utils.h.doxyme D lib/tool/crypto.c.doxyme M firewall/conntrack.c M firewall/conntrack.h M firewall/firewall.c M firewall/proxy.c M firewall/proxydb.c M hipd/accessor.c M hipd/accessor.h M hipd/bos.c M hipd/close.c M hipd/cookie.c M hipd/dh.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_legacy.c M hipd/hidb.c M hipd/hiprelay.c M hipd/hiprelay.h M lib/core/hostsfiles.c M lib/core/hostsfiles.h M patches/openwrt/package/Makefile M tools/hipl_autobuild Merge from following parent revisions and branches: - midauth (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)