*/
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)",
- (int) 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);
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
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), DHCP_MAGIC_VENDOR, PW_TYPE_OCTETS);
+ vp = paircreate(tlv->da->attr | (p[0] << 8), DHCP_MAGIC_VENDOR);
if (!vp) {
pairfree(&head);
goto 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__);
+ fr_strerror_printf("Internal sanity check %d %d", vp->da->type, __LINE__);
return -1;
} /* switch over type */
*/
while (next < (data + len)) {
int num_entries, alen;
- DICT_ATTR *da;
+ const DICT_ATTR *da;
p = next;
/*
* Hack for ease of use.
*/
- if ((da->attr == 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) {
+ if (fr_dhcp_attr2vp(vp, p, alen) < 0) {
pairfree(&vp);
pairfree(head);
return -1;
int fr_dhcp_decode(RADIUS_PACKET *packet)
{
- unsigned int i;
+ size_t i;
uint8_t *p;
uint32_t giaddr;
VALUE_PAIR *head, *vp, **tail;
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;
}
/*
* DHCP-Message-Type is first, for simplicity.
*/
- if (((*a)->attribute == 53) &&
- (*b)->attribute != 53) return -1;
+ if (((*a)->da->attr == 53) &&
+ (*b)->da->attr != 53) return -1;
/*
* Relay-Agent is last
*/
- if (((*a)->attribute == 82) &&
- (*b)->attribute != 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, DHCP_MAGIC_VENDOR, 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.extended ||
- ((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.extended ||
- ((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.extended = 1;
}
return tlv;
uint32_t lvalue, mms;
size_t dhcp_size, length;
dhcp_packet_t *dhcp;
- char buffer[1024];
if (packet->data) return 0;
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);
}
while (vp) {
unsigned int num_entries = 1;
VALUE_PAIR *same;
- uint8_t *plength, *pattr;
+ uint8_t *plength;
- if (vp->vendor != DHCP_MAGIC_VENDOR) goto next;
- if (vp->attribute == 53) goto next; /* already done */
- if ((vp->attribute > 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->flags.extended) goto next;
+ 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->flags.is_tlv) {
+ if (vp->da->flags.is_tlv) {
VALUE_PAIR *tlv;
/*
* 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 */
struct arpreq req;
if (macaddr->length > sizeof (req.arp_ha.sa_data)) {
- fr_strerror_printf("ERROR: DHCP only supports up to %u octets for "
- "Client Hardware Address (got %zu octets)\n",
+ 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;
projects / freeradius.git / blobdiff