Add support for RFC3495 DHCP option for CableLabs Clients.

Note that for the TSP suboption 3 we only support the FQDN encoding.

diff --git a/dhcpcd-definitions.conf b/dhcpcd-definitions.conf
index b9e388a457cb0deae695ea80b2916acad09be1e0..dff361abc9b269224a640203d5597e13ffe39f5d 100644 (file)
--- a/dhcpcd-definitions.conf
+++ b/dhcpcd-definitions.conf
@@ -1,3 +1,6 @@
+# Copyright (c) 2006-2014 Roy Marples
+# All rights reserved
+
 # DHCP option definitions for dhcpcd(8)
 # These are used to translate DHCP options into shell variables
 # for use in dhcpcd-run-hooks(8)
@@ -128,6 +131,31 @@ define 119 domain                  domain_search
 # DHCP Session Initiated Protocol Servers, RFC3361
 define 120     rfc3361                 sip_server
 
+# DHCP CableLabs Client, RFC3495
+define 122     encap                   tsp
+encap 1                ipaddress               dhcp_server
+encap 2                ipaddress               dhcp_secondary_server
+encap 3                embed                   provisioning_server
+embed          byte                    type
+embed          domain                  fqdn
+#embed         ipaddress               address
+# We only support FQDN in option 3 out of the box which is type 0.
+# Type 1 is an ipaddress, but we currently have no logic to change embedded
+# type based on the content of an option.
+# To swap it out, just comment / uncomment the above two lines to your liking.
+# However, ensure that only one is uncommented.
+encap 4                embed                   as_req_as_rep_backoff
+embed          uint32                  nominal
+embed          uint32                  maximum
+embed          uint32                  retry
+encap 5                embed                   ap_req_ap_rep_backoff
+embed          uint32                  nominal
+embed          uint32                  maximum
+embed          uint32                  retry
+encap 6                domain                  kerberos_realm
+encap 7                bool                    ticket_granting_server_utilization
+encap 8                byte                    provisioning_timer
+
 # DHCP Vendor-Identifying Vendor Options, RFC3925
 define 124     binhex                  vivco
 define 125     embed                   vivso

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index dec2cbc2a44b8d3a7e3106fb145a67cf5f6f04d2..0363e49ce31ac21d0283f9d2f0a4043c5108d249 100644 (file)
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006-2013 Roy Marples
+.\" Copyright (c) 2006-2014 Roy Marples
 .\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 6, 2013
+.Dd January 8, 2014
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -648,9 +648,9 @@ running on the
 .Xr resolvconf 8
 .Sh STANDARDS
 RFC\ 951 RFC\ 1534 RFC\ 2131, RFC\ 2132, RFC\ 2855, RFC\ 3004, RFC\ 3315,
-RFC\ 3361, RFC\ 3633, RFC\ 3396, RFC\ 3397, RFC\ 3442, RFC\ 3925, RFC\ 3927,
-RFC\ 4039, RFC\ 4075, RFC\ 4242, RFC\ 4361, RFC\ 4390, RFC\ 4702, RFC\ 4704,
-RFC\ 4861, RFC\ 4833, RFC\ 5227, RFC\ 5942, RFC\ 5969, RFC\ 6106.
+RFC\ 3361, RFC\ 3633, RFC\ 3396, RFC\ 3397, RFC\ 3442, RFC\ 3495, RFC\ 3925,
+RFC\ 3927, RFC\ 4039, RFC\ 4075, RFC\ 4242, RFC\ 4361, RFC\ 4390, RFC\ 4702,
+RFC\ 4074, RFC\ 4861, RFC\ 4833, RFC\ 5227, RFC\ 5942, RFC\ 5969, RFC\ 6106.
 .Sh AUTHORS
 .An Roy Marples Aq Mt roy@marples.name
 .Sh BUGS