dhcpsapi 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3287715b0d2e3c50cf1be8df79f06db118c13d6e
-  data.tar.gz: 14fc8fe2e68f3a0ec64a43568d3d8e454a25f6ea
+  metadata.gz: 8de1b8659955ca630bb905e80a25a5f9cd3da392
+  data.tar.gz: e084547979b41c1943dcc23a411a8b00c45cb8e4
 SHA512:
-  metadata.gz: e8db883b8de7ace5b47217d15a4f28c019aad3b0bff3540f03547683c92a45ceb8a4fee30219a855f4d49735f34177e32ad0927044484a9afb39cc37b4567d5d
-  data.tar.gz: 184a8fae50cbce438dcf5bda28ce954e9bcf6dbf85e9e65b578aab82256f55e7d2dadef82af97bd2ae2f513d8cd719553506d5657d56cc6b9b605fa00189aea2
+  metadata.gz: 795bb44c1631a4b0144a9c668644fcd95ed8f12a2dd2ed64f4b41f1ab4664eedda2d19a493b9a1da0eee82f6c0717ab63f2f2c857c00fa15235d5fcea80e84f1
+  data.tar.gz: 1074863887ba322813fc7a034debc55f3ff55b372bb5533455c01725f086d3ba0c8fdbe73b30b08af88e85492d37cb20f3b3c714d06530fa6f9001324684ea5e

data/lib/dhcpsapi/client.rb

@@ -1,23 +1,4 @@
 module DhcpsApi
-  class QuarantineStatus
-    #The DHCP client is compliant with the health policies defined by the administrator and has normal access to the network.
-    NOQUARANTINE = 0
-    #The DHCP client is not compliant with the health policies defined by the administrator and is being quarantined with restricted access to the network.
-    RESTRICTEDACCESS = 1
-    #The DHCP client is not compliant with the health policies defined by the administrator and is being denied access to the network.
-    # The DHCP server does not grant an IP address lease to this client.
-    DROPPACKET = 2
-    #The DHCP client is not compliant with the health policies defined by the administrator and is being granted normal access to the network for a limited time.
-    PROBATION = 3
-    #The DHCP client is exempt from compliance with the health policies defined by the administrator and is granted normal access to the network.
-    EXEMPT = 4
-    #The DHCP client is put into the default quarantine state configured on the DHCP NAP server. When a network policy server (NPS) is unavailable,
-    # the DHCP client can be put in any of the states NOQUARANTINE, RESTRICTEDACCESS, or DROPPACKET, depending on the default setting on the DHCP NAP server.
-    DEFAULTQUARSETTING = 5
-    #No quarantine.
-    NOQUARINFO = 6
-  end
-
 =begin
   typedef struct _DHCP_CLIENT_INFO_PB {
     DHCP_IP_ADDRESS  ClientIpAddress;

data/lib/dhcpsapi/common_data_structs.rb

@@ -1,32 +1,4 @@
 module DhcpsApi
-  DHCP_FLAGS_OPTION_IS_VENDOR = 3
-
-  class ClientType
-    # The client's dynamic IP address protocol is unknown.
-    CLIENT_TYPE_UNSPECIFIED = 0x0
-    # The client uses DHCP for dynamic IP address service.
-    CLIENT_TYPE_DHCP = 0x1
-    # The client uses BOOTP for dynamic IP address service.
-    CLIENT_TYPE_BOOTP = 0x2
-    # The client can use either DHCP or BOOTP for dynamic IP address service.
-    CLIENT_TYPE_BOTH =( CLIENT_TYPE_DHCP | CLIENT_TYPE_BOOTP )
-    # The client does not use a supported dynamic IP address service.
-    CLIENT_TYPE_NONE = 0x64
-    CLIENT_TYPE_RESERVATION_FLAG = 0x4
-  end
-
-  class DHCP_FORCE_FLAG
-    # The operation deletes all client records affected by the element, and then deletes the element.
-    DhcpFullForce = 0
-    # The operation only deletes the subnet element, leaving intact any client records impacted by the change.
-    DhcpNoForce = 1
-    # The operation deletes all client records affected by the element, and then deletes the element from the DHCP server.
-    # But it does not delete any registered DNS records associated with the deleted client records from the DNS server.
-    # This flag is only valid when passed to DhcpDeleteSubnet.
-    # Note that the minimum server OS requirement for this value is Windows Server 2012 R2 with KB 3100473 installed.
-    DhcpFailoverForce = 2
-  end
-
 =begin
   typedef struct _DHCP_IP_ARRAY {
     DWORD             NumElements;
@@ -128,19 +100,6 @@ module DhcpsApi
     end
   end
 
-=begin
-  typedef enum _DHCP_CLIENT_SEARCH_TYPE {
-    DhcpClientIpAddress,
-        DhcpClientHardwareAddress,
-        DhcpClientName
-  } DHCP_SEARCH_INFO_TYPE, *LPDHCP_SEARCH_INFO_TYPE;
-=end
-  class DHCP_SEARCH_INFO_TYPE
-    DhcpClientIpAddress = 0
-    DhcpClientHardwareAddress = 1
-    DhcpClientName = 2
-  end
-
 =begin
   typedef struct _DHCP_CLIENT_SEARCH_INFO {
     DHCP_SEARCH_INFO_TYPE SearchType;
@@ -161,37 +120,6 @@ module DhcpsApi
            :search_info, SEARCH_INFO_UNION
   end
 
-=begin
-  typedef enum _DHCP_OPTION_DATA_TYPE {
-    DhcpByteOption,
-    DhcpWordOption,
-    DhcpDWordOption,
-    DhcpDWordDWordOption,
-    DhcpIpAddressOption,
-    DhcpStringDataOption,
-    DhcpBinaryDataOption,
-    DhcpEncapsulatedDataOption,
-    DhcpIpv6AddressOption
-  } DHCP_OPTION_DATA_TYPE, *LPDHCP_OPTION_DATA_TYPE;
-=end
-  class DHCP_OPTION_DATA_TYPE
-    DhcpByteOption = 0
-    DhcpWordOption = 1
-    DhcpDWordOption = 2
-    # The option data is stored as a DWORD_DWORD value.
-    DhcpDWordDWordOption = 3
-    # The option data is an IP address, stored as a DHCP_IP_ADDRESS value (DWORD).
-    DhcpIpAddressOption = 4
-    # The option data is stored as a Unicode string.
-    DhcpStringDataOption = 5
-    # The option data is stored as a DHCP_BINARY_DATA structure.
-    DhcpBinaryDataOption = 6
-    # The option data is encapsulated and stored as a DHCP_BINARY_DATA structure.
-    DhcpEncapsulatedDataOption = 7
-    # The option data is stored as a Unicode string.
-    DhcpIpv6AddressOption = 8
-  end
-
   class DWORD_DWORD < DHCPS_Struct
     layout :dword1, :uint32,
            :dword2, :uint32

data/lib/dhcpsapi/enums.rb

@@ -0,0 +1,150 @@
+module DhcpsApi
+  DHCP_FLAGS_OPTION_IS_VENDOR = 3
+
+  class ClientType
+    # The client's dynamic IP address protocol is unknown.
+    CLIENT_TYPE_UNSPECIFIED = 0x0
+    # The client uses DHCP for dynamic IP address service.
+    CLIENT_TYPE_DHCP = 0x1
+    # The client uses BOOTP for dynamic IP address service.
+    CLIENT_TYPE_BOOTP = 0x2
+    # The client can use either DHCP or BOOTP for dynamic IP address service.
+    CLIENT_TYPE_BOTH =( CLIENT_TYPE_DHCP | CLIENT_TYPE_BOOTP )
+    # The client does not use a supported dynamic IP address service.
+    CLIENT_TYPE_NONE = 0x64
+    CLIENT_TYPE_RESERVATION_FLAG = 0x4
+  end
+
+  class DHCP_FORCE_FLAG
+    # The operation deletes all client records affected by the element, and then deletes the element.
+    DhcpFullForce = 0
+    # The operation only deletes the subnet element, leaving intact any client records impacted by the change.
+    DhcpNoForce = 1
+    # The operation deletes all client records affected by the element, and then deletes the element from the DHCP server.
+    # But it does not delete any registered DNS records associated with the deleted client records from the DNS server.
+    # This flag is only valid when passed to DhcpDeleteSubnet.
+    # Note that the minimum server OS requirement for this value is Windows Server 2012 R2 with KB 3100473 installed.
+    DhcpFailoverForce = 2
+  end
+
+=begin
+  typedef enum _DHCP_CLIENT_SEARCH_TYPE {
+    DhcpClientIpAddress,
+        DhcpClientHardwareAddress,
+        DhcpClientName
+  } DHCP_SEARCH_INFO_TYPE, *LPDHCP_SEARCH_INFO_TYPE;
+=end
+  class DHCP_SEARCH_INFO_TYPE
+    DhcpClientIpAddress = 0
+    DhcpClientHardwareAddress = 1
+    DhcpClientName = 2
+  end
+
+=begin
+  typedef enum _DHCP_OPTION_DATA_TYPE {
+    DhcpByteOption,
+    DhcpWordOption,
+    DhcpDWordOption,
+    DhcpDWordDWordOption,
+    DhcpIpAddressOption,
+    DhcpStringDataOption,
+    DhcpBinaryDataOption,
+    DhcpEncapsulatedDataOption,
+    DhcpIpv6AddressOption
+  } DHCP_OPTION_DATA_TYPE, *LPDHCP_OPTION_DATA_TYPE;
+=end
+  class DHCP_OPTION_DATA_TYPE
+    DhcpByteOption = 0
+    DhcpWordOption = 1
+    DhcpDWordOption = 2
+    # The option data is stored as a DWORD_DWORD value.
+    DhcpDWordDWordOption = 3
+    # The option data is an IP address, stored as a DHCP_IP_ADDRESS value (DWORD).
+    DhcpIpAddressOption = 4
+    # The option data is stored as a Unicode string.
+    DhcpStringDataOption = 5
+    # The option data is stored as a DHCP_BINARY_DATA structure.
+    DhcpBinaryDataOption = 6
+    # The option data is encapsulated and stored as a DHCP_BINARY_DATA structure.
+    DhcpEncapsulatedDataOption = 7
+    # The option data is stored as a Unicode string.
+    DhcpIpv6AddressOption = 8
+  end
+
+  class QuarantineStatus
+    #The DHCP client is compliant with the health policies defined by the administrator and has normal access to the network.
+    NOQUARANTINE = 0
+    #The DHCP client is not compliant with the health policies defined by the administrator and is being quarantined with restricted access to the network.
+    RESTRICTEDACCESS = 1
+    #The DHCP client is not compliant with the health policies defined by the administrator and is being denied access to the network.
+    # The DHCP server does not grant an IP address lease to this client.
+    DROPPACKET = 2
+    #The DHCP client is not compliant with the health policies defined by the administrator and is being granted normal access to the network for a limited time.
+    PROBATION = 3
+    #The DHCP client is exempt from compliance with the health policies defined by the administrator and is granted normal access to the network.
+    EXEMPT = 4
+    #The DHCP client is put into the default quarantine state configured on the DHCP NAP server. When a network policy server (NPS) is unavailable,
+    # the DHCP client can be put in any of the states NOQUARANTINE, RESTRICTEDACCESS, or DROPPACKET, depending on the default setting on the DHCP NAP server.
+    DEFAULTQUARSETTING = 5
+    #No quarantine.
+    NOQUARINFO = 6
+  end
+
+=begin
+typedef enum _DHCP_OPTION_TYPE {
+  DhcpUnaryElementTypeOption,
+      DhcpArrayTypeOption
+} DHCP_OPTION_TYPE, *LPDHCP_OPTION_TYPE;
+=end
+  class DHCP_OPTION_TYPE
+    DhcpUnaryElementTypeOption = 0
+    DhcpArrayTypeOption = 1
+  end
+
+  #
+  # DHCP_OPTION_SCOPE_TYPE enumeration defines the set of possible DHCP option scopes.
+  #
+  # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa363363(v=vs.85).aspx
+  #
+  class DHCP_OPTION_SCOPE_TYPE
+    # The DHCP options correspond to the default scope.
+    DhcpDefaultOptions = 0
+    # The DHCP options correspond to the global scope.
+    DhcpGlobalOptions = 1
+    # The DHCP options correspond to a specific subnet scope.
+    DhcpSubnetOptions = 2
+    # The DHCP options correspond to a reserved IP address.
+    DhcpReservedOptions = 3
+    # The DHCP options correspond to a multicast scope.
+    DhcpMScopeOptions = 4
+  end
+
+  class DHCP_SUBNET_STATE
+    DhcpsApiubnetEnabled = 0
+    DhcpsApiubnetDisabled = 1
+    DhcpsApiubnetEnabledSwitched = 2
+    DhcpsApiubnetDisabledSwitched = 3
+    DhcpsApiubnetInvalidState = 4
+  end
+
+=begin
+  typedef enum _DHCP_SUBNET_ELEMENT_TYPE_V5 {
+    DhcpIpRanges,
+    DhcpSecondaryHosts,
+    DhcpReservedIps,
+    DhcpExcludedIpRanges,
+    DhcpIpRangesDhcpOnly,
+    DhcpIpRangesDhcpBootp,
+    DhcpIpRangesBootpOnly
+  } DHCP_SUBNET_ELEMENT_TYPE, *LPDHCP_SUBNET_ELEMENT_TYPE;
+=end
+  class DHCP_SUBNET_ELEMENT_TYPE
+    DhcpIpRanges = 0
+    DhcpSecondaryHosts = 1
+    DhcpReservedIps = 2
+    DhcpExcludedIpRanges = 3
+    DhcpIpRangesDhcpOnly = 4
+    DhcpIpRangesDhcpBootp = 5
+    DhcpIpRangesBootpOnly = 6
+  end
+end

data/lib/dhcpsapi/option.rb

@@ -1,15 +1,4 @@
 module DhcpsApi
-=begin
-  typedef enum _DHCP_OPTION_TYPE {
-    DhcpUnaryElementTypeOption,
-    DhcpArrayTypeOption
-  } DHCP_OPTION_TYPE, *LPDHCP_OPTION_TYPE;
-=end
-  class DHCP_OPTION_TYPE
-    DhcpUnaryElementTypeOption = 0
-    DhcpArrayTypeOption = 1
-  end
-
 =begin
   typedef struct _DHCP_OPTION {
     DHCP_OPTION_ID   OptionID;

data/lib/dhcpsapi/option_value.rb

@@ -13,25 +13,6 @@ module DhcpsApi
            :reserved_ip_subnet_address, :uint32
   end
 
-
-  #
-  # DHCP_OPTION_SCOPE_TYPE enumeration defines the set of possible DHCP option scopes.
-  #
-  # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa363363(v=vs.85).aspx
-  #
-  class DHCP_OPTION_SCOPE_TYPE
-    # The DHCP options correspond to the default scope.
-    DhcpDefaultOptions = 0
-    # The DHCP options correspond to the global scope.
-    DhcpGlobalOptions = 1
-    # The DHCP options correspond to a specific subnet scope.
-    DhcpSubnetOptions = 2
-    # The DHCP options correspond to a reserved IP address.
-    DhcpReservedOptions = 3
-    # The DHCP options correspond to a multicast scope.
-    DhcpMScopeOptions = 4
-  end
-
   #
   # DHCP_RESERVED_SCOPE_UNION describes a DHCP scope.
   #

data/lib/dhcpsapi/subnet.rb

@@ -1,12 +1,4 @@
 module DhcpsApi
-  class DHCP_SUBNET_STATE
-    DhcpsApiubnetEnabled = 0
-    DhcpsApiubnetDisabled = 1
-    DhcpsApiubnetEnabledSwitched = 2
-    DhcpsApiubnetDisabledSwitched = 3
-    DhcpsApiubnetInvalidState = 4
-  end
-
 =begin
   typedef struct _DHCP_SUBNET_INFO {
     DHCP_IP_ADDRESS   SubnetAddress;

data/lib/dhcpsapi/subnet_element.rb

@@ -1,25 +1,4 @@
 module DhcpsApi
-=begin
-  typedef enum _DHCP_SUBNET_ELEMENT_TYPE_V5 {
-    DhcpIpRanges,
-    DhcpSecondaryHosts,
-    DhcpReservedIps,
-    DhcpExcludedIpRanges,
-    DhcpIpRangesDhcpOnly,
-    DhcpIpRangesDhcpBootp,
-    DhcpIpRangesBootpOnly
-  } DHCP_SUBNET_ELEMENT_TYPE, *LPDHCP_SUBNET_ELEMENT_TYPE;
-=end
-  class DHCP_SUBNET_ELEMENT_TYPE
-    DhcpIpRanges = 0
-    DhcpSecondaryHosts = 1
-    DhcpReservedIps = 2
-    DhcpExcludedIpRanges = 3
-    DhcpIpRangesDhcpOnly = 4
-    DhcpIpRangesDhcpBootp = 5
-    DhcpIpRangesBootpOnly = 6
-  end
-
 =begin
   typedef struct _DHCP_SUBNET_ELEMENT_DATA_V4 {
     DHCP_SUBNET_ELEMENT_TYPE ElementType;

data/lib/dhcpsapi/version.rb

@@ -1,3 +1,3 @@
 module DhcpsApi
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/dhcpsapi.rb

@@ -1,5 +1,6 @@
 require 'ffi'
 require 'dhcpsapi/ffi'
+require 'dhcpsapi/enums'
 require 'dhcpsapi/version'
 require 'dhcpsapi/common'
 require 'dhcpsapi/common_data_structs'

data/lib/dhcpsapi_for_testing/server.rb

@@ -0,0 +1,9 @@
+module DhcpsApi
+  class Server
+    attr_reader :server_ip_address
+
+    def initialize(server_ip_address)
+      @server_ip_address = server_ip_address
+    end
+  end
+end

data/lib/dhcpsapi_for_testing.rb

@@ -0,0 +1,3 @@
+require 'dhcpsapi/enums'
+require 'dhcpsapi/error'
+require 'dhcpsapi_for_testing/server'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dhcpsapi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby wrappers for MS DHCP api
@@ -80,6 +80,7 @@ files:
 - lib/dhcpsapi/client.rb
 - lib/dhcpsapi/common.rb
 - lib/dhcpsapi/common_data_structs.rb
+- lib/dhcpsapi/enums.rb
 - lib/dhcpsapi/error.rb
 - lib/dhcpsapi/ffi.rb
 - lib/dhcpsapi/misc.rb
@@ -90,6 +91,8 @@ files:
 - lib/dhcpsapi/subnet.rb
 - lib/dhcpsapi/subnet_element.rb
 - lib/dhcpsapi/version.rb
+- lib/dhcpsapi_for_testing.rb
+- lib/dhcpsapi_for_testing/server.rb
 homepage: https://github.com/witlessbird/ruby-dhcpsapi
 licenses:
 - Apache License, v2.0
@@ -100,12 +103,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []