diff options
| -rw-r--r-- | dhcpv6/option_requestedoption_test.go | 2 | ||||
| -rw-r--r-- | dhcpv6/types.go | 68 |
2 files changed, 35 insertions, 35 deletions
diff --git a/dhcpv6/option_requestedoption_test.go b/dhcpv6/option_requestedoption_test.go index a024742..3e79480 100644 --- a/dhcpv6/option_requestedoption_test.go +++ b/dhcpv6/option_requestedoption_test.go @@ -25,7 +25,7 @@ func TestOptRequestedOptionString(t *testing.T) { require.Contains( t, opt.String(), - "OPTION_CLIENTID, OPTION_SERVERID", + "Client Identifier, Server Identifier", "String() should contain the options specified", ) opt.AddRequestedOption(12345) diff --git a/dhcpv6/types.go b/dhcpv6/types.go index 8fd4381..560581c 100644 --- a/dhcpv6/types.go +++ b/dhcpv6/types.go @@ -228,46 +228,46 @@ const ( // optionCodeToString maps DHCPv6 OptionCodes to human-readable strings. var optionCodeToString = map[OptionCode]string{ - OptionClientID: "OPTION_CLIENTID", - OptionServerID: "OPTION_SERVERID", - OptionIANA: "OPTION_IA_NA", - OptionIATA: "OPTION_IA_TA", - OptionIAAddr: "OPTION_IAADDR", - OptionORO: "OPTION_ORO", - OptionPreference: "OPTION_PREFERENCE", - OptionElapsedTime: "OPTION_ELAPSED_TIME", - OptionRelayMsg: "OPTION_RELAY_MSG", - OptionAuth: "OPTION_AUTH", - OptionUnicast: "OPTION_UNICAST", - OptionStatusCode: "OPTION_STATUS_CODE", - OptionRapidCommit: "OPTION_RAPID_COMMIT", - OptionUserClass: "OPTION_USER_CLASS", - OptionVendorClass: "OPTION_VENDOR_CLASS", - OptionVendorOpts: "OPTION_VENDOR_OPTS", - OptionInterfaceID: "OPTION_INTERFACE_ID", - OptionReconfMessage: "OPTION_RECONF_MSG", - OptionReconfAccept: "OPTION_RECONF_ACCEPT", + OptionClientID: "Client Identifier", + OptionServerID: "Server Identifier", + OptionIANA: "IA_NA", + OptionIATA: "IA_TA", + OptionIAAddr: "IA IP Address", + OptionORO: "Requested Options", + OptionPreference: "Preference", + OptionElapsedTime: "Elapsed Time", + OptionRelayMsg: "Relay Message", + OptionAuth: "Auth", + OptionUnicast: "Unicast", + OptionStatusCode: "Status Code", + OptionRapidCommit: "Rapid Commit", + OptionUserClass: "User Class", + OptionVendorClass: "Vendor Class", + OptionVendorOpts: "Vendor Options", + OptionInterfaceID: "Interface ID", + OptionReconfMessage: "Reconfig Message", + OptionReconfAccept: "Reconfig Accept", OptionSIPServersDomainNameList: "SIP Servers Domain Name List", OptionSIPServersIPv6AddressList: "SIP Servers IPv6 Address List", OptionDNSRecursiveNameServer: "DNS Recursive Name Server", OptionDomainSearchList: "Domain Search List", - OptionIAPD: "OPTION_IA_PD", - OptionIAPrefix: "OPTION_IAPREFIX", - OptionNISServers: "OPTION_NIS_SERVERS", - OptionNISPServers: "OPTION_NISP_SERVERS", - OptionNISDomainName: "OPTION_NIS_DOMAIN_NAME", - OptionNISPDomainName: "OPTION_NISP_DOMAIN_NAME", + OptionIAPD: "IA_PD", + OptionIAPrefix: "IA Prefix", + OptionNISServers: "NIS Servers", + OptionNISPServers: "NISP Servers", + OptionNISDomainName: "NIS Domain Name", + OptionNISPDomainName: "NISP Domain Name", OptionSNTPServerList: "SNTP Server List", OptionInformationRefreshTime: "Information Refresh Time", OptionBCMCSControllerDomainNameList: "BCMCS Controller Domain Name List", OptionBCMCSControllerIPv6AddressList: "BCMCS Controller IPv6 Address List", - OptionGeoConfCivic: "OPTION_GEOCONF", - OptionRemoteID: "OPTION_REMOTE_ID", + OptionGeoConfCivic: "Geoconf", + OptionRemoteID: "Remote ID", OptionRelayAgentSubscriberID: "Relay-Agent Subscriber ID", OptionFQDN: "FQDN", OptionPANAAuthenticationAgent: "PANA Authentication Agent", - OptionNewPOSIXTimezone: "OPTION_NEW_POSIX_TIME_ZONE", - OptionNewTZDBTimezone: "OPTION_NEW_TZDB_TIMEZONE", + OptionNewPOSIXTimezone: "New POSIX Timezone", + OptionNewTZDBTimezone: "New TZDB Timezone", OptionEchoRequest: "Echo Request", OptionLQQuery: "OPTION_LQ_QUERY", OptionClientData: "OPTION_CLIENT_DATA", @@ -281,13 +281,13 @@ var optionCodeToString = map[OptionCode]string{ OptionRelayID: "RELAY_ID", OptionIPv6AddressMOS: "OPTION-IPv6_Address-MoS", OptionIPv6FQDNMOS: "OPTION-IPv6-FQDN-MoS", - OptionNTPServer: "OPTION_NTP_SERVER", + OptionNTPServer: "NTP Server", OptionV6AccessDomain: "OPTION_V6_ACCESS_DOMAIN", OptionSIPUACSList: "OPTION_SIP_UA_CS_LIST", - OptionBootfileURL: "OPT_BOOTFILE_URL", - OptionBootfileParam: "OPT_BOOTFILE_PARAM", - OptionClientArchType: "OPTION_CLIENT_ARCH_TYPE", - OptionNII: "OPTION_NII", + OptionBootfileURL: "Boot File URL", + OptionBootfileParam: "Boot File Parameters", + OptionClientArchType: "Client Architecture", + OptionNII: "Network Interface ID", OptionGeolocation: "OPTION_GEOLOCATION", OptionAFTRName: "OPTION_AFTR_NAME", OptionERPLocalDomainName: "OPTION_ERP_LOCAL_DOMAIN_NAME", |