Allow FQDN to be decoded to userland. Also, don't exclude hostname when sending FQDN.

diff --git a/dhcp.c b/dhcp.c
index 6c93c791b5af3cbb578758defb582ddd8669ec1d..be59c9ba5ccef199a96139eb3f65b2acbe0c8b26 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -137,6 +137,7 @@ static const struct dhcp_opt const dhcp_opts[] = {
        { 75,   IPV4 | ARRAY,   "streettalk_server" },
        { 76,   IPV4 | ARRAY,   "streettalk_directory_assistance_server" },
        { 77,   STRING,         "user_class" },
+       { 81,   STRING | RFC3397,       "fqdn_name" },
        { 85,   IPV4 | ARRAY,   "nds_servers" },
        { 86,   STRING,         "nds_tree_name" },
        { 87,   STRING,         "nds_context" },
@@ -372,7 +373,9 @@ decode_rfc3397(char *out, ssize_t len, int pl, const uint8_t *p)
        while (q - p < pl) {
                r = NULL;
                hops = 0;
-               while ((l = *q++)) {
+               /* We check we are inside our length again incase
+                * the data is NOT terminated correctly. */
+               while ((l = *q++) && q - p < pl) {
                        ltype = l & 0xc0;
                        if (ltype == 0x80 || ltype == 0x40)
                                return 0;
@@ -708,6 +711,8 @@ encode_rfc1035(const char *src, uint8_t *dst, size_t len)
        uint8_t *p = dst;
        uint8_t *lp = p++;
 
+       if (len == 0)
+               return 0;
        while (c < src + len) {
                if (*c == '\0')
                        break;
@@ -852,33 +857,32 @@ make_message(struct dhcp_message **message,
            type == DHCP_REQUEST)
        {
                if (options->hostname[0]) {
-                       if (options->fqdn == FQDN_DISABLE) {
-                               *p++ = DHCP_HOSTNAME;
-                               memcpy(p, options->hostname, options->hostname[0] + 1);
-                               p += options->hostname[0] + 1;
-                       } else {
-                               /* IETF DHC-FQDN option (81), RFC4702 */
-                               *p++ = DHCP_FQDN;
-                               lp = p;
-                               *p++ = 3;
-                               /*
-                                * Flags: 0000NEOS
-                                * S: 1 => Client requests Server to update
-                                *         a RR in DNS as well as PTR
-                                * O: 1 => Server indicates to client that
-                                *         DNS has been updated
-                                * E: 1 => Name data is DNS format
-                                * N: 1 => Client requests Server to not
-                                *         update DNS
-                                */
-                               *p++ = (options->fqdn & 0x09) | 0x04;
-                               *p++ = 0; /* from server for PTR RR */
-                               *p++ = 0; /* from server for A RR if S=1 */
-                               ul = encode_rfc1035(options->hostname + 1, p,
-                                                   options->hostname[0]);
-                               *lp += ul;
-                               p += ul;
-                       }
+                       *p++ = DHCP_HOSTNAME;
+                       memcpy(p, options->hostname, options->hostname[0] + 1);
+                       p += options->hostname[0] + 1;
+               }
+               if (options->fqdn != FQDN_DISABLE) {
+                       /* IETF DHC-FQDN option (81), RFC4702 */
+                       *p++ = DHCP_FQDN;
+                       lp = p;
+                       *p++ = 3;
+                       /*
+                        * Flags: 0000NEOS
+                        * S: 1 => Client requests Server to update
+                        *         a RR in DNS as well as PTR
+                        * O: 1 => Server indicates to client that
+                        *         DNS has been updated
+                        * E: 1 => Name data is DNS format
+                        * N: 1 => Client requests Server to not
+                        *         update DNS
+                        */
+                       *p++ = (options->fqdn & 0x09) | 0x04;
+                       *p++ = 0; /* from server for PTR RR */
+                       *p++ = 0; /* from server for A RR if S=1 */
+                       ul = encode_rfc1035(options->hostname + 1, p,
+                                       options->hostname[0]);
+                       *lp += ul;
+                       p += ul;
                }
 
                /* vendor is already encoded correctly, so just add it */
@@ -1210,6 +1214,11 @@ configure_env(char **env, const char *prefix, const struct dhcp_message *dhcp,
                p = get_option(dhcp, opt->option, &pl, NULL);
                if (!p)
                        continue;
+               /* We only want the FQDN name */
+               if (opt->option == DHCP_FQDN) {
+                       p += 3;
+                       pl -= 3;
+               }
                len = print_option(NULL, 0, opt->type, pl, p);
                if (len < 0)
                        return -1;

diff --git a/dhcpcd-hooks/29-lookup-hostname b/dhcpcd-hooks/29-lookup-hostname
index 90080ef005cb1e29f53bd85424f7ac1234646245..3dfade3f2203e7de36c97be406944bb6a8e05c43 100644 (file)
--- a/dhcpcd-hooks/29-lookup-hostname
+++ b/dhcpcd-hooks/29-lookup-hostname
@@ -24,7 +24,7 @@ lookup_hostname()
 
 set_hostname()
 {
-       if [ -z "${new_host_name}" ]; then
+       if [ -z "${new_host_name}" -a -z "${new_fqdn_name}" ]; then
                export new_host_name="$(lookup_hostname)"
        fi
 }

diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
index 500ec0f21c54490bd4bc6a345f139967a0d8ec76..9bd127c7e943d3b8b22ac6a868b0ae086093c6d3 100644 (file)
--- a/dhcpcd-hooks/30-hostname
+++ b/dhcpcd-hooks/30-hostname
@@ -3,16 +3,23 @@
 need_hostname()
 {
        case "$(hostname)" in
-               ""|"(none)"|localhost)  [ -n "${new_host_name}" ];;
-               "${old_host_name}")     true;;
-               *)                      false;;
+       ""|"(none)"|localhost)
+               [ -n "${new_host_name}" -o -n "${new_fqdn_name}" ];;
+       "${old_host_name}"|"${old_fqdn_name}")
+               true;;
+       *)
+               false;;
        esac
 }
 
 set_hostname()
 {
        if need_hostname; then
-               hostname "${new_host_name}"
+               if [ -n "${new_host_name}" ]; then
+                       hostname "${new_host_name}"
+               else
+                       hostname "${new_fqdn_name}"
+               fi
        fi
 }