*
* Version: $Id$
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
* Copyright 2008 The FreeRADIUS server project
#include <freeradius-devel/udpfromto.h>
#include <freeradius-devel/dhcp.h>
+/*
+ * This doesn't appear to work right now.
+ */
+#undef WITH_UDPFROMTO
+
#ifdef WITH_DHCP
+
+#include <sys/ioctl.h>
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include <net/if_arp.h>
+
+
#define DHCP_CHADDR_LEN (16)
#define DHCP_SNAME_LEN (64)
#define DHCP_FILE_LEN (128)
*/
RADIUS_PACKET *fr_dhcp_recv(int sockfd)
{
+ ssize_t len;
uint32_t magic;
struct sockaddr_storage src;
struct sockaddr_storage dst;
int port;
uint8_t *code;
- packet = rad_alloc(0);
+ packet = rad_alloc(NULL, 0);
if (!packet) {
fr_strerror_printf("Failed allocating packet");
return NULL;
}
- memset(packet, 0, sizeof(packet));
+ memset(packet, 0, sizeof(*packet));
packet->data = malloc(MAX_PACKET_SIZE);
if (!packet->data) {
sizeof_src = sizeof(src);
#ifdef WITH_UDPFROMTO
sizeof_dst = sizeof(dst);
- packet->data_len = recvfromto(sockfd, packet->data, MAX_PACKET_SIZE, 0,
- (struct sockaddr *)&src, &sizeof_src,
- (struct sockaddr *)&dst, &sizeof_dst);
+ len = recvfromto(sockfd, packet->data, MAX_PACKET_SIZE, 0,
+ (struct sockaddr *)&src, &sizeof_src,
+ (struct sockaddr *)&dst, &sizeof_dst);
#else
- packet->data_len = recvfrom(sockfd, packet->data, MAX_PACKET_SIZE, 0,
- (struct sockaddr *)&src, &sizeof_src);
+ len = recvfrom(sockfd, packet->data, MAX_PACKET_SIZE, 0,
+ (struct sockaddr *)&src, &sizeof_src);
#endif
- if (packet->data_len <= 0) {
+ if (len <= 0) {
fr_strerror_printf("Failed reading DHCP socket: %s", strerror(errno));
rad_free(&packet);
return NULL;
}
- if (packet->data_len < MIN_PACKET_SIZE) {
+ if (len < MIN_PACKET_SIZE) {
fr_strerror_printf("DHCP packet is too small (%d < %d)",
- packet->data_len, MIN_PACKET_SIZE);
+ (int) len, MIN_PACKET_SIZE);
rad_free(&packet);
return NULL;
}
return NULL;
}
+ packet->data_len = len;
+
memcpy(&magic, packet->data + 236, 4);
magic = ntohl(magic);
if (magic != DHCP_OPTION_MAGIC_NUMBER) {
/*
* This should never fail...
*/
- getsockname(sockfd, (struct sockaddr *) &dst, &sizeof_dst);
+ if (getsockname(sockfd, (struct sockaddr *) &dst, &sizeof_dst) < 0) {
+ fr_strerror_printf("getsockname failed: %s", strerror(errno));
+ rad_free(&packet);
+ return NULL;
+ }
#endif
fr_sockaddr2ipaddr(&dst, sizeof_dst, &packet->dst_ipaddr, &port);
packet->code - PW_DHCP_OFFSET);
}
- DEBUG("Received %s of id %08x from %s:%d to %s:%d",
+ DEBUG("Received %s of id %08x from %s:%d to %s:%d\n",
name, (unsigned int) packet->id,
inet_ntop(packet->src_ipaddr.af,
&packet->src_ipaddr.ipaddr,
socklen_t sizeof_src;
#endif
- fr_ipaddr2sockaddr(&packet->dst_ipaddr, packet->dst_port,
- &dst, &sizeof_dst);
+ if (!fr_ipaddr2sockaddr(&packet->dst_ipaddr, packet->dst_port,
+ &dst, &sizeof_dst)) {
+ return -1;
+ }
+
+ /*
+ * The client doesn't yet have an IP address, but is
+ * expecting an ethernet packet unicast to it's MAC
+ * address. We need to build a raw frame.
+ */
+ if (packet->offset == 0) {
+ /*
+ * FIXME: Insert code here!
+ */
+ }
#ifndef WITH_UDPFROMTO
/*
return sendto(packet->sockfd, packet->data, packet->data_len, 0,
(struct sockaddr *)&dst, sizeof_dst);
#else
- fr_ipaddr2sockaddr(&packet->src_ipaddr, packet->src_port,
- &src, &sizeof_src);
+ if (!fr_ipaddr2sockaddr(&packet->src_ipaddr, packet->src_port,
+ &src, &sizeof_src)) {
+ return -1;
+ }
return sendfromto(packet->sockfd,
packet->data, packet->data_len, 0,
p = data;
while (p < (data + data_len)) {
- vp = paircreate(tlv->attribute | (p[0] << 8), PW_TYPE_OCTETS);
+ vp = paircreate(tlv->da->attr | (p[0] << 8), DHCP_MAGIC_VENDOR);
if (!vp) {
pairfree(&head);
goto make_tlv;
* The caller allocated TLV, so we need to copy the FIRST
* attribute over top of that.
*/
- memcpy(tlv, head, sizeof(*tlv));
- head->next = NULL;
- pairfree(&head);
+ if (head) {
+ memcpy(tlv, head, sizeof(*tlv));
+ head->next = NULL;
+ pairfree(&head);
+ }
+
return 0;
make_tlv:
*/
static int fr_dhcp_attr2vp(VALUE_PAIR *vp, const uint8_t *p, size_t alen)
{
- switch (vp->type) {
+ switch (vp->da->type) {
case PW_TYPE_BYTE:
if (alen != 1) goto raw;
vp->vp_integer = p[0];
memcpy(vp->vp_strvalue, p , alen);
vp->vp_strvalue[alen] = '\0';
break;
-
+
+ /*
+ * Value doesn't match up with attribute type, overwrite the
+ * vp's original DICT_ATTR with an unknown one.
+ */
raw:
- vp->type = PW_TYPE_OCTETS;
-
+ if (pair2unknown(vp) < 0) return -1;
+
case PW_TYPE_OCTETS:
if (alen > 253) return -1;
memcpy(vp->vp_octets, p, alen);
return decode_tlv(vp, p, alen);
default:
- fr_strerror_printf("Internal sanity check %d %d", vp->type, __LINE__);
- break;
+ fr_strerror_printf("Internal sanity check %d %d", vp->da->type, __LINE__);
+ return -1;
} /* switch over type */
vp->length = alen;
return 0;
}
-int fr_dhcp_decode(RADIUS_PACKET *packet)
+ssize_t fr_dhcp_decode_options(uint8_t *data, size_t len, VALUE_PAIR **head)
{
int i;
+ VALUE_PAIR *vp, **tail;
uint8_t *p, *next;
+ next = data;
+
+ *head = NULL;
+ tail = head;
+ /*
+ * FIXME: This should also check sname && file fields.
+ * See the dhcp_get_option() function above.
+ */
+ while (next < (data + len)) {
+ int num_entries, alen;
+ const DICT_ATTR *da;
+
+ p = next;
+
+ if (*p == 0) break;
+ if (*p == 255) break; /* end of options signifier */
+ if ((p + 2) > (data + len)) break;
+
+ next = p + 2 + p[1];
+
+ if (p[1] >= 253) {
+ fr_strerror_printf("Attribute too long %u %u",
+ p[0], p[1]);
+ continue;
+ }
+
+ da = dict_attrbyvalue(p[0], DHCP_MAGIC_VENDOR);
+ if (!da) {
+ fr_strerror_printf("Attribute not in our dictionary: %u",
+ p[0]);
+ continue;
+ }
+
+ vp = NULL;
+ num_entries = 1;
+ alen = p[1];
+ p += 2;
+
+ /*
+ * Could be an array of bytes, integers, etc.
+ */
+ if (da->flags.array) {
+ switch (da->type) {
+ case PW_TYPE_BYTE:
+ num_entries = alen;
+ alen = 1;
+ break;
+
+ case PW_TYPE_SHORT: /* ignore any trailing data */
+ num_entries = alen >> 1;
+ alen = 2;
+ break;
+
+ case PW_TYPE_IPADDR:
+ case PW_TYPE_INTEGER:
+ case PW_TYPE_DATE: /* ignore any trailing data */
+ num_entries = alen >> 2;
+ alen = 4;
+ break;
+
+ default:
+
+ break; /* really an internal sanity failure */
+ }
+ }
+
+ /*
+ * Loop over all of the entries, building VPs
+ */
+ for (i = 0; i < num_entries; i++) {
+ vp = pairmake(da->name, NULL, T_OP_ADD);
+ if (!vp) {
+ fr_strerror_printf("Cannot build attribute %s",
+ fr_strerror());
+ pairfree(head);
+ return -1;
+ }
+
+ /*
+ * Hack for ease of use.
+ */
+ if (fr_dhcp_attr2vp(vp, p, alen) < 0) {
+ pairfree(&vp);
+ pairfree(head);
+ return -1;
+ }
+
+ *tail = vp;
+ while (*tail) {
+ debug_pair(*tail);
+ tail = &(*tail)->next;
+ }
+ p += alen;
+ } /* loop over array entries */
+ } /* loop over the entire packet */
+
+ return next - data;
+}
+
+int fr_dhcp_decode(RADIUS_PACKET *packet)
+{
+ size_t i;
+ uint8_t *p;
uint32_t giaddr;
VALUE_PAIR *head, *vp, **tail;
VALUE_PAIR *maxms, *mtu;
- char buffer[2048];
head = NULL;
tail = &head;
if ((fr_debug_flag > 2) && fr_log_fp) {
for (i = 0; i < packet->data_len; i++) {
- if ((i & 0x0f) == 0x00) fr_strerror_printf("%d: ", i);
+ if ((i & 0x0f) == 0x00) fprintf(fr_log_fp, "%d: ", (int) i);
fprintf(fr_log_fp, "%02x ", packet->data[i]);
if ((i & 0x0f) == 0x0f) fprintf(fr_log_fp, "\n");
}
for (i = 0; i < 14; i++) {
vp = pairmake(dhcp_header_names[i], NULL, T_OP_EQ);
if (!vp) {
- fr_strerror_printf("Parse error %s", fr_strerror());
+ char buffer[256];
+ strlcpy(buffer, fr_strerror(), sizeof(buffer));
+ fr_strerror_printf("Cannot decode packet due to internal error: %s", buffer);
pairfree(&head);
return -1;
}
if ((i == 11) &&
(packet->data[1] == 1) &&
- (packet->data[2] == 6)) {
- vp->type = PW_TYPE_ETHERNET;
+ (packet->data[2] != 6)) {
+ fr_strerror_printf("chaddr of incorrect length for ethernet");
}
- switch (vp->type) {
+ switch (vp->da->type) {
case PW_TYPE_BYTE:
vp->vp_integer = p[0];
vp->length = 1;
break;
default:
- fr_strerror_printf("BAD TYPE %d", vp->type);
+ fr_strerror_printf("BAD TYPE %d", vp->da->type);
pairfree(&vp);
break;
}
if (!vp) continue;
- if (fr_debug_flag > 1) {
- vp_prints(buffer, sizeof(buffer), vp);
- fr_strerror_printf("\t%s", buffer);
- }
+ debug_pair(vp);
*tail = vp;
tail = &vp->next;
}
/*
* Loop over the options.
*/
- next = packet->data + 240;
-
+
/*
- * FIXME: This should also check sname && file fields.
- * See the dhcp_get_option() function above.
+ * Nothing uses tail after this call, if it does in the future
+ * it'll need to find the new tail...
*/
- while (next < (packet->data + packet->data_len)) {
- int num_entries, alen;
- DICT_ATTR *da;
-
- p = next;
-
- if (*p == 0) break;
- if (*p == 255) break; /* end of options signifier */
- if ((p + 2) > (packet->data + packet->data_len)) break;
-
- next = p + 2 + p[1];
-
- if (p[1] >= 253) {
- fr_strerror_printf("Attribute too long %u %u",
- p[0], p[1]);
- continue;
- }
-
- da = dict_attrbyvalue(DHCP2ATTR(p[0]));
- if (!da) {
- fr_strerror_printf("Attribute not in our dictionary: %u",
- p[0]);
- continue;
- }
-
- vp = NULL;
- num_entries = 1;
- alen = p[1];
- p += 2;
-
- /*
- * Could be an array of bytes, integers, etc.
- */
- if (da->flags.array) {
- switch (da->type) {
- case PW_TYPE_BYTE:
- num_entries = alen;
- alen = 1;
- break;
-
- case PW_TYPE_SHORT: /* ignore any trailing data */
- num_entries = alen >> 1;
- alen = 2;
- break;
-
- case PW_TYPE_IPADDR:
- case PW_TYPE_INTEGER:
- case PW_TYPE_DATE: /* ignore any trailing data */
- num_entries = alen >> 2;
- alen = 4;
- break;
-
- default:
-
- break; /* really an internal sanity failure */
- }
- }
-
- /*
- * Loop over all of the entries, building VPs
- */
- for (i = 0; i < num_entries; i++) {
- vp = pairmake(da->name, NULL, T_OP_EQ);
- if (!vp) {
- fr_strerror_printf("Cannot build attribute %s",
- fr_strerror());
- pairfree(&head);
- return -1;
- }
-
- /*
- * Hack for ease of use.
- */
- if ((da->attr == DHCP2ATTR(0x3d)) &&
- !da->flags.array &&
- (alen == 7) && (*p == 1) && (num_entries == 1)) {
- vp->type = PW_TYPE_ETHERNET;
- memcpy(vp->vp_octets, p + 1, 6);
- vp->length = alen;
-
- } else if (fr_dhcp_attr2vp(vp, p, alen) < 0) {
- pairfree(&vp);
- pairfree(&head);
- return -1;
- }
-
- if (fr_debug_flag > 1) {
- vp_prints(buffer, sizeof(buffer), vp);
- fr_strerror_printf("\t%s", buffer);
- }
-
- *tail = vp;
- while (*tail) tail = &vp->next;
- p += alen;
- } /* loop over array entries */
- } /* loop over the entire packet */
+ if (fr_dhcp_decode_options(packet->data + 240, packet->data_len - 240,
+ tail) < 0) {
+ return -1;
+ }
/*
* If DHCP request, set ciaddr to zero.
/*
* DHCP Opcode is request
*/
- vp = pairfind(head, DHCP2ATTR(256));
- if (vp && vp->lvalue == 3) {
+ vp = pairfind(head, 256, DHCP_MAGIC_VENDOR, TAG_ANY);
+ if (vp && vp->vp_integer == 3) {
/*
* Vendor is "MSFT 98"
*/
- vp = pairfind(head, DHCP2ATTR(63));
+ vp = pairfind(head, 63, DHCP_MAGIC_VENDOR, TAG_ANY);
if (vp && (strcmp(vp->vp_strvalue, "MSFT 98") == 0)) {
- vp = pairfind(head, DHCP2ATTR(262));
+ vp = pairfind(head, 262, DHCP_MAGIC_VENDOR, TAG_ANY);
/*
* Reply should be broadcast.
*/
- if (vp) vp->lvalue |= 0x8000;
+ if (vp) vp->vp_integer |= 0x8000;
packet->data[10] |= 0x80;
}
}
* Client can request a LARGER size, but not a smaller
* one. They also cannot request a size larger than MTU.
*/
- maxms = pairfind(packet->vps, DHCP2ATTR(57));
- mtu = pairfind(packet->vps, DHCP2ATTR(26));
+ maxms = pairfind(packet->vps, 57, DHCP_MAGIC_VENDOR, TAG_ANY);
+ mtu = pairfind(packet->vps, 26, DHCP_MAGIC_VENDOR, TAG_ANY);
if (mtu && (mtu->vp_integer < DEFAULT_PACKET_SIZE)) {
fr_strerror_printf("DHCP Fatal: Client says MTU is smaller than minimum permitted by the specification.");
maxms->vp_integer = mtu->vp_integer;
}
+ if (fr_debug_flag > 0) {
+ for (vp = packet->vps; vp != NULL; vp = vp->next) {
+
+ }
+ }
+
if (fr_debug_flag) fflush(stdout);
return 0;
/*
* DHCP-Message-Type is first, for simplicity.
*/
- if (((*a)->attribute == DHCP2ATTR(53)) &&
- (*b)->attribute != DHCP2ATTR(53)) return -1;
+ if (((*a)->da->attr == 53) &&
+ (*b)->da->attr != 53) return -1;
/*
* Relay-Agent is last
*/
- if (((*a)->attribute == DHCP2ATTR(82)) &&
- (*b)->attribute != DHCP2ATTR(82)) return +1;
+ if (((*a)->da->attr == 82) &&
+ (*b)->da->attr != 82) return +1;
- return ((*a)->attribute - (*b)->attribute);
+ return ((*a)->da->attr - (*b)->da->attr);
}
* type, and pack them into the same
* attribute.
*/
- switch (vp->type) {
+ switch (vp->da->type) {
case PW_TYPE_BYTE:
length = 1;
*p = vp->vp_integer & 0xff;
break;
default:
- fr_strerror_printf("BAD TYPE2 %d", vp->type);
+ fr_strerror_printf("BAD TYPE2 %d", vp->da->type);
length = 0;
break;
}
uint8_t *ptr;
VALUE_PAIR *vp, *tlv;
- attribute = vps->attribute & 0xffff00ff;
+ attribute = vps->da->attr & 0xffff00ff;
- tlv = paircreate(attribute, PW_TYPE_TLV);
+ tlv = paircreate(attribute, DHCP_MAGIC_VENDOR);
if (!tlv) return NULL;
tlv->length = 0;
* Group the attributes ONLY until we see a
* non-TLV attribute.
*/
- if (!vp->flags.is_tlv ||
- vp->flags.encoded ||
- ((vp->attribute & 0xffff00ff) != attribute)) {
+ if (!vp->da->flags.is_tlv ||
+ vp->da->flags.extended ||
+ ((vp->da->attr & 0xffff00ff) != attribute)) {
break;
}
ptr = tlv->vp_tlv;
for (vp = vps; vp != NULL; vp = vp->next) {
- if (!vp->flags.is_tlv ||
- vp->flags.encoded ||
- ((vp->attribute & 0xffff00ff) != attribute)) {
+ if (!vp->da->flags.is_tlv ||
+ vp->da->flags.extended ||
+ ((vp->da->attr & 0xffff00ff) != attribute)) {
break;
}
length = fr_dhcp_vp2attr(vp, ptr + 2,
tlv->vp_tlv + tlv->length - ptr);
- if (length > 255) return NULL;
+ if (length > 255) {
+ pairfree(&tlv);
+ return NULL;
+ }
/*
* Pack the attribute.
*/
- ptr[0] = (vp->attribute & 0xff00) >> 8;
+ ptr[0] = (vp->da->attr & 0xff00) >> 8;
ptr[1] = length;
ptr += length + 2;
- vp->flags.encoded = 1;
}
return tlv;
int fr_dhcp_encode(RADIUS_PACKET *packet, RADIUS_PACKET *original)
{
- int i, num_vps;
+ unsigned int i, num_vps;
uint8_t *p;
VALUE_PAIR *vp;
uint32_t lvalue, mms;
size_t dhcp_size, length;
dhcp_packet_t *dhcp;
- char buffer[1024];
if (packet->data) return 0;
* to the client.
*
* if giaddr, send to giaddr.
- * if NAK, send broadcast packet
- * if ciaddr, unicast to ciaddr
- * if flags & 0x8000, broadcast (client request)
- * if sent from 0.0.0.0, broadcast response
- * unicast to client yiaddr
+ * if NAK, send broadcast.
+ * if broadcast flag, send broadcast.
+ * if ciaddr is empty, send broadcast.
+ * otherwise unicast to ciaddr.
*/
/*
*/
dhcp = (dhcp_packet_t *) original->data;
+ /*
+ * Default to sending it via sendto(), without using
+ * raw sockets.
+ */
+ packet->offset = 1;
+
if (dhcp->giaddr != htonl(INADDR_ANY)) {
packet->dst_ipaddr.ipaddr.ip4addr.s_addr = dhcp->giaddr;
packet->dst_port = original->src_port; /* debugging */
}
- } else if (packet->code == PW_DHCP_NAK) {
- packet->dst_ipaddr.ipaddr.ip4addr.s_addr = htonl(INADDR_BROADCAST);
-
- } else if (dhcp->ciaddr != htonl(INADDR_ANY)) {
- packet->dst_ipaddr.ipaddr.ip4addr.s_addr = dhcp->ciaddr;
-
- } else if ((dhcp->flags & 0x8000) != 0) {
- packet->dst_ipaddr.ipaddr.ip4addr.s_addr = htonl(INADDR_BROADCAST);
-
- } else if (packet->dst_ipaddr.ipaddr.ip4addr.s_addr == htonl(INADDR_ANY)) {
+ } else if ((packet->code == PW_DHCP_NAK) ||
+ ((dhcp->flags & 0x8000) != 0) ||
+ (dhcp->ciaddr == htonl(INADDR_ANY))) {
+ /*
+ * The kernel will take care of sending it to
+ * the broadcast MAC.
+ */
packet->dst_ipaddr.ipaddr.ip4addr.s_addr = htonl(INADDR_BROADCAST);
- } else if (dhcp->yiaddr != htonl(INADDR_ANY)) {
- packet->dst_ipaddr.ipaddr.ip4addr.s_addr = dhcp->yiaddr;
-
} else {
- /* leave destination IP alone. */
+ /*
+ * It was broadcast to us: we need to
+ * broadcast the response.
+ */
+ if (packet->src_ipaddr.ipaddr.ip4addr.s_addr != dhcp->ciaddr) {
+ packet->offset = 0;
+ }
+ packet->dst_ipaddr.ipaddr.ip4addr.s_addr = dhcp->ciaddr;
}
/*
packet->code - PW_DHCP_OFFSET);
}
- DEBUG("Sending %s of id %08x from %s:%d to %s:%d",
+ DEBUG("Sending %s of id %08x from %s:%d to %s:%d\n",
name, (unsigned int) packet->id,
inet_ntop(packet->src_ipaddr.af,
&packet->src_ipaddr.ipaddr,
&packet->dst_ipaddr.ipaddr,
dst_ip_buf, sizeof(dst_ip_buf)),
packet->dst_port);
+
+ if (fr_debug_flag) {
+ for (i = 256; i < 269; i++) {
+ vp = pairfind(packet->vps, i, DHCP_MAGIC_VENDOR, TAG_ANY);
+ if (!vp) continue;
+
+ debug_pair(vp);
+ }
+ }
}
p = packet->data;
* smaller one. They also cannot request a size
* larger than MTU.
*/
- vp = pairfind(original->vps, DHCP2ATTR(57));
+ vp = pairfind(original->vps, 57, DHCP_MAGIC_VENDOR, TAG_ANY);
if (vp && (vp->vp_integer > mms)) {
mms = vp->vp_integer;
/*
* RFC 3118: Authentication option.
*/
- vp = pairfind(packet->vps, DHCP2ATTR(90));
+ vp = pairfind(packet->vps, 90, DHCP_MAGIC_VENDOR, TAG_ANY);
if (vp) {
if (vp->length < 2) {
memset(vp->vp_octets + vp->length, 0,
VALUE_PAIR *pass;
vp->vp_octets[1] = 0;
- pass = pairfind(packet->vps, PW_CLEARTEXT_PASSWORD);
+ pass = pairfind(packet->vps, PW_CLEARTEXT_PASSWORD, DHCP_MAGIC_VENDOR, TAG_ANY);
if (pass) {
length = pass->length;
if ((length + 11) > sizeof(vp->vp_octets)) {
}
}
- if (!original) {
- *p++ = 1; /* client message */
+ vp = pairfind(packet->vps, 256, DHCP_MAGIC_VENDOR, TAG_ANY);
+ if (vp) {
+ *p++ = vp->vp_integer & 0xff;
} else {
- *p++ = 2; /* server message */
+ if (!original) {
+ *p++ = 1; /* client message */
+ } else {
+ *p++ = 2; /* server message */
+ }
}
*p++ = 1; /* hardware type = ethernet */
*p++ = 6; /* 6 bytes of ethernet */
- *p++ = 0; /* hops */
+
+ vp = pairfind(packet->vps, 259, DHCP_MAGIC_VENDOR, TAG_ANY);
+ if (vp) {
+ *p++ = vp->vp_integer & 0xff;
+ } else {
+ *p++ = 0; /* hops */
+ }
if (original) { /* Xid */
memcpy(p, original->data + 4, 4);
/*
* Allow the admin to set the broadcast flag.
*/
- vp = pairfind(packet->vps, DHCP2ATTR(262));
+ vp = pairfind(packet->vps, 262, DHCP_MAGIC_VENDOR, TAG_ANY);
if (vp) {
p[0] |= (vp->vp_integer & 0xff00) >> 8;
p[1] |= (vp->vp_integer & 0xff);
/*
* Set client IP address.
*/
- vp = pairfind(packet->vps, DHCP2ATTR(264)); /* Your IP address */
+ vp = pairfind(packet->vps, 264, DHCP_MAGIC_VENDOR, TAG_ANY); /* Your IP address */
if (vp) {
lvalue = vp->vp_ipaddr;
} else {
memcpy(p, &lvalue, 4); /* your IP address */
p += 4;
- vp = pairfind(packet->vps, DHCP2ATTR(265)); /* server IP address */
- if (!vp) vp = pairfind(packet->vps, DHCP2ATTR(54)); /* identifier */
+ vp = pairfind(packet->vps, 265, DHCP_MAGIC_VENDOR, TAG_ANY); /* server IP address */
+ if (!vp) vp = pairfind(packet->vps, 54, DHCP_MAGIC_VENDOR, TAG_ANY); /* identifier */
if (vp) {
lvalue = vp->vp_ipaddr;
} else {
if (original) {
memcpy(p, original->data + 24, 4); /* copy gateway IP address */
} else {
- vp = pairfind(packet->vps, DHCP2ATTR(266));
+ vp = pairfind(packet->vps, 266, DHCP_MAGIC_VENDOR, TAG_ANY);
if (vp) {
lvalue = vp->vp_ipaddr;
} else {
if (original) {
memcpy(p, original->data + 28, DHCP_CHADDR_LEN);
} else {
- vp = pairfind(packet->vps, DHCP2ATTR(267));
+ vp = pairfind(packet->vps, 267, DHCP_MAGIC_VENDOR, TAG_ANY);
if (vp) {
if (vp->length > DHCP_CHADDR_LEN) {
memcpy(p, vp->vp_octets, DHCP_CHADDR_LEN);
}
p += DHCP_CHADDR_LEN;
- memset(p, 0, 192); /* bootp legacy */
- p += 192;
+ /*
+ * Zero our sname && filename fields.
+ */
+ memset(p, 0, DHCP_SNAME_LEN + DHCP_FILE_LEN);
+ p += DHCP_SNAME_LEN;
+
+ /*
+ * Copy over DHCP-Boot-Filename.
+ *
+ * FIXME: This copy should be delayed until AFTER the options
+ * have been processed. If there are too many options for
+ * the packet, then they go into the sname && filename fields.
+ * When that happens, the boot filename is passed as an option,
+ * instead of being placed verbatim in the filename field.
+ */
+ vp = pairfind(packet->vps, 269, DHCP_MAGIC_VENDOR, TAG_ANY);
+ if (vp) {
+ if (vp->length > DHCP_FILE_LEN) {
+ memcpy(p, vp->vp_strvalue, DHCP_FILE_LEN);
+ } else {
+ memcpy(p, vp->vp_strvalue, vp->length);
+ }
+ }
+ p += DHCP_FILE_LEN;
lvalue = htonl(DHCP_OPTION_MAGIC_NUMBER); /* DHCP magic number */
memcpy(p, &lvalue, 4);
for (i = 0; i < 14; i++) {
vp = pairmake(dhcp_header_names[i], NULL, T_OP_EQ);
if (!vp) {
- fr_strerror_printf("Parse error %s", fr_strerror());
+ char buffer[256];
+ strlcpy(buffer, fr_strerror(), sizeof(buffer));
+ fr_strerror_printf("Cannot decode packet due to internal error: %s", buffer);
return -1;
}
- switch (vp->type) {
+ switch (vp->da->type) {
case PW_TYPE_BYTE:
vp->vp_integer = p[0];
vp->length = 1;
break;
default:
- fr_strerror_printf("Internal sanity check failed %d %d", vp->type, __LINE__);
+ fr_strerror_printf("Internal sanity check failed %d %d", vp->da->type, __LINE__);
pairfree(&vp);
break;
}
p += dhcp_header_sizes[i];
-
- vp_prints(buffer, sizeof(buffer), vp);
- fr_strerror_printf("\t%s", buffer);
+
+ debug_pair(vp);
pairfree(&vp);
}
*/
vp = packet->vps;
while (vp) {
- int num_entries = 1;
-
+ unsigned int num_entries = 1;
VALUE_PAIR *same;
- uint8_t *plength, *pattr;
+ uint8_t *plength;
- if (!IS_DHCP_ATTR(vp)) goto next;
- if (vp->attribute == DHCP2ATTR(53)) goto next; /* already done */
- if (((vp->attribute & 0xffff) > 255) &&
- (DHCP_BASE_ATTR(vp->attribute) != PW_DHCP_OPTION_82)) goto next;
+ if (vp->da->vendor != DHCP_MAGIC_VENDOR) goto next;
+ if (vp->da->attr == 53) goto next; /* already done */
+ if ((vp->da->attr > 255) &&
+ (DHCP_BASE_ATTR(vp->da->attr) != PW_DHCP_OPTION_82)) goto next;
+
+ debug_pair(vp);
+ if (vp->da->flags.extended) goto next;
length = vp->length;
for (same = vp->next; same != NULL; same = same->next) {
- if (same->attribute != vp->attribute) break;
+ if (same->da->attr != vp->da->attr) break;
num_entries++;
}
/*
* For client-identifier
+ * @fixme What's this meant to be doing?!
*/
- if ((vp->type == PW_TYPE_ETHERNET) &&
+#if 0
+ if ((vp->da->type == PW_TYPE_ETHERNET) &&
(vp->length == 6) &&
(num_entries == 1)) {
- vp->type = PW_TYPE_OCTETS;
+ vp->da->type = PW_TYPE_OCTETS;
memmove(vp->vp_octets + 1, vp->vp_octets, 6);
vp->vp_octets[0] = 1;
}
-
- pattr = p;
- *(p++) = vp->attribute & 0xff;
+#endif
+ *(p++) = vp->da->attr & 0xff;
plength = p;
*(p++) = 0; /* header isn't included in attr length */
for (i = 0; i < num_entries; i++) {
- if (fr_debug_flag > 1) {
- vp_prints(buffer, sizeof(buffer), vp);
- fr_strerror_printf("\t%s", buffer);
- }
+ debug_pair(vp);
+
+ if (vp->da->flags.is_tlv) {
+ VALUE_PAIR *tlv;
- if (vp->flags.is_tlv) {
- VALUE_PAIR *tlv = fr_dhcp_vp2suboption(vp);
- if (vp) {
- tlv->next = vp->next;
- vp->next = tlv;
- }
-
/*
- * The encoded flag MUST be set in the vp!
+ * Should NOT have been encoded yet!
*/
- vp = vp->next;
+ tlv = fr_dhcp_vp2suboption(vp);
+
+ /*
+ * Ignore it if there's an issue
+ * encoding it.
+ */
+ if (!tlv) goto next;
+
+ tlv->next = vp->next;
+ vp->next = tlv;
+ vp = tlv;
}
length = fr_dhcp_vp2attr(vp, p, 0);
* limitations: sizeof(vp->vp_octets) < 255
*/
if (length > 255) {
- fr_strerror_printf("WARNING Ignoring too long attribute %s!", vp->name);
+ fr_strerror_printf("WARNING Ignoring too long attribute %s!", vp->da->name);
break;
}
* go bananas!
*/
if ((*plength + length) > 255) {
- fr_strerror_printf("WARNING Ignoring too long attribute %s!", vp->name);
+ fr_strerror_printf("WARNING Ignoring too long attribute %s!", vp->da->name);
break;
}
p += length;
if (vp->next &&
- (vp->next->attribute == vp->attribute))
+ (vp->next->da->attr == vp->da->attr))
vp = vp->next;
} /* loop over num_entries */
return 0;
}
+
+int fr_dhcp_add_arp_entry(int fd, const char *interface,
+ VALUE_PAIR *macaddr, VALUE_PAIR *ip)
+{
+#ifdef SIOCSARP
+ struct sockaddr_in *sin;
+ struct arpreq req;
+
+ if (macaddr->length > sizeof (req.arp_ha.sa_data)) {
+ fr_strerror_printf("ERROR: DHCP only supports up to %zu octets "
+ "for Client Hardware Address "
+ "(got %zu octets)\n",
+ sizeof(req.arp_ha.sa_data),
+ macaddr->length);
+ return -1;
+ }
+
+ memset(&req, 0, sizeof(req));
+ sin = (struct sockaddr_in *) &req.arp_pa;
+ sin->sin_family = AF_INET;
+ sin->sin_addr.s_addr = ip->vp_ipaddr;
+ strlcpy(req.arp_dev, interface, sizeof(req.arp_dev));
+ memcpy(&req.arp_ha.sa_data, macaddr->vp_octets, macaddr->length);
+
+ req.arp_flags = ATF_COM;
+ if (ioctl(fd, SIOCSARP, &req) < 0) {
+ fr_strerror_printf("DHCP: Failed to add entry in ARP cache: %s (%d)",
+ strerror(errno), errno);
+ return -1;
+ }
+
+ return 0;
+#else
+ fd = fd; /* -Wunused */
+ interface = interface; /* -Wunused */
+ macaddr = macaddr; /* -Wunused */
+ ip = ip; /* -Wunused */
+
+ fr_strerror_printf("Adding ARP entry is unsupported on this system");
+ return -1;
+#endif
+}
+
#endif /* WITH_DHCP */
projects / freeradius.git / blobdiff