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

D. Hugh Redelmeier hugh at vault.libreswan.fi
Thu May 29 10:12:15 EEST 2014


New commits:
commit 5c70d4d59ae209a6c7b0e88150f398a445d732d8
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 29 03:10:46 2014 -0400

    revise reference logs to reflect changes in NAT messages

commit b0b36c7395274bb3debfc55f31e912d94dc29d98
Merge: d0087fe c5f3ab8
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 29 02:54:20 2014 -0400

    Merge branch 'master' into hugh-2014may

commit d0087fe15b60d381f2391d450430249e7a38535c
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 29 02:53:54 2014 -0400

    refine NAT messages

commit c5f3ab88b96e6b76e05bcb280841488fa9799d58
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 29 02:47:55 2014 -0400

    slight simplification of validate_end

commit 43e8cabc47e3aeea3303d315f427f0a1992d5587
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue May 27 22:22:47 2014 -0400

    - add missing comma in natt_bit_names
    - rename NAT_TRAVERSAL_NAT_BHND_ME to NATED_HOST and
      rename NAT_TRAVERSAL_NAT_BHND_PEER to NATED_PEER
    - simplify nat_traversal_show_result

commit dfad5cefd15d336919e77d75945de9ad3e41af01
Merge: b51b463 ae17d3e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue May 27 21:32:57 2014 -0400

    Merge branch 'master' into hugh-2014may

commit b51b463acee0edc74a3c6f959fc112fae4a34752
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon May 26 23:26:06 2014 -0400

    More NAT Traversal tidying
    
    - get rid of pointless explicit numbering of enum known_vendorid
    
    - merge_quirks:
    
      + copy_quirks renamed to the more accurate merge_quirks
    
      + make calling merge_quirks clearer and more concise
    
      + correctly merge qnat_traversal_vid: "max" not "|"
        (however the result is never used)
    
    - create set_nat_traversal to encapsulate a repeated chunk.
      This allowed nat_traversal_vid_to_method to become file static.
    
    - Correct typing required breaking out the definition of
      enum known_vendorid into a new header programs/pluto/known_vendorid.h
    
    - merge_quirks and set_nat_traversal were always called together
      except in main_inR1_outI2.  I added a merge_quirks call
      on hunch that this exception was a mistake.
    
    - more accurately typed:
      + nat_traversal_vid_to_method
      + nat_traversal_vid is struct isakmp_quirks
    
    - printed out st->hidden_variables.st_nat_traversal with bitnamesof
      instead of as hex
    
    - reword the description of the very badly named
      + NAT_TRAVERSAL_NAT_BHND_ME: NAT behind me => I am behind NAT
      + NAT_TRAVERSAL_NAT_BHND_PEER: NAT behind peer => peer behind NAT
    
    - in vendor.c got rid of token pasting in macros (##) so that
      grep would find the enum known_vendorid literals
      (costs four characters per invocation)



More information about the Swan-commit mailing list