Print this page
OS-161: Integrate IPMP changes

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_impl.h
          +++ new/usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_impl.h
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 + * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
  24   25   * Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
  25   26   */
  26   27  
  27   28  #ifndef _IPMGMT_IMPL_H
  28   29  #define _IPMGMT_IMPL_H
  29   30  
  30   31  #ifdef  __cplusplus
  31   32  extern "C" {
  32   33  #endif
  33   34  
↓ open down ↓ 9 lines elided ↑ open up ↑
  43   44  #define IPMGMTD_FMRI            "svc:/network/ip-interface-management:default"
  44   45  
  45   46  /* ipmgmt_door.c */
  46   47  extern void     ipmgmt_handler(void *, char *, size_t, door_desc_t *, uint_t);
  47   48  
  48   49  /* ipmgmt_util.c */
  49   50  extern void     ipmgmt_log(int, const char *, ...);
  50   51  extern int      ipmgmt_cpfile(const char *, const char *, boolean_t);
  51   52  
  52   53  /* ipmgmt_persist.c */
       54 +extern boolean_t ipmgmt_persist_if_exists(const char *, sa_family_t);
       55 +extern void ipmgmt_get_group_interface(const char *, char *, size_t);
  53   56  
  54   57  /*
  55   58   * following are the list of DB walker callback functions and the callback
  56   59   * arguments for each of the callback functions used by the daemon
  57   60   */
  58   61  /* following functions take 'ipmgmt_prop_arg_t' as the callback argument */
  59   62  extern db_wfunc_t       ipmgmt_db_getprop, ipmgmt_db_resetprop;
  60   63  
  61   64  /* following functions take ipadm_dbwrite_cbarg_t as callback argument */
  62      -extern db_wfunc_t       ipmgmt_db_add, ipmgmt_db_update;
       65 +extern db_wfunc_t       ipmgmt_db_add, ipmgmt_db_update, ipmgmt_db_update_if;
  63   66  
  64   67  typedef struct {
  65      -        char            *cb_ifname;
  66      -        ipadm_if_info_t *cb_ifinfo;
  67      -} ipmgmt_getif_cbarg_t;
  68      -extern db_wfunc_t       ipmgmt_db_getif;
  69      -
  70      -typedef struct {
  71      -        char            *cb_aobjname;
  72      -        char            *cb_ifname;
       68 +        char    *cb_ifname;
       69 +        char    *cb_aobjname;
  73   70          nvlist_t        *cb_onvl;
  74      -        int             cb_ocnt;
  75      -} ipmgmt_getaddr_cbarg_t;
       71 +        int     cb_ocnt;
       72 +} ipmgmt_get_cbarg_t;
       73 +extern db_wfunc_t       ipmgmt_db_getif;
  76   74  extern db_wfunc_t       ipmgmt_db_getaddr;
  77   75  
  78   76  typedef struct {
  79   77          sa_family_t     cb_family;
  80   78          char            *cb_ifname;
       79 +        boolean_t       cb_ipv4exists;
       80 +        boolean_t       cb_ipv6exists;
  81   81  } ipmgmt_if_cbarg_t;
  82   82  extern db_wfunc_t       ipmgmt_db_setif, ipmgmt_db_resetif;
  83   83  
  84   84  typedef struct {
  85   85          char            *cb_aobjname;
  86   86  } ipmgmt_resetaddr_cbarg_t;
  87   87  extern db_wfunc_t       ipmgmt_db_resetaddr;
  88   88  
  89   89  typedef struct {
  90   90          sa_family_t     cb_family;
↓ open down ↓ 83 lines elided ↑ open up ↑
 174  174  typedef struct scf_resources {
 175  175          scf_handle_t            *sr_handle;
 176  176          scf_instance_t          *sr_inst;
 177  177          scf_propertygroup_t     *sr_pg;
 178  178          scf_property_t          *sr_prop;
 179  179          scf_value_t             *sr_val;
 180  180          scf_transaction_t       *sr_tx;
 181  181          scf_transaction_entry_t *sr_ent;
 182  182  } scf_resources_t;
 183  183  
      184 +extern int              ipmgmt_update_family_nvp(nvlist_t *,
      185 +                            sa_family_t, uint_t);
 184  186  extern int              ipmgmt_db_walk(db_wfunc_t *, void *, ipadm_db_op_t);
 185  187  extern int              ipmgmt_aobjmap_op(ipmgmt_aobjmap_t *, uint32_t);
 186  188  extern boolean_t        ipmgmt_aobjmap_init(void *, nvlist_t *, char *,
 187  189                              size_t, int *);
 188  190  extern int              ipmgmt_persist_aobjmap(ipmgmt_aobjmap_t *,
 189  191                              ipadm_db_op_t);
 190  192  extern boolean_t        ipmgmt_ngz_firstboot_postinstall();
 191  193  extern int              ipmgmt_persist_if(ipmgmt_if_arg_t *);
 192  194  extern void             ipmgmt_init_prop();
 193  195  extern boolean_t        ipmgmt_db_upgrade(void *, nvlist_t *, char *,
↓ open down ↓ 12 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX