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

          --- old/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.h
          +++ new/usr/src/cmd/cmd-inet/sbin/dhcpagent/util.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *

  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) 1999, 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 UTIL_H
  26   27  #define UTIL_H
  27   28  
  28   29  #include <sys/types.h>
  29   30  #include <netinet/in.h>
  30   31  #include <netinet/dhcp.h>
  31   32  #include <netinet/dhcp6.h>
  32   33  #include <libinetutil.h>
  33   34  #include <dhcpagent_ipc.h>
  34   35  
  35   36  #include "common.h"
       37 +#include "packet.h"
  36   38  
  37   39  /*
  38   40   * general utility functions which have no better home.  see util.c
  39   41   * for documentation on how to use the exported functions.
  40   42   */
  41   43  
  42   44  #ifdef  __cplusplus
  43   45  extern "C" {
  44   46  #endif
  45   47  

  46   48  struct dhcp_timer_s {
  47   49          iu_timer_id_t   dt_id;
  48   50          lease_t         dt_start;               /* Initial timer value */
  49   51  };
  50   52  
  51   53  /* conversion functions */
  52   54  const char      *pkt_type_to_string(uchar_t, boolean_t);
  53   55  const char      *monosec_to_string(monosec_t);
  54   56  time_t          monosec_to_time(monosec_t);
  55   57  monosec_t       hrtime_to_monosec(hrtime_t);
  56   58  
  57   59  /* shutdown handlers */
  58   60  void            graceful_shutdown(int);
  59   61  void            inactivity_shutdown(iu_tq_t *, void *);
  60   62  
  61   63  /* timer functions */
  62   64  void            init_timer(dhcp_timer_t *, lease_t);
  63   65  boolean_t       cancel_timer(dhcp_timer_t *);
  64   66  boolean_t       schedule_timer(dhcp_timer_t *, iu_tq_callback_t *, void *);
  65   67  
  66   68  /* miscellaneous */
  67   69  boolean_t       add_default_route(uint32_t, struct in_addr *);

  68   70  boolean_t       del_default_route(uint32_t, struct in_addr *);
  69   71  int             daemonize(void);
  70   72  monosec_t       monosec(void);
  71   73  void            print_server_msg(dhcp_smach_t *, const char *, uint_t);
  72   74  boolean_t       bind_sock(int, in_port_t, in_addr_t);
  73   75  boolean_t       bind_sock_v6(int, in_port_t, const in6_addr_t *);
  74   76  const char      *iffile_to_hostname(const char *);
  75   77  int             dhcpv6_status_code(const dhcpv6_option_t *, uint_t,
  76   78      const char **, const char **, uint_t *);
  77   79  void            write_lease_to_hostconf(dhcp_smach_t *);
       80 +int                     dhcp_add_hostname_opt(dhcp_pkt_t *, dhcp_smach_t *);
       81 +int                     dhcp_add_fqdn_opt(dhcp_pkt_t *, dhcp_smach_t *);
  78   82  
  79   83  #ifdef  __cplusplus
  80   84  }
  81   85  #endif
  82   86  
  83   87  #endif  /* UTIL_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX