Print this page
7388 Support DHCP Client FQDN. Allow IAID/DUID for all v4.

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libipadm/common/ipadm_ipmgmt.h
          +++ new/usr/src/lib/libipadm/common/ipadm_ipmgmt.h
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  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   * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       23 + * Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
  23   24   */
  24   25  
  25   26  #ifndef _IPADM_IPMGMT_H
  26   27  #define _IPADM_IPMGMT_H
  27   28  
  28   29  #ifdef  __cplusplus
  29   30  extern "C" {
  30   31  #endif
  31   32  #include <sys/types.h>
  32   33  #include <sys/stat.h>
↓ open down ↓ 11 lines elided ↑ open up ↑
  44   45  /* Authorization required to configure network interfaces */
  45   46  #define NETWORK_INTERFACE_CONFIG_AUTH   "solaris.network.interface.config"
  46   47  
  47   48  /*
  48   49   * Data store read/write utilities related declarations.
  49   50   */
  50   51  /*
  51   52   * For more information on these definitions please refer to the top of
  52   53   * ipadm_persist.c. These are the name of the nvpairs which hold the
  53   54   * respective values. All nvpairs private to ipadm have names that begin
  54      - * with "_". Note below that 'prefixlen' is an address property and therefore
  55      - * not a private nvpair name.
       55 + * with "_". Note below that 'prefixlen' and 'reqhost' are address
       56 + * properties and therefore not a private nvpair name.
  56   57   */
  57   58  #define IPADM_NVP_PROTONAME     "_protocol"     /* protocol name */
  58   59  #define IPADM_NVP_IFNAME        "_ifname"       /* interface name */
  59   60  #define IPADM_NVP_AOBJNAME      "_aobjname"     /* addrobj name */
  60   61  #define IPADM_NVP_FAMILY        "_family"       /* address family */
  61   62  #define IPADM_NVP_IPV4ADDR      "_ipv4addr"     /* name of IPv4 addr nvlist */
  62   63  #define IPADM_NVP_IPNUMADDR     "_addr"         /* local address */
  63   64  #define IPADM_NVP_IPADDRHNAME   "_aname"        /* local hostname */
  64   65  #define IPADM_NVP_IPDADDRHNAME  "_dname"        /* remote hostname */
  65   66  #define IPADM_NVP_PREFIXLEN     "prefixlen"     /* prefixlen */
       67 +#define IPADM_NVP_REQHOST       "reqhost"       /* requested hostname */
  66   68  #define IPADM_NVP_IPV6ADDR      "_ipv6addr"     /* name of IPv6 addr nvlist */
  67   69  #define IPADM_NVP_DHCP          "_dhcp"         /* name of DHCP nvlist */
  68   70  #define IPADM_NVP_WAIT          "_wait"         /* DHCP timeout value */
  69   71  #define IPADM_NVP_PRIMARY       "_primary"      /* DHCP primary interface */
  70   72  #define IPADM_NVP_LIFNUM        "_lifnum"       /* logical interface number */
  71   73  #define IPADM_NVP_INTFID        "_intfid"       /* name of IPv6 intfid nvlist */
  72   74  #define IPADM_NVP_STATELESS     "_stateless"    /* IPv6 autoconf stateless */
  73   75  #define IPADM_NVP_STATEFUL      "_stateful"     /* IPv6 autoconf dhcpv6 */
  74   76  
  75   77  #define IPADM_PRIV_NVP(s) ((s)[0] == '_' && (s)[1] != '_')
↓ open down ↓ 69 lines elided ↑ open up ↑
 145  147          char                    ia_pval[MAXPROPVALLEN];
 146  148  } ipmgmt_prop_arg_t;
 147  149  /*
 148  150   * ia_flags used in ipmgmt_prop_arg_t.
 149  151   *      - APPEND updates the multi-valued property entry with a new value
 150  152   *      - REDUCE updates the multi-valued property entry by removing a value
 151  153   */
 152  154  #define IPMGMT_APPEND   0x00000001
 153  155  #define IPMGMT_REMOVE   0x00000002
 154  156  
      157 +/*
      158 + * ipadm_addr_type_t-specific values that are cached in ipmgmtd and can
      159 + * make a round-trip back to client programs
      160 + */
      161 +typedef union {
      162 +        struct {
      163 +                boolean_t               ipmgmt_linklocal;
      164 +                struct sockaddr_in6             ipmgmt_ifid;
      165 +        } ipmgmt_ipv6_cache_s;
      166 +        struct {
      167 +                boolean_t               ipmgmt_primary;
      168 +                char                    ipmgmt_reqhost[MAXNAMELEN];
      169 +        } ipmgmt_dhcp_cache_s;
      170 +} ipmgmt_addr_type_cache_u;
      171 +
 155  172  /* IPMGMT_CMD_GETIF door_call argument structure */
 156  173  typedef struct ipmgmt_getif_arg_s {
 157  174          ipmgmt_door_cmd_type_t  ia_cmd;
 158  175          uint32_t        ia_flags;
 159  176          char            ia_ifname[LIFNAMSIZ];
 160  177  } ipmgmt_getif_arg_t;
 161  178  
 162  179  /* IPMGMT_CMD_RESETIF, IPMGMT_CMD_SETIF door_call argument structure */
 163  180  typedef struct ipmgmt_if_arg_s {
 164  181          ipmgmt_door_cmd_type_t  ia_cmd;
↓ open down ↓ 49 lines elided ↑ open up ↑
 214  231          sa_family_t             ia_family;
 215  232          ipadm_addr_type_t       ia_atype;
 216  233  } ipmgmt_aobjop_arg_t;
 217  234  
 218  235  /*
 219  236   * ia_flags used inside the arguments for interface/address commands
 220  237   *      - ACTIVE updates the running configuration
 221  238   *      - PERSIST updates the permanent data store
 222  239   *      - INIT  indicates that operation being performed is under init
 223  240   *                  context
      241 + *      - PROPS_ONLY indicates the update changes the running configuration of
      242 + *                  "props" data on the interface/address object. The props are
      243 + *                  cached there on the parent, so a PROPS_ONLY change does not
      244 + *                  affect the ACTIVE/PERSIST state of the parent.
 224  245   */
 225  246  #define IPMGMT_ACTIVE           0x00000001
 226  247  #define IPMGMT_PERSIST          0x00000002
 227  248  #define IPMGMT_INIT             0x00000004
      249 +#define IPMGMT_PROPS_ONLY               0x00000008
 228  250  
 229  251  /* door call return value */
 230  252  typedef struct ipmgmt_retval_s {
 231  253          int32_t ir_err;
 232  254  } ipmgmt_retval_t;
 233  255  
 234  256  /* IPMGMT_CMD_GETADDR door_return value */
 235  257  typedef struct ipmgmt_get_rval_s {
 236  258          int32_t         ir_err;
 237  259          size_t          ir_nvlsize;
↓ open down ↓ 15 lines elided ↑ open up ↑
 253  275  
 254  276  /* IPMGMT_CMD_{LOOKUPADD|LIFNUM2ADDROBJ|ADDROBJ2LIFNUM} door_return value */
 255  277  typedef struct ipmgmt_aobjop_rval_s {
 256  278          int32_t                 ir_err;
 257  279          char                    ir_aobjname[IPADM_AOBJSIZ];
 258  280          char                    ir_ifname[LIFNAMSIZ];
 259  281          int32_t                 ir_lnum;
 260  282          sa_family_t             ir_family;
 261  283          uint32_t                ir_flags;
 262  284          ipadm_addr_type_t       ir_atype;
 263      -        struct sockaddr_storage ir_ifid;
      285 +        ipmgmt_addr_type_cache_u        ir_atype_cache;
 264  286  } ipmgmt_aobjop_rval_t;
 265  287  
      288 +#define ipmgmt_ir_intfid        ir_atype_cache. \
      289 +        ipmgmt_ipv6_cache_s.ipmgmt_ifid
      290 +#define ipmgmt_ir_primary       ir_atype_cache. \
      291 +        ipmgmt_dhcp_cache_s.ipmgmt_primary
      292 +#define ipmgmt_ir_reqhost       ir_atype_cache. \
      293 +        ipmgmt_dhcp_cache_s.ipmgmt_reqhost
      294 +
 266  295  /* DB walk callback functions */
 267  296  typedef boolean_t       db_wfunc_t(void *, nvlist_t *, char *, size_t, int *);
 268  297  extern int              ipadm_rw_db(db_wfunc_t *, void *, const char *, mode_t,
 269  298                              ipadm_db_op_t);
 270  299  
 271  300  /* zone related functions */
 272  301  /*
 273  302   *  callback function to persist an interface in ipmgmtd data store
 274  303   */
 275  304  typedef void (*persist_cb_t)(char *, boolean_t, boolean_t);
↓ open down ↓ 11 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX