Print this page
C. Fraire's code review fixes
8529 Extended and regular SADB_ACQUIREs should share address extension code
Portions contributed by: Bayard Bell <buffer.g.overflow@gmail.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/inet/sadb.h
          +++ new/usr/src/uts/common/inet/sadb.h
↓ open down ↓ 560 lines elided ↑ open up ↑
 561  561  
 562  562  typedef struct sadb_s
 563  563  {
 564  564          isaf_t  *sdb_of;
 565  565          isaf_t  *sdb_if;
 566  566          iacqf_t *sdb_acq;
 567  567          int     sdb_hashsize;
 568  568  } sadb_t;
 569  569  
 570  570  /*
 571      - * A pair of SADB's (one for v4, one for v6), and related state (including
 572      - * acquire callbacks).
      571 + * A pair of SADB's (one for v4, one for v6), and related state.
 573  572   */
 574  573  
 575  574  typedef struct sadbp_s
 576  575  {
 577  576          uint32_t        s_satype;
 578  577          uint32_t        *s_acquire_timeout;
 579      -        void            (*s_acqfn)(ipsacq_t *, mblk_t *, netstack_t *);
 580  578          sadb_t          s_v4;
 581  579          sadb_t          s_v6;
 582  580          uint32_t        s_addflags;
 583  581          uint32_t        s_updateflags;
 584  582  } sadbp_t;
 585  583  
 586  584  /*
 587  585   * A pair of SA's for a single connection, the structure contains a
 588  586   * pointer to a SA and the SA its paired with (opposite direction) as well
 589  587   * as the SA's respective hash buckets.
↓ open down ↓ 176 lines elided ↑ open up ↑
 766  764  void sadb_acquire(mblk_t *, ip_xmit_attr_t *, boolean_t, boolean_t);
 767  765  void gcm_params_init(ipsa_t *, uchar_t *, uint_t, uchar_t *, ipsa_cm_mech_t *,
 768  766      crypto_data_t *);
 769  767  void ccm_params_init(ipsa_t *, uchar_t *, uint_t, uchar_t *, ipsa_cm_mech_t *,
 770  768      crypto_data_t *);
 771  769  void cbc_params_init(ipsa_t *, uchar_t *, uint_t, uchar_t *, ipsa_cm_mech_t *,
 772  770      crypto_data_t *);
 773  771  
 774  772  void sadb_destroy_acquire(ipsacq_t *, netstack_t *);
 775  773  struct ipsec_stack;
 776      -mblk_t *sadb_setup_acquire(ipsacq_t *, uint8_t, struct ipsec_stack *);
 777  774  ipsa_t *sadb_getspi(keysock_in_t *, uint32_t, int *, netstack_t *, uint_t);
 778  775  void sadb_in_acquire(sadb_msg_t *, sadbp_t *, queue_t *, netstack_t *);
 779  776  boolean_t sadb_replay_check(ipsa_t *, uint32_t);
 780  777  boolean_t sadb_replay_peek(ipsa_t *, uint32_t);
 781  778  int sadb_dump(queue_t *, mblk_t *, keysock_in_t *, sadb_t *);
 782  779  void sadb_replay_delete(ipsa_t *);
 783  780  void sadb_ager(sadb_t *, queue_t *, int, netstack_t *);
 784  781  
 785  782  timeout_id_t sadb_retimeout(hrtime_t, queue_t *, void (*)(void *), void *,
 786  783      uint_t *, uint_t, short);
↓ open down ↓ 196 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX