replace byte/short/integer with uint8/uint16/uint32

diff --git a/share/dictionary/dhcpv4/dictionary.freeradius.internal b/share/dictionary/dhcpv4/dictionary.freeradius.internal
index 8eb38995e7dc63656dc9feeb98b0298c4ca77b4e..902216b1411bd9a96554c91a0607eafb0506fc86 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.freeradius.internal
+++ b/share/dictionary/dhcpv4/dictionary.freeradius.internal
@@ -20,17 +20,17 @@
 
 #
 FLAGS  internal
-ATTRIBUTE      Opcode                                  256     byte
+ATTRIBUTE      Opcode                                  256     uint8
 
 VALUE  Opcode                          Client-Message          1
 VALUE  Opcode                          Server-Message          2
 
-ATTRIBUTE      Hardware-Type                           257     byte
-ATTRIBUTE      Hardware-Address-Length                 258     byte
-ATTRIBUTE      Hop-Count                               259     byte
-ATTRIBUTE      Transaction-Id                          260     integer
-ATTRIBUTE      Number-of-Seconds                       261     short
-ATTRIBUTE      Flags                                   262     short
+ATTRIBUTE      Hardware-Type                           257     uint8
+ATTRIBUTE      Hardware-Address-Length                 258     uint8
+ATTRIBUTE      Hop-Count                               259     uint8
+ATTRIBUTE      Transaction-Id                          260     uint32
+ATTRIBUTE      Number-of-Seconds                       261     uint16
+ATTRIBUTE      Flags                                   262     uint16
 ATTRIBUTE      Client-IP-Address                       263     ipaddr
 ATTRIBUTE      Your-IP-Address                         264     ipaddr
 ATTRIBUTE      Server-IP-Address                       265     ipaddr
@@ -40,7 +40,7 @@ ATTRIBUTE     Server-Host-Name                        268     string    # 64 octets
 ATTRIBUTE      Boot-Filename                           269     string    # 128 octets
 
 ATTRIBUTE      Relay-To-IP-Address                     270     ipaddr
-ATTRIBUTE      Relay-Max-Hop-Count                     271     integer
+ATTRIBUTE      Relay-Max-Hop-Count                     271     uint32
 
 # This is copied from the request packet, giaddr, and
 # added to the reply packet by the server core.
@@ -86,7 +86,7 @@ VALUE Hardware-Type                   Pure-IP                 35
 VALUE  Hardware-Type                   HW-EXP1                 36
 VALUE  Hardware-Type                   HFI                     37
 
-ATTRIBUTE      Packet-Type                             273     integer
+ATTRIBUTE      Packet-Type                             273     uint32
 
 VALUE  Packet-Type                     Discover                1
 VALUE  Packet-Type                     Offer                   2

diff --git a/share/dictionary/dhcpv4/dictionary.isc b/share/dictionary/dhcpv4/dictionary.isc
index bdb71752b8e30820daee87f067d09565bfb8f8f0..2caba2fde3f05287daee0c51bd7738c8b3b4814d 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.isc
+++ b/share/dictionary/dhcpv4/dictionary.isc
@@ -16,7 +16,7 @@
 ##############################################################################
 
 ATTRIBUTE      subnet-mask                             1       ipaddr
-ATTRIBUTE      time-offset                             2       integer
+ATTRIBUTE      time-offset                             2       uint32
 ATTRIBUTE      routers                                 3       ipaddr array
 ATTRIBUTE      time-servers                            4       ipaddr array
 ATTRIBUTE      ien116-name-servers                     5       ipaddr array
@@ -27,7 +27,7 @@ ATTRIBUTE     lpr-servers                             9       ipaddr array
 ATTRIBUTE      impress-servers                         10      ipaddr array
 ATTRIBUTE      resource-location-servers               11      ipaddr array
 ATTRIBUTE      host-name                               12      string
-ATTRIBUTE      boot-size                               13      short
+ATTRIBUTE      boot-size                               13      uint16
 ATTRIBUTE      merit-dump                              14      string
 ATTRIBUTE      domain-name                             15      string
 ATTRIBUTE      swap-server                             16      ipaddr
@@ -36,11 +36,11 @@ ATTRIBUTE   extensions-path                         18      string
 ATTRIBUTE      ip-forwarding                           19      bool
 ATTRIBUTE      non-local-source-routing                20      bool
 ATTRIBUTE      policy-filter                           21      octets # array of (ipaddr / mask)
-ATTRIBUTE      max-dgram-reassembly                    22      short
+ATTRIBUTE      max-dgram-reassembly                    22      uint16
 ATTRIBUTE      default-ip-ttl                          23      octets
-ATTRIBUTE      path-mtu-aging-timeout                  24      integer
-ATTRIBUTE      path-mtu-plateau-table                  25      short array
-ATTRIBUTE      interface-mtu                           26      short
+ATTRIBUTE      path-mtu-aging-timeout                  24      uint32
+ATTRIBUTE      path-mtu-plateau-table                  25      uint16 array
+ATTRIBUTE      interface-mtu                           26      uint16
 ATTRIBUTE      all-subnets-local                       27      bool
 ATTRIBUTE      broadcast-address                       28      ipaddr
 ATTRIBUTE      perform-mask-discovery                  29      bool
@@ -49,10 +49,10 @@ ATTRIBUTE   router-discovery                        31      bool
 ATTRIBUTE      router-solicitation-address             32      ipaddr
 ATTRIBUTE      static-routes                           33      ipaddr array
 ATTRIBUTE      trailer-encapsulation                   34      bool
-ATTRIBUTE      arp-cache-timeout                       35      integer
+ATTRIBUTE      arp-cache-timeout                       35      uint32
 ATTRIBUTE      ieee802-3-encapsulation                 36      bool
 ATTRIBUTE      default-tcp-ttl                         37      octets
-ATTRIBUTE      tcp-keepalive-interval                  38      integer
+ATTRIBUTE      tcp-keepalive-interval                  38      uint32
 ATTRIBUTE      tcp-keepalive-garbage                   39      bool
 ATTRIBUTE      nis-domain                              40      string
 ATTRIBUTE      nis-servers                             41      ipaddr array
@@ -65,15 +65,15 @@ ATTRIBUTE   netbios-scope                           47      string
 ATTRIBUTE      font-servers                            48      ipaddr array
 ATTRIBUTE      x-display-manager                       49      ipaddr array
 ATTRIBUTE      dhcp-requested-address                  50      ipaddr
-ATTRIBUTE      dhcp-lease-time                         51      integer
+ATTRIBUTE      dhcp-lease-time                         51      uint32
 ATTRIBUTE      dhcp-option-overload                    52      octets
-ATTRIBUTE      dhcp-message-type                       53      byte
+ATTRIBUTE      dhcp-message-type                       53      uint8
 ATTRIBUTE      dhcp-server-identifier                  54      ipaddr
 ATTRIBUTE      dhcp-parameter-request-list             55      uint8 array
 ATTRIBUTE      dhcp-message                            56      string
-ATTRIBUTE      dhcp-max-message-size                   57      short
-ATTRIBUTE      dhcp-renewal-time                       58      integer
-ATTRIBUTE      dhcp-rebinding-time                     59      integer
+ATTRIBUTE      dhcp-max-message-size                   57      uint16
+ATTRIBUTE      dhcp-renewal-time                       58      uint32
+ATTRIBUTE      dhcp-rebinding-time                     59      uint32
 ATTRIBUTE      vendor-class-identifier                 60      octets
 ATTRIBUTE      dhcp-client-identifier                  61      octets
 ATTRIBUTE      nwip-domain                             62      string
@@ -99,17 +99,17 @@ ATTRIBUTE   relay-agent-information                 82      tlv
 ATTRIBUTE      circuit-id                              .1      octets
 ATTRIBUTE      remote-id                               .2      octets
 ATTRIBUTE      agent-id                                .3      ipaddr
-ATTRIBUTE      DOCSIS-device-class                     .4      integer
+ATTRIBUTE      DOCSIS-device-class                     .4      uint32
 ATTRIBUTE      link-selection                          .5      ipaddr
-ATTRIBUTE      relay-port                              .19     short
+ATTRIBUTE      relay-port                              .19     uint16
 ATTRIBUTE      nds-servers                             85      ipaddr array
 ATTRIBUTE      nds-tree-name                           86      string
 ATTRIBUTE      nds-context                             87      string
 ATTRIBUTE      bcms-controller-names                   88      string
 ATTRIBUTE      bcms-controller-address                 89      ipaddr array
-ATTRIBUTE      client-last-transaction-time            91      integer
+ATTRIBUTE      client-last-transaction-time            91      uint32
 ATTRIBUTE      associated-ip                           92      ipaddr array
-ATTRIBUTE      pxe-system-type                         93      short array
+ATTRIBUTE      pxe-system-type                         93      uint16 array
 ATTRIBUTE      pxe-interface-id                        94      octets array
 ATTRIBUTE      pxe-client-id                           97      octets array
 ATTRIBUTE      uap-servers                             98      string
@@ -120,7 +120,7 @@ ATTRIBUTE   netinfo-server-address                  112     ipaddr array
 ATTRIBUTE      netinfo-server-tag                      113     string
 ATTRIBUTE      default-url                             114     string
 ATTRIBUTE      auto-config                             116     octets
-ATTRIBUTE      name-service-search                     117     short array
+ATTRIBUTE      name-service-search                     117     uint16 array
 ATTRIBUTE      subnet-selection                        118     ipaddr
 ATTRIBUTE      domain-search                           119     string array
 ATTRIBUTE      vivco                                   124     octets array
@@ -136,6 +136,6 @@ ATTRIBUTE   v4-portparams                           159     octets array
 ATTRIBUTE      v4-captive-portal                       160     string
 ATTRIBUTE      loader-configfile                       209     string
 ATTRIBUTE      loader-pathprefix                       210     string
-ATTRIBUTE      loader-reboottime                       211     integer
+ATTRIBUTE      loader-reboottime                       211     uint32
 ATTRIBUTE      option-6rd                              212     octets array
 ATTRIBUTE      v4-access-domain                        213     string

diff --git a/share/dictionary/dhcpv4/dictionary.rfc2131 b/share/dictionary/dhcpv4/dictionary.rfc2131
index d2ea938cd12e284b6d320caf62156e2749ca215a..f2d418782e8fa71cee6c4995da4c436eb354aa4b 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc2131
+++ b/share/dictionary/dhcpv4/dictionary.rfc2131
@@ -26,7 +26,7 @@
 #ATTRIBUTE     Pad                             0       octets
 ATTRIBUTE      Subnet-Mask                             1       ipaddr
 # Time Offset in twos-complement notation.
-ATTRIBUTE      Time-Offset                             2       integer
+ATTRIBUTE      Time-Offset                             2       uint32
 ATTRIBUTE      Router-Address                          3       ipaddr array
 ATTRIBUTE      Time-Server                             4       ipaddr array
 ATTRIBUTE      IEN-116-Name-Server                     5       ipaddr array
@@ -39,8 +39,8 @@ ATTRIBUTE     Impress-Server                          10      ipaddr array
 ATTRIBUTE      RLP-Server                              11      ipaddr array
 # Hostname string
 ATTRIBUTE      Hostname                                12      string
-# Size of boot file in 512 byte
-ATTRIBUTE      Boot-File-Size                          13      short
+# Size of boot file in 512 uint8
+ATTRIBUTE      Boot-File-Size                          13      uint16
 # Client to dump and name
 ATTRIBUTE      Merit-Dump-File                         14      octets
 ATTRIBUTE      Domain-Name                             15      string
@@ -52,11 +52,11 @@ ATTRIBUTE   IP-Forward-Enable                       19      bool
 ATTRIBUTE      Source-Route-Enable                     20      bool
 # Routing Policy Filters
 ATTRIBUTE      Policy-Filter                           21      ipv4prefix      prefix=split,array
-ATTRIBUTE      Max-Datagram-Reassembly-Size            22      short
+ATTRIBUTE      Max-Datagram-Reassembly-Size            22      uint16
 ATTRIBUTE      Default-IP-TTL                          23      octets
-ATTRIBUTE      Path-MTU-Aging-Timeout                  24      integer
-ATTRIBUTE      Path-MTU-Plateau-Table                  25      short array
-ATTRIBUTE      Interface-MTU-Size                      26      short
+ATTRIBUTE      Path-MTU-Aging-Timeout                  24      uint32
+ATTRIBUTE      Path-MTU-Plateau-Table                  25      uint16 array
+ATTRIBUTE      Interface-MTU-Size                      26      uint16
 ATTRIBUTE      All-Subnets-Are-Local                   27      bool
 ATTRIBUTE      Broadcast-Address                       28      ipaddr
 ATTRIBUTE      Perform-Mask-Discovery                  29      bool
@@ -66,10 +66,10 @@ ATTRIBUTE   Router-Solicitation-Address             32      ipaddr
 # first is destination address, second is router.
 ATTRIBUTE      Static-Routes                           33      ipaddr array
 ATTRIBUTE      Trailer-Encapsulation                   34      bool
-ATTRIBUTE      ARP-Cache-Timeout                       35      integer
+ATTRIBUTE      ARP-Cache-Timeout                       35      uint32
 ATTRIBUTE      Ethernet-Encapsulation                  36      bool
-ATTRIBUTE      Default-TCP-TTL                         37      byte
-ATTRIBUTE      Keep-Alive-Interval                     38      integer
+ATTRIBUTE      Default-TCP-TTL                         37      uint8
+ATTRIBUTE      Keep-Alive-Interval                     38      uint32
 ATTRIBUTE      Keep-Alive-Garbage                      39      bool
 ATTRIBUTE      NIS-Domain-Name                         40      string
 ATTRIBUTE      NIS-Servers                             41      ipaddr array
@@ -78,16 +78,16 @@ ATTRIBUTE   NTP-Servers                             42      ipaddr array
 ATTRIBUTE      Vendor                                  43      octets # tlv
 ATTRIBUTE      NETBIOS-Name-Servers                    44      ipaddr array
 ATTRIBUTE      NETBIOS-Dgm-Dist-Servers                45      ipaddr array
-ATTRIBUTE      NETBIOS-Node-Type                       46      byte
+ATTRIBUTE      NETBIOS-Node-Type                       46      uint8
 # N NETBIOS Scope
 ATTRIBUTE      NETBIOS                                 47      octets
 ATTRIBUTE      X-Window-Font-Server                    48      ipaddr array
 ATTRIBUTE      X-Window-Display-Mgr                    49      ipaddr array
 ATTRIBUTE      Requested-IP-Address                    50      ipaddr
-ATTRIBUTE      IP-Address-Lease-Time                   51      integer
+ATTRIBUTE      IP-Address-Lease-Time                   51      uint32
 # Overload "sname" or "file"
-ATTRIBUTE      Overload                                52      byte
-ATTRIBUTE      Message-Type                            53      byte
+ATTRIBUTE      Overload                                52      uint8
+ATTRIBUTE      Message-Type                            53      uint8
 
 VALUE  Message-Type                    Discover                1
 VALUE  Message-Type                    Offer                   2
@@ -107,13 +107,13 @@ VALUE     Message-Type                    Lease-Query-Done        15
 
 ATTRIBUTE      Server-Identifier                       54      ipaddr
 
-# Array of 1-byte numbers indicating which options the client
+# Array of 1-uint8 numbers indicating which options the client
 # would like to see in the response.
-ATTRIBUTE      Parameter-Request-List                  55      byte array
+ATTRIBUTE      Parameter-Request-List                  55      uint8 array
 ATTRIBUTE      Error-Message                           56      string
-ATTRIBUTE      Maximum-Msg-Size                        57      short
-ATTRIBUTE      Renewal-Time                            58      integer
-ATTRIBUTE      Rebinding-Time                          59      integer
+ATTRIBUTE      Maximum-Msg-Size                        57      uint16
+ATTRIBUTE      Renewal-Time                            58      uint32
+ATTRIBUTE      Rebinding-Time                          59      uint32
 ATTRIBUTE      Vendor-Class-Identifier                 60      octets
 
 # Client Identifier
@@ -151,7 +151,7 @@ ATTRIBUTE   Circuit-Id                              .1      octets
 ATTRIBUTE      Remote-Id                               .2      octets
 
 # 3 is reserved and shouldn't be used for anything
-ATTRIBUTE      Docsis-Device-Class                     .4      integer
+ATTRIBUTE      Docsis-Device-Class                     .4      uint32
 ATTRIBUTE      Relay-Link-Selection                    .5      ipaddr
 ATTRIBUTE      Subscriber-Id                           .6      string
 
@@ -166,7 +166,7 @@ ATTRIBUTE   Authentication-Information              82.8    octets
 #
 ATTRIBUTE      Vendor-Specific-Information             82.9    octets
 
-ATTRIBUTE      Relay-Agent-Flags                       82.10   byte
+ATTRIBUTE      Relay-Agent-Flags                       82.10   uint8
 ATTRIBUTE      Server-Identifier-Override              82.11   ipaddr
 
 # Internet Storage Name Service
@@ -181,7 +181,7 @@ ATTRIBUTE   NDS-Context                             87      octets
 # Authentication
 ATTRIBUTE      Authentication                          90      octets
 
-ATTRIBUTE      Client-Last-Transaction-Time            91      integer # seconds on the past
+ATTRIBUTE      Client-Last-Transaction-Time            91      uint32 # seconds on the past
 
 ATTRIBUTE      associated-ip                           92      ipaddr array
 
@@ -203,7 +203,7 @@ ATTRIBUTE   Netinfo-Tag                             113     octets
 # URL
 ATTRIBUTE      URL                                     114     octets
 # DHCP Auto-Configuration
-ATTRIBUTE      Auto-Config                             116     byte
+ATTRIBUTE      Auto-Config                             116     uint8
 # Name Service Search
 ATTRIBUTE      Name-Service-Search                     117     octets
 # Subnet Selection Option
@@ -275,7 +275,7 @@ ATTRIBUTE   Site-specific-28                        252     octets
 ATTRIBUTE      Site-specific-29                        253     octets
 ATTRIBUTE      Site-specific-30                        253     octets
 
-ATTRIBUTE      End-Of-Options                          255     byte
+ATTRIBUTE      End-Of-Options                          255     uint8
 
 VALUE  Parameter-Request-List          Subnet-Mask             1
 VALUE  Parameter-Request-List          Time-Offset             2

diff --git a/share/dictionary/dhcpv4/dictionary.rfc6926 b/share/dictionary/dhcpv4/dictionary.rfc6926
index b4d5f0412e49e7b915755b65fbd19da149f0baae..eb47d6885ea7c5f5a2aca7d708f116fb307726a1 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc6926
+++ b/share/dictionary/dhcpv4/dictionary.rfc6926
@@ -12,10 +12,10 @@
 
 ATTRIBUTE      Query-Status-Code                       151     octets
 ATTRIBUTE      Query-Server-Base-Time                  152     date
-ATTRIBUTE      Query-Start-Time-Of-State               153     integer
+ATTRIBUTE      Query-Start-Time-Of-State               153     uint32
 ATTRIBUTE      Query-Start-Time                        154     date
 ATTRIBUTE      Query-End-Time                          155     date
-ATTRIBUTE      State                                   156     byte
+ATTRIBUTE      State                                   156     uint8
 
 VALUE  State                           Available               1
 VALUE  State                           Active                  2
@@ -26,4 +26,4 @@ VALUE State                           Reset                   6
 VALUE  State                           Remote                  7
 VALUE  State                           Transitioning           8
 
-ATTRIBUTE      Data-Source                             157     byte
+ATTRIBUTE      Data-Source                             157     uint8