[hipl-commit] [tiny] Rev 3657: Synchronized to trunk revision 3919.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Thu, 11 Mar 2010 10:07:42 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Thu Mar 11 09:07:12 2010 +0100
Revision: 3657 [merge]
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Synchronized to trunk revision 3919.

Modified:
  D  lib/core/misc.c
  D  lib/core/misc.h
  A  lib/core/straddr.c
  A  lib/core/straddr.h
  M  Makefile.am
  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/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_defines.h
  M  firewall/firewalldb.c
  M  firewall/lsi.c
  M  firewall/lsi.h
  M  firewall/midauth.h
  M  firewall/pisa.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/bos.h
  M  hipd/cert.h
  M  hipd/close.h
  M  hipd/configfilereader.c
  M  hipd/configfilereader.h
  M  hipd/esp_prot_anchordb.c
  M  hipd/esp_prot_light_update.c
  M  hipd/hadb.h
  M  hipd/hipd.c
  M  hipd/hipd.h
  M  hipd/hiprelay.c
  M  hipd/hiprelay.h
  M  hipd/init.c
  M  hipd/input.c
  M  hipd/keymat.h
  M  hipd/nat.h
  M  hipd/netdev.c
  M  hipd/netdev.h
  M  hipd/oppdb.c
  M  hipd/oppdb.h
  M  hipd/output.h
  M  hipd/registration.c
  M  hipd/registration.h
  M  hipd/user_ipsec_hipd_msg.c
  M  lib/conf/hipconf.c
  M  lib/core/builder.h
  M  lib/core/certtools.c
  M  lib/core/certtools.h
  M  lib/core/debug.c
  M  lib/core/filemanip.h
  M  lib/core/hashtable.c
  M  lib/core/hashtable.h
  M  lib/core/hip_udp.h
  M  lib/core/hit.c
  M  lib/core/hit.h
  M  lib/core/hostid.c
  M  lib/core/hostid.h
  M  lib/core/hostsfiles.c
  M  lib/core/hostsfiles.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/solve.h
  M  lib/tool/lutil.c
  M  lib/tool/lutil.h
  M  lib/tool/nlink.c
  M  lib/tool/nlink.h
  M  lib/tool/xfrmapi.h
  M  test/certteststub.c
  M  tools/pisacert.c

Merge from following parent revisions and branches:
  - tiny          (parent-id: 
tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)    
  - trunk         (parent-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) 
   

Other related posts:

  • » [hipl-commit] [tiny] Rev 3657: Synchronized to trunk revision 3919. - Tim Just