[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit 4556b56267fe0ddd67cc94e54ed6837afb9394ae
Merge: e08e793 9678a75
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 4 00:55:26 2013 -0400

    Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan

commit e08e793a4267a258829f47ca790fe87721b25cf1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 4 00:44:08 2013 -0400

    * pluto: added per-conn nat_keepalive=  (whack --no-nat_keepalive)
    
    Add an option nat_keepalive= to allow disabling keep alives by
    specifying nat_keepalive=no. The default (yes) causes the same
    behaviour as we have currently without the option.
    
    This option takes precedence over the global force_keepalive= option
    
    Note: I don't fully understand the purpose of the global option, it
    would send NAT-T KA packets when "they are NATed" where as normally
    we only send NAT-T KA packets when "we are NATed". Is there an actual
    use case for this?
    
    To ensure we don't change the current behaviour, the whack option
    does the negative, eg --no-nat-keepalives, so that not specifying it
    gives the proper default behaviour of doing regular NAT-KA packets.
    
    NOTE: We currently always send these packets, even when there is
    traffic flowing over the IPsec SA (and thus over port 4500 so the
    NAT router would keep the port mapping open anyway)

commit f3b76f40f668f4222dd0ae3d010de9675525597a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Apr 4 00:42:56 2013 -0400

    * oeconns: fix format string which was missing a %s.

commit 86a76b8e79b01fe1fd2c082a281d57cda9290df0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Apr 3 23:28:47 2013 -0400

    * starterwhack: fix format string in starter_log() to use %d for int

commit 03e41b968673c3aa5ec6f4a030d4461d95e6d65a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Apr 3 23:19:02 2013 -0400

    * pluto: Log out own vendorid as "received" instead of "ignored"

commit 06f645fe136a98b03d67406e34968827694ad444
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Apr 3 16:53:29 2013 -0400

    * pluto: clarify Commit Flag log message