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

[D. Hugh Redelmeier]

New commits:
commit d8e33352f288b8a92f82bb5631608553abd04139
Merge: 1ea0d1b 24ea740
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon May 26 12:39:51 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 1ea0d1b9cc723ad11d776d66cd8208a971a2ab19
Merge: 0b4773b 02bbc6f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon May 26 03:09:40 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 0b4773bc91fa92151d4dbb734b2ab4777e58e70f
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon May 26 03:06:57 2014 -0400

    Superficial Tidy of NAT Traversal code
    
    - enum clarify natt_method
      + don't assign numbers
      + make clear the split in values
    
    - make st_nat_traversal officially lset_t and treat if appropriately
    
    - introduce ikev1_natd_init to remove four copies of a chunk of code.
      The name may be inappropriate.
    
    - replace the magic number 31 with a more robust sizeof (four places)

commit a85ca04bb78c491743baa278562fd8f1152e19b5
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon May 26 02:22:58 2014 -0400

    simplify linux/include/libreswan/passert.h

commit cb528a1fb95725a5644f72bb547ba75a310579a1
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun May 25 23:00:57 2014 -0400

    delete a misplaced space

commit 2c7caa8147446b8f77715288c0f45d4c9ca79bfc
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 24 22:21:59 2014 -0400

    delete dangling comment

commit 2007c87095f4565a0ee5c4bba352673dac73b6c8
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 24 22:16:48 2014 -0400

    get rid of obsolere atoul and ultoa functions

commit e34731eaf9e0803ec23424530c2fb0625ab51a39
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 24 21:49:55 2014 -0400

    get rid of obsolete and unused atoaddr and atosubnet
    (keep manpage since it documents obsolete functions still in use)

commit 99b5fe89caa53cd2d12c462bc8d6c2d7f3d63fd8
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 24 21:01:31 2014 -0400

    atoasr and rangetoa are obsolete and unused: delete them

commit 174b02ff51d4f1b51113c7307b5ef287d757d71d
Merge: 5059d59 85ee98b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 24 20:38:55 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Conflicts:
    	include/certs.h
    	include/secrets.h

commit 5059d59e340094ae1ca4535308d2403391ec0e80
Merge: ab8a7ba 9023f55
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 24 13:48:48 2014 -0400

    Merge branch 'master' into hugh-2014may

commit ab8a7baa73562e25441e13501fb8fbd40967814f
Merge: 72687d0 f93920d
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri May 23 15:44:14 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 72687d00bfc2bae64551e5782117bd7089621128
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri May 23 15:02:43 2014 -0400

    replace calls to *cmp functions with clearer calls to *eq functions.

commit 030a33f59ca5b3806084d98abac6d33b23b73a20
Merge: 34deeaa 0a70f0d
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri May 23 14:07:14 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 34deeaaa0887272df420aa6a89cf2585d486610e
Merge: 725eeff 513ded6
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed May 21 19:51:25 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Conflicts:
    	programs/pluto/ikev1_dpd.c

commit 725eeff44ab6ef2ccc9ca5c909aa8cd7de048286
Merge: 05dc0b0 cd89649
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue May 20 23:22:36 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 05dc0b01e9c21dd80c82703a988f6473d7c48a58
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue May 20 02:06:35 2014 -0400

    - get rid of obsolete atobytes, atodata (use ttodatav instead)
    - get rid of obsolete bytestoa, datatoa
    - replace many uses of atoi and strtoul with ttoul or ttoulb
      This results in superior error detection and reporting.
    - tidy eroute.c and spi.c

commit 7a8218f748f4e313e6c3d0ef42ad023643e005d6
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon May 19 20:46:37 2014 -0400

    - define and use ttoulb (text to unsigned long, with an upper bound)
    
    - define and use TIME_T_MAX
    
    - describe the kludge that is UNDEFINED_TIME

commit 106e322adae41557c7b29fd64748d559fb33558f
Merge: 3ff9f4d 2a6a185
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Mon May 19 20:16:59 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 3ff9f4d175921f570901ccfc961e69780f3b7faf
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 17 16:09:31 2014 -0400

    Pluto option parsing:
    
    Add information to long_opts[] and systematically use it to:
    
    - print --help (eliminating the hard-to-maintain separate table)
    
    - systematically warn about obsolete spellings
    
    - declare all but one spelling of an option obsolete
    
      Synonyms obsoleted: noklips, use-none, useklips, use-auto,
      usenetkey, coredir, ipsec_dir, foodgroupsdir, debug-nat_t,
      debug-nat-t, debug-crypto, debug-klips, debug-netkey,
    
    - give more helpful error messages

commit c4feeea32b4f2b920e50d64b04e9346da0e87acd
Merge: f92debe 03cfc1b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 17 15:54:55 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Conflicts:
    	programs/pluto/plutomain.c

commit f92debe0e7b6c3354aa0c71aab7ed18fb4e626b9
Merge: 493f2ab 7facd26
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 17 00:17:08 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 493f2ab01b362b51c7fc9059d168bb95c0334d06
Merge: 84375fd 765abef
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 15 10:50:17 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 84375fd9e83df0d1d28bbad01795f83eebf03f6b
Merge: 57ebaa8 6b60a98
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun May 11 12:45:57 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 57ebaa8fd83415ef8389c25f2763ab1c8acb1713
Merge: 398041f 45591aa
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 10 21:29:01 2014 -0400

    Merge branch 'master' into hugh-2014may
    
    Conflicts:
    	programs/pluto/kernel_pfkey.c

commit 398041f61d4a46eaf5d6e0c3a123d379df533d3c
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 10 21:22:27 2014 -0400

    Wrap time_t so that dimensional analysis will be enforced by the compiler.
    
    realtime_t: absolute UTC time.  Might be discontinuous due to clock adjustment.
    monotime_t: absolute monotonic time.  No discontinuities (except for machine sleep?)
    deltatime_t: relative time between events.  Presumed continuous.
    
    A good compiler should produce identical code for these or for time_t values
    but will catch nonsense operations through type enforcement.
    
    Ditch struct pubkey's last_tried_time and last_worked_time since they
    were set but never used.  The NO_TIME kludge was only used to set them
    so that was ditched too.
    
    Generally print any time_t value as long, not unsigned long, since
    time_t is usually signed in UNIX-like systems.
    
    Renamed timetoa to realtimetoa to reflect what kind of time it deals
    with.
    
    Remove dns_string_rr and dns_string_datetime declarations: they don't
    exist.
    
    Tighten up init_timer's handling of environment variables.  But should
    they be used at all?

commit fed353aa6ca34e12394b1300917af7795d4b74ab
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 10 16:29:16 2014 -0400

    get range checking right for SPI generation

commit a9662ced222745961e88bc10323191926320da98
Merge: 8c31650 d945ab7
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue May 6 01:37:38 2014 -0400

    Merge branch 'master' into hugh-2014may

commit 8c316507dc5fc2d6d6c078349d0b72db9bd81eab
Merge: d97fb77 8da791b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 3 00:48:01 2014 -0400

    Merge branch 'master' into hugh-2014may

commit d97fb77f258c2ede021fc5b80425354d6521c5c1
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 3 00:43:26 2014 -0400

    Introduce monotonic time and systematically separate it from real time.
    This tries to distinguish things unified in b7f0b35aadf214c0b50140ee7a9397c0c7b4f192.

commit bba4d7b17c96d9d1518fdb14b7e1a68c378ec0f5
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 3 00:18:35 2014 -0400

    cosmetic improvements

commit b0892e94f6fbc29013ba1787cd46eb3dc54ed23b
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat May 3 00:06:21 2014 -0400

    replace calls to time(0) with time(NULL)

commit 32a48751686e150ad31e50f1f7796c98f58a8e02
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 1 16:45:35 2014 -0400

    - sprinkle const where appropriate
    - fix formatting mistakes in state.h
    - untangle and simplify foreach_states_by_connection_func
      + renamed it to foreach_states_by_connection_func_delete because that's
        what it does
      + since the only function supplied for parameter successfunc was
        delete_state_function, I eliminated the parameter and inlined
        the function.
      + same_phase1_no_phase2 was the only comparefunc that used pass parameter.
        It was used in a test that could never succeed: pass == 2
        where pass could only be 0 or 1.  So I deleted the test.
      + there being no users of the pass parameter, I deleted it.
      + The arg parameter to comparefunc was alway c->newest_isakmp_sa.
        Since c was also being passed, I elminated the arg parameter,
        both to foreach_states_by_connection_func_delete and to
        comparefunc
    - improve show_states_status:
      - reduce scope of variables
      - replace heap allocation with stack allocation (using a Variabe
         Length Array, a feature added in C99).

commit 927d7050f4ad2f9d5df612a7a55b8bfc11256ae4
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 1 16:17:11 2014 -0400

    - compatible_overlapping_connections: fix bug in condition
    - get_sa_info: document that last parameter is output

commit a9c8c0a13ae7216d046db4177f96d9a8a76017c1
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu May 1 16:15:57 2014 -0400

    cannot_oppo(): slight simplification