Print this page
First attempt at further IPsec cluster cleanup

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/net/pfkeyv2.h
          +++ new/usr/src/uts/common/net/pfkeyv2.h
↓ open down ↓ 503 lines elided ↑ open up ↑
 504  504   */
 505  505  
 506  506  typedef struct sadb_x_replay_ctr {
 507  507          uint16_t sadb_x_rc_len;
 508  508          uint16_t sadb_x_rc_exttype;
 509  509          uint32_t sadb_x_rc_replay32;    /* For 240x SAs. */
 510  510          uint64_t sadb_x_rc_replay64;    /* For 430x SAs. */
 511  511  } sadb_x_replay_ctr_t;
 512  512  
 513  513  /*
 514      - * For extended DUMP request. Dumps the SAs which were idle for
 515      - * longer than the timeout specified.
 516      - */
 517      -
 518      -typedef struct sadb_x_edump {
 519      -        uint16_t sadb_x_edump_len;
 520      -        uint16_t sadb_x_edump_exttype;
 521      -        uint32_t sadb_x_edump_reserved;
 522      -        uint64_t sadb_x_edump_timeout;
 523      -} sadb_x_edump_t;
 524      -
 525      -/*
 526  514   * Base message types.
 527  515   */
 528  516  
 529  517  #define SADB_RESERVED   0
 530  518  #define SADB_GETSPI     1
 531  519  #define SADB_UPDATE     2
 532  520  #define SADB_ADD        3
 533  521  #define SADB_DELETE     4
 534  522  #define SADB_GET        5
 535  523  #define SADB_ACQUIRE    6
 536  524  #define SADB_REGISTER   7
 537  525  #define SADB_EXPIRE     8
 538  526  #define SADB_FLUSH      9
 539  527  #define SADB_DUMP       10   /* not used normally */
 540  528  #define SADB_X_PROMISC  11
 541  529  #define SADB_X_INVERSE_ACQUIRE  12
 542  530  #define SADB_X_UPDATEPAIR       13
 543  531  #define SADB_X_DELPAIR          14
 544      -#define SADB_X_DELPAIR_STATE    15
      532 +/* #define      SADB_X_DELPAIR_STATE    15 */ /* Deprecated */
 545  533  #define SADB_MAX                15
 546  534  
 547  535  /*
 548  536   * SA flags
 549  537   */
 550  538  
 551  539  #define SADB_SAFLAGS_PFS        0x1     /* Perfect forward secrecy? */
 552  540  #define SADB_SAFLAGS_NOREPLAY   0x2     /* Replay field NOT PRESENT. */
 553  541  
 554  542  /* Below flags are used by this implementation.  Grow from left-to-right. */
↓ open down ↓ 21 lines elided ↑ open up ↑
 576  564          SADB_X_SAFLAGS_KRES1 | SADB_X_SAFLAGS_KRES2
 577  565  
 578  566  /*
 579  567   * SA state.
 580  568   */
 581  569  
 582  570  #define SADB_SASTATE_LARVAL             0
 583  571  #define SADB_SASTATE_MATURE             1
 584  572  #define SADB_SASTATE_DYING              2
 585  573  #define SADB_SASTATE_DEAD               3
 586      -#define SADB_X_SASTATE_ACTIVE_ELSEWHERE 4
 587      -#define SADB_X_SASTATE_IDLE             5
 588      -#define SADB_X_SASTATE_ACTIVE           6
      574 +/* #define      SADB_X_SASTATE_ACTIVE_ELSEWHERE 4 */ /* Deprecated */
      575 +/* #define      SADB_X_SASTATE_IDLE             5 */ /* Deprecated */
      576 +/* #define      SADB_X_SASTATE_ACTIVE           6 */ /* Deprecated */
 589  577  
 590  578  #define SADB_SASTATE_MAX                6
 591  579  
 592  580  /*
 593  581   * SA type.  Gaps are present in the number space because (for the time being)
 594  582   * these types correspond to the SA types in the IPsec DOI document.
 595  583   */
 596  584  
 597  585  #define SADB_SATYPE_UNSPEC      0
 598  586  #define SADB_SATYPE_AH          2  /* RFC-1826 */
↓ open down ↓ 63 lines elided ↑ open up ↑
 662  650  #define SADB_EXT_SUPPORTED_ENCRYPT      15
 663  651  #define SADB_EXT_SPIRANGE               16
 664  652  #define SADB_X_EXT_EREG                 17
 665  653  #define SADB_X_EXT_EPROP                18
 666  654  #define SADB_X_EXT_KM_COOKIE            19
 667  655  #define SADB_X_EXT_ADDRESS_NATT_LOC     20
 668  656  #define SADB_X_EXT_ADDRESS_NATT_REM     21
 669  657  #define SADB_X_EXT_ADDRESS_INNER_DST    22
 670  658  #define SADB_X_EXT_PAIR                 23
 671  659  #define SADB_X_EXT_REPLAY_VALUE         24
 672      -#define SADB_X_EXT_EDUMP                25
      660 +/* #define      SADB_X_EXT_EDUMP                25 */ /* Deprecated */
 673  661  #define SADB_X_EXT_LIFETIME_IDLE        26
 674  662  #define SADB_X_EXT_OUTER_SENS           27
 675  663  
 676  664  #define SADB_EXT_MAX                    27
 677  665  
 678  666  /*
 679  667   * Identity types.
 680  668   */
 681  669  
 682  670  #define SADB_IDENTTYPE_RESERVED 0
↓ open down ↓ 174 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX