[BACK]Return to dhcpctl.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / external / mpl / dhcp / dist / dhcpctl

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/external/mpl/dhcp/dist/dhcpctl/dhcpctl.c between version 1.2 and 1.3

version 1.2, 2018/04/07 22:37:29 version 1.3, 2022/04/03 01:10:58
Line 5 
Line 5 
    Subroutines providing general support for objects. */     Subroutines providing general support for objects. */
   
 /*  /*
  * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")   * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium   * Copyright (c) 1999-2003 by Internet Software Consortium
  *   *
  * This Source Code Form is subject to the terms of the Mozilla Public   * This Source Code Form is subject to the terms of the Mozilla Public
Line 21 
Line 21 
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *   *
  *   Internet Systems Consortium, Inc.   *   Internet Systems Consortium, Inc.
  *   950 Charter Street   *   PO Box 360
  *   Redwood City, CA 94063   *   Newmarket, NH 03857 USA
  *   <info@isc.org>   *   <info@isc.org>
  *   https://www.isc.org/   *   https://www.isc.org/
  *   *
Line 34  __RCSID("$NetBSD$");
Line 34  __RCSID("$NetBSD$");
 #include "dhcpd.h"  #include "dhcpd.h"
 #include <omapip/omapip_p.h>  #include <omapip/omapip_p.h>
 #include "dhcpctl.h"  #include "dhcpctl.h"
   #include <sys/time.h>
   
   /* #define DEBUG_DHCPCTL  1 */
   
 omapi_object_type_t *dhcpctl_callback_type;  omapi_object_type_t *dhcpctl_callback_type;
 omapi_object_type_t *dhcpctl_remote_type;  omapi_object_type_t *dhcpctl_remote_type;
Line 91  dhcpctl_status dhcpctl_initialize ()
Line 94  dhcpctl_status dhcpctl_initialize ()
    synchronous     synchronous
    returns nonzero status code if it didn't connect, zero otherwise     returns nonzero status code if it didn't connect, zero otherwise
    stores connection handle through connection, which can be used     stores connection handle through connection, which can be used
    for subsequent access to the specified server.     for subsequent access to the specified server.
    server_name is the name of the server, and port is the TCP     server_name is the name of the server, and port is the TCP
    port on which it is listening.     port on which it is listening.
    authinfo is the handle to an object containing authentication     authinfo is the handle to an object containing authentication
Line 102  dhcpctl_status dhcpctl_connect (dhcpctl_
Line 105  dhcpctl_status dhcpctl_connect (dhcpctl_
                                 dhcpctl_handle authinfo)                                  dhcpctl_handle authinfo)
 {  {
         isc_result_t status;          isc_result_t status;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_connect(%s:%d)", server_name, port);
   #endif
   
         status = omapi_generic_new (connection, MDL);          status = omapi_generic_new (connection, MDL);
         if (status != ISC_R_SUCCESS) {          if (status != ISC_R_SUCCESS) {
Line 110  dhcpctl_status dhcpctl_connect (dhcpctl_
Line 116  dhcpctl_status dhcpctl_connect (dhcpctl_
   
         status = omapi_protocol_connect (*connection, server_name,          status = omapi_protocol_connect (*connection, server_name,
                                          (unsigned)port, authinfo);                                           (unsigned)port, authinfo);
         if (status == ISC_R_SUCCESS)          if (status == ISC_R_SUCCESS) {
   #ifdef DEBUG_DHCPCTL
                   log_debug("dhcpctl_connect success");
   #endif
                 return status;                  return status;
           }
   
         if (status != DHCP_R_INCOMPLETE) {          if (status != DHCP_R_INCOMPLETE) {
                 omapi_object_dereference (connection, MDL);                  omapi_object_dereference (connection, MDL);
   #ifdef DEBUG_DHCPCTL
                   log_debug("dhcpctl_connect failed:%s",
                             isc_result_totext (status));
   #endif
                 return status;                  return status;
         }          }
   
         status = omapi_wait_for_completion (*connection, 0);          status = omapi_wait_for_completion (*connection, 0);
         if (status != ISC_R_SUCCESS) {          if (status != ISC_R_SUCCESS) {
                 omapi_object_dereference (connection, MDL);                  omapi_object_dereference (connection, MDL);
   #ifdef DEBUG_DHCPCTL
                   log_debug("dhcpctl_connect, wait failed:%s",
                             isc_result_totext (status));
   #endif
                 return status;                  return status;
         }          }
   
   #ifdef DEBUG_DHCPCTL
                   log_debug("dhcpctl_connect success");
   #endif
           return status;
   }
   
   /* dhcpctl_timed_connect
   
      synchronous
      returns nonzero status code if it didn't connect, zero otherwise
      stores connection handle through connection, which can be used
      for subsequent access to the specified server.
      server_name is the name of the server, and port is the TCP
      port on which it is listening.
      authinfo is the handle to an object containing authentication
      information.
      How long the function waits for the connection to complete is
      dictated by the value of the parameter, t. If the value is nul,
      it will wait indefinitely. Otherwise it will wait for the amount
      of time specified by t (tv_sec:tv_usec). Values of zero for both
      fields are valid but not recommended. */
   dhcpctl_status dhcpctl_timed_connect (dhcpctl_handle *connection,
                                         const char *server_name, int port,
                                         dhcpctl_handle authinfo,
                                         struct timeval *t)
   {
           isc_result_t status;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_timed_connect(%s:%d)", server_name, port);
   #endif
           status = omapi_generic_new (connection, MDL);
           if (status != ISC_R_SUCCESS) {
                   return status;
           }
   
           status = omapi_protocol_connect (*connection, server_name,
                                            (unsigned)port, authinfo);
   
           if (status == ISC_R_SUCCESS) {
                   return status;
           }
   
           if (status == DHCP_R_INCOMPLETE) {
                   isc_result_t wait_status = ISC_R_SUCCESS;
   
                   /* Wait for it to complete */
                   status = dhcpctl_timed_wait_for_completion(*connection,
                                                              &wait_status, t);
                   if (status == ISC_R_SUCCESS) {
                           status = wait_status;
                   }
           }
   
           if (status != ISC_R_SUCCESS) {
                   omapi_object_dereference (connection, MDL);
           }
         return status;          return status;
 }  }
   
Line 142  dhcpctl_status dhcpctl_connect (dhcpctl_
Line 217  dhcpctl_status dhcpctl_connect (dhcpctl_
 dhcpctl_status dhcpctl_wait_for_completion (dhcpctl_handle h,  dhcpctl_status dhcpctl_wait_for_completion (dhcpctl_handle h,
                                             dhcpctl_status *s)                                              dhcpctl_status *s)
 {  {
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_wait_for_completion");
   #endif
         isc_result_t status;          isc_result_t status;
         status = omapi_wait_for_completion (h, 0);          status = omapi_wait_for_completion (h, 0);
         if (status != ISC_R_SUCCESS)          if (status != ISC_R_SUCCESS) {
                 return status;                  return status;
           }
         if (h -> type == dhcpctl_remote_type)          if (h -> type == dhcpctl_remote_type)
                 *s = ((dhcpctl_remote_object_t *)h) -> waitstatus;                  *s = ((dhcpctl_remote_object_t *)h) -> waitstatus;
   
           return ISC_R_SUCCESS;
   }
   
   /* dhcpctl_timed_wait_for_completion
   
      synchronous
      returns zero if the callback completes, a nonzero status if
      there was some problem relating to the wait operation.   The
      status of the queued request will be stored through s, and
      will also be either zero for success or nonzero for some kind
      of failure.  How long the function waits for a response is
      dictated by the value of the parameter, t. If the value is nul,
      it will wait indefinitely or until the connection is lost.
      Otherwise it will wait for the amount of time specified by t
     (tv_sec:tv_usec). Values of zero for both fields are valid
      but not recommended.  The result of the request as processed on the
      server is returned via the parameter, s.  This performs the same
      function as dhcpctl_set_callback and the subsequent callback,
      for programs that want to do inline execution instead of using
      callbacks. */
   
   dhcpctl_status dhcpctl_timed_wait_for_completion (dhcpctl_handle h,
                                                     dhcpctl_status *s,
                                                     struct timeval *t)
   {
           isc_result_t status;
           struct timeval adjusted_t;
   
   #ifdef DEBUG_DHCPCTL
           if (t) {
                   log_debug ("dhcpctl_timed_wait_for_completion"
                              "(%u.%u secs.usecs)",
                              (unsigned int)(t->tv_sec),
                              (unsigned int)(t->tv_usec));
           } else {
                   log_debug ("dhcpctl_timed_wait_for_completion(no timeout)");
           }
   #endif
   
           if (t) {
                   struct timeval now;
                   gettimeofday (&now, (struct timezone *)0);
                   adjusted_t.tv_sec = now.tv_sec + t->tv_sec;
                   adjusted_t.tv_usec = now.tv_usec + t->tv_usec;
           }
   
           status = omapi_wait_for_completion (h, (t ? &adjusted_t : 0));
           if (status != ISC_R_SUCCESS) {
                   return status;
           }
   
           if (h->type == dhcpctl_remote_type) {
                   *s = ((dhcpctl_remote_object_t *)h)->waitstatus;
           }
   
         return ISC_R_SUCCESS;          return ISC_R_SUCCESS;
 }  }
   
   
 /* dhcpctl_get_value  /* dhcpctl_get_value
   
    synchronous     synchronous
    returns zero if the call succeeded, a nonzero status code if     returns zero if the call succeeded, a nonzero status code if
    it didn't.     it didn't.
    result is the address of an empty data string (initialized     result is the address of an empty data string (initialized
    with bzero or cleared with data_string_forget).   On     with bzero or cleared with data_string_forget).   On
    successful completion, the addressed data string will contain     successful completion, the addressed data string will contain
Line 173  dhcpctl_status dhcpctl_get_value (dhcpct
Line 309  dhcpctl_status dhcpctl_get_value (dhcpct
         omapi_value_t *tv = (omapi_value_t *)0;          omapi_value_t *tv = (omapi_value_t *)0;
         unsigned len;          unsigned len;
         int ip;          int ip;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_get_value(%s)", value_name);
   #endif
   
         status = omapi_get_value_str (h, (omapi_object_t *)0, value_name, &tv);          status = omapi_get_value_str (h, (omapi_object_t *)0, value_name, &tv);
         if (status != ISC_R_SUCCESS)          if (status != ISC_R_SUCCESS)
Line 237  dhcpctl_status dhcpctl_get_boolean (int 
Line 376  dhcpctl_status dhcpctl_get_boolean (int 
         isc_result_t status;          isc_result_t status;
         dhcpctl_data_string data = (dhcpctl_data_string)0;          dhcpctl_data_string data = (dhcpctl_data_string)0;
         int rv;          int rv;
   
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_get_boolean(%s)", value_name);
   #endif
   
         status = dhcpctl_get_value (&data, h, value_name);          status = dhcpctl_get_value (&data, h, value_name);
         if (status != ISC_R_SUCCESS)          if (status != ISC_R_SUCCESS)
                 return status;                  return status;
Line 263  dhcpctl_status dhcpctl_set_value (dhcpct
Line 406  dhcpctl_status dhcpctl_set_value (dhcpct
         isc_result_t status;          isc_result_t status;
         omapi_typed_data_t *tv = (omapi_typed_data_t *)0;          omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
         omapi_data_string_t *name = (omapi_data_string_t *)0;          omapi_data_string_t *name = (omapi_data_string_t *)0;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_set_value(%s)", value_name);
   #endif
   
         status = omapi_data_string_new (&name, strlen (value_name), MDL);          status = omapi_data_string_new (&name, strlen (value_name), MDL);
         if (status != ISC_R_SUCCESS)          if (status != ISC_R_SUCCESS)
Line 296  dhcpctl_status dhcpctl_set_string_value 
Line 442  dhcpctl_status dhcpctl_set_string_value 
         isc_result_t status;          isc_result_t status;
         omapi_typed_data_t *tv = (omapi_typed_data_t *)0;          omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
         omapi_data_string_t *name = (omapi_data_string_t *)0;          omapi_data_string_t *name = (omapi_data_string_t *)0;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_set_string_value(%s)", value_name);
   #endif
   
         status = omapi_data_string_new (&name, strlen (value_name), MDL);          status = omapi_data_string_new (&name, strlen (value_name), MDL);
         if (status != ISC_R_SUCCESS)          if (status != ISC_R_SUCCESS)
Line 329  dhcpctl_status dhcpctl_set_data_value (d
Line 478  dhcpctl_status dhcpctl_set_data_value (d
         omapi_typed_data_t *tv = (omapi_typed_data_t *)0;          omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
         omapi_data_string_t *name = (omapi_data_string_t *)0;          omapi_data_string_t *name = (omapi_data_string_t *)0;
         unsigned ll;          unsigned ll;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_set_data_value(%s)", value_name);
   #endif
   
         ll = strlen (value_name);          ll = strlen (value_name);
         status = omapi_data_string_new (&name, ll, MDL);          status = omapi_data_string_new (&name, ll, MDL);
Line 360  dhcpctl_status dhcpctl_set_null_value (d
Line 512  dhcpctl_status dhcpctl_set_null_value (d
         isc_result_t status;          isc_result_t status;
         omapi_data_string_t *name = (omapi_data_string_t *)0;          omapi_data_string_t *name = (omapi_data_string_t *)0;
         unsigned ll;          unsigned ll;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_set_null_value(%s)", value_name);
   #endif
   
         ll = strlen (value_name);          ll = strlen (value_name);
         status = omapi_data_string_new (&name, ll, MDL);          status = omapi_data_string_new (&name, ll, MDL);
Line 384  dhcpctl_status dhcpctl_set_boolean_value
Line 539  dhcpctl_status dhcpctl_set_boolean_value
         isc_result_t status;          isc_result_t status;
         omapi_typed_data_t *tv = (omapi_typed_data_t *)0;          omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
         omapi_data_string_t *name = (omapi_data_string_t *)0;          omapi_data_string_t *name = (omapi_data_string_t *)0;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_set_boolean_value(%s)", value_name);
   #endif
   
         status = omapi_data_string_new (&name, strlen (value_name), MDL);          status = omapi_data_string_new (&name, strlen (value_name), MDL);
         if (status != ISC_R_SUCCESS)          if (status != ISC_R_SUCCESS)
Line 413  dhcpctl_status dhcpctl_set_int_value (dh
Line 571  dhcpctl_status dhcpctl_set_int_value (dh
         isc_result_t status;          isc_result_t status;
         omapi_typed_data_t *tv = (omapi_typed_data_t *)0;          omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
         omapi_data_string_t *name = (omapi_data_string_t *)0;          omapi_data_string_t *name = (omapi_data_string_t *)0;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_set_int_value(%s)", value_name);
   #endif
   
         status = omapi_data_string_new (&name, strlen (value_name), MDL);          status = omapi_data_string_new (&name, strlen (value_name), MDL);
         if (status != ISC_R_SUCCESS)          if (status != ISC_R_SUCCESS)
Line 443  dhcpctl_status dhcpctl_object_update (dh
Line 604  dhcpctl_status dhcpctl_object_update (dh
         isc_result_t status;          isc_result_t status;
         omapi_object_t *message = (omapi_object_t *)0;          omapi_object_t *message = (omapi_object_t *)0;
         dhcpctl_remote_object_t *ro;          dhcpctl_remote_object_t *ro;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_object_update");
   #endif
   
         if (h -> type != dhcpctl_remote_type)          if (h -> type != dhcpctl_remote_type)
                 return DHCP_R_INVALIDARG;                  return DHCP_R_INVALIDARG;
Line 492  dhcpctl_status dhcpctl_object_refresh (d
Line 656  dhcpctl_status dhcpctl_object_refresh (d
         isc_result_t status;          isc_result_t status;
         omapi_object_t *message = (omapi_object_t *)0;          omapi_object_t *message = (omapi_object_t *)0;
         dhcpctl_remote_object_t *ro;          dhcpctl_remote_object_t *ro;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_object_refresh");
   #endif
   
         if (h -> type != dhcpctl_remote_type)          if (h -> type != dhcpctl_remote_type)
                 return DHCP_R_INVALIDARG;                  return DHCP_R_INVALIDARG;
Line 545  dhcpctl_status dhcpctl_object_remove (dh
Line 712  dhcpctl_status dhcpctl_object_remove (dh
         isc_result_t status;          isc_result_t status;
         omapi_object_t *message = (omapi_object_t *)0;          omapi_object_t *message = (omapi_object_t *)0;
         dhcpctl_remote_object_t *ro;          dhcpctl_remote_object_t *ro;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_object_remove");
   #endif
   
         if (h -> type != dhcpctl_remote_type)          if (h -> type != dhcpctl_remote_type)
                 return DHCP_R_INVALIDARG;                  return DHCP_R_INVALIDARG;
Line 587  dhcpctl_status dhcpctl_object_remove (dh
Line 757  dhcpctl_status dhcpctl_object_remove (dh
 isc_result_t dhcpctl_data_string_dereference (dhcpctl_data_string *vp,  isc_result_t dhcpctl_data_string_dereference (dhcpctl_data_string *vp,
                                               const char *file, int line)                                                const char *file, int line)
 {  {
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_data_string_dereference");
   #endif
         return omapi_data_string_dereference (vp, file, line);          return omapi_data_string_dereference (vp, file, line);
 }  }
   
   dhcpctl_status dhcpctl_disconnect (dhcpctl_handle *connection,
                                      int force)
   {
           isc_result_t status;
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_disconnect()");
   #endif
           if (!connection || !((*connection)->outer) ||
               !((*connection)->outer->type) ||
                ((*connection)->outer->type != omapi_type_protocol) ||
                !((*connection)->outer->outer)) {
                   log_debug("dhcpctl_disconnect detected invalid arg");
                   return DHCP_R_INVALIDARG;
           }
   
           status = omapi_disconnect ((*connection)->outer->outer, force);
           if (status == ISC_R_SUCCESS) {
   #ifdef DEBUG_DHCPCTL
                   log_debug("dhcpctl_disconnect success");
   #endif
                   omapi_object_dereference (connection, MDL);
                   return status;
           }
   
   #ifdef DEBUG_DHCPCTL
           log_debug("dhcpctl_disconnect failed:%s",
                      isc_result_totext (status));
   #endif
           return status;
   }
   
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
CVSweb <webmaster@jp.NetBSD.org>