matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[dhcp_relay] Remove dhcp6mon (#10467)

Browse Source
This commit is contained in:
kellyyeh 2022-04-12 10:44:17 -07:00 committed by GitHub
parent 5242a4bc7a
commit 396a92cb2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 186 additions and 722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-dhcp-relay/Dockerfile.j2
View File

@ -30,7 +30,7 @@ RUN apt-get clean -y && \
COPY ["docker_init.sh", "start.sh", "/usr/bin/"] COPY ["docker_init.sh", "start.sh", "/usr/bin/"]
COPY ["docker-dhcp-relay.supervisord.conf.j2", "port-name-alias-map.txt.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"] COPY ["docker-dhcp-relay.supervisord.conf.j2", "port-name-alias-map.txt.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcpv6-relay.monitors.j2", "/usr/share/sonic/templates/"] COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcp-relay.monitors.j2", "/usr/share/sonic/templates/"]
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
COPY ["critical_processes", "/etc/supervisor"] COPY ["critical_processes", "/etc/supervisor"]
COPY ["cli", "/cli/"] COPY ["cli", "/cli/"]

2
dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2 → dockers/docker-dhcp-relay/dhcp-relay.monitors.j2
View File

@ -59,8 +59,6 @@ command=/usr/sbin/dhcpmon -id {{ vlan_name }}
{% if prefix | ipv4 %} -im {{ name }}{% endif -%} {% if prefix | ipv4 %} -im {{ name }}{% endif -%}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if relay_for_ipv4.flag %} -4{% endif %}
{% if relay_for_ipv6.flag %} -6{% endif %}
priority=4 priority=4
autostart=false autostart=false

2
dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
View File

@ -65,6 +65,6 @@ dependent_startup_wait_for=rsyslogd:running
{% include 'dhcpv6-relay.agents.j2' %} {% include 'dhcpv6-relay.agents.j2' %}
{% endfor %} {% endfor %}
{% include 'dhcpv6-relay.monitors.j2' %} {% include 'dhcp-relay.monitors.j2' %}
{% endif %} {% endif %}
{% endif %} {% endif %}

583
src/dhcpmon/src/dhcp_device.c
View File

@ -21,51 +21,25 @@
#include <libexplain/ioctl.h> #include <libexplain/ioctl.h>
#include <linux/filter.h> #include <linux/filter.h>
#include <netpacket/packet.h> #include <netpacket/packet.h>
#include <sys/types.h>
#include <ifaddrs.h>
#include <netinet/ip6.h>
#include "dhcp_device.h" #include "dhcp_device.h"
/** DHCP versions flags */
static bool dhcpv4_enabled;
static bool dhcpv6_enabled;
/** Counter print width */ /** Counter print width */
#define DHCP_COUNTER_WIDTH 9 #define DHCP_COUNTER_WIDTH 9
/** Start of Ether header of a captured frame */ /** Start of Ether header of a captured frame */
#define ETHER_START_OFFSET 0 #define ETHER_START_OFFSET 0
/** EtherType field offset from Ether header of a captured frame */
#define ETHER_TYPE_OFFSET (ETHER_START_OFFSET + 12)
/** Start of IP header of a captured frame */ /** Start of IP header of a captured frame */
#define IP_START_OFFSET (ETHER_START_OFFSET + ETHER_HDR_LEN) #define IP_START_OFFSET (ETHER_START_OFFSET + ETHER_HDR_LEN)
/** Start of UDP header on IPv4 packet of a captured frame */ /** Start of UDP header of a captured frame */
#define UDPv4_START_OFFSET (IP_START_OFFSET + sizeof(struct ip)) #define UDP_START_OFFSET (IP_START_OFFSET + sizeof(struct ip))
/** Start of DHCPv4 header of a captured frame */ /** Start of DHCP header of a captured frame */
#define DHCPv4_START_OFFSET (UDPv4_START_OFFSET + sizeof(struct udphdr)) #define DHCP_START_OFFSET (UDP_START_OFFSET + sizeof(struct udphdr))
/** Start of DHCPv4 Options segment of a captured frame */ /** Start of DHCP Options segment of a captured frame */
#define DHCPv4_OPTIONS_HEADER_SIZE 240 #define DHCP_OPTIONS_HEADER_SIZE 240
/** Offset of DHCP GIADDR */ /** Offset of DHCP GIADDR */
#define DHCP_GIADDR_OFFSET 24 #define DHCP_GIADDR_OFFSET 24
/** IPv6 link-local prefix */
#define IPV6_LINK_LOCAL_PREFIX 0x80fe
/** Start of UDP header on IPv6 packet of a captured frame */
#define UDPv6_START_OFFSET (IP_START_OFFSET + sizeof(struct ip6_hdr))
/** Start of DHCPv6 header of a captured frame */
#define DHCPv6_START_OFFSET (UDPv6_START_OFFSET + sizeof(struct udphdr))
/** Size of 'type' field on DHCPv6 header */
#define DHCPv6_TYPE_LENGTH 1
/** Size of DHCPv6 relay message header to first option */
#define DHCPv6_RELAY_MSG_OPTIONS_OFFSET 34
/** Size of 'option' field on DHCPv6 header */
#define DHCPv6_OPTION_LENGTH 2
/** Size of 'option length' field on DHCPv6 header */
#define DHCPv6_OPTION_LEN_LENGTH 2
/** DHCPv6 OPTION_RELAY_MSG */
#define DHCPv6_OPTION_RELAY_MSG 9
#define OP_LDHA (BPF_LD | BPF_H | BPF_ABS) /** bpf ldh Abs */ #define OP_LDHA (BPF_LD | BPF_H | BPF_ABS) /** bpf ldh Abs */
#define OP_LDHI (BPF_LD | BPF_H | BPF_IND) /** bpf ldh Ind */ #define OP_LDHI (BPF_LD | BPF_H | BPF_IND) /** bpf ldh Ind */
#define OP_LDB (BPF_LD | BPF_B | BPF_ABS) /** bpf ldb Abs*/ #define OP_LDB (BPF_LD | BPF_B | BPF_ABS) /** bpf ldb Abs*/
@ -75,40 +49,34 @@ static bool dhcpv6_enabled;
#define OP_JSET (BPF_JMP | BPF_JSET | BPF_K) /** bpf jset */ #define OP_JSET (BPF_JMP | BPF_JSET | BPF_K) /** bpf jset */
#define OP_LDXB (BPF_LDX | BPF_B | BPF_MSH) /** bpf ldxb */ #define OP_LDXB (BPF_LDX | BPF_B | BPF_MSH) /** bpf ldxb */
/** Berkeley Packet Filter program for "udp and (port 546 or port 547 or port 67 or port 68)". /** Berkeley Packet Filter program for "udp and (port 67 or port 68)".
* This program is obtained using the following command tcpdump: * This program is obtained using the following command tcpdump:
* `tcpdump -dd "udp and (port 546 or port 547 or port 67 or port 68)"` * `tcpdump -dd "udp and (port 67 or port 68)"`
*/ */
static struct sock_filter dhcp_bpf_code[] = { static struct sock_filter dhcp_bpf_code[] = {
{.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x0000000c}, // (000) ldh [12] {.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x0000000c}, // (000) ldh [12]
{.code = OP_JEQ, .jt = 0, .jf = 9, .k = 0x000086dd}, // (001) jeq #0x86dd jt 2 jf 11 {.code = OP_JEQ, .jt = 0, .jf = 7, .k = 0x000086dd}, // (001) jeq #0x86dd jt 2 jf 9
{.code = OP_LDB, .jt = 0, .jf = 0, .k = 0x00000014}, // (002) ldb [20] {.code = OP_LDB, .jt = 0, .jf = 0, .k = 0x00000014}, // (002) ldb [20]
{.code = OP_JEQ, .jt = 0, .jf = 24, .k = 0x00000011}, // (003) jeq #0x11 jt 4 jf 28 {.code = OP_JEQ, .jt = 0, .jf = 18, .k = 0x00000011}, // (003) jeq #0x11 jt 4 jf 22
{.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x00000036}, // (004) ldh [54] {.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x00000036}, // (004) ldh [54]
{.code = OP_JEQ, .jt = 21, .jf = 0, .k = 0x00000222}, // (005) jeq #0x222 jt 27 jf 6 {.code = OP_JEQ, .jt = 15, .jf = 0, .k = 0x00000043}, // (005) jeq #0x43 jt 21 jf 6
{.code = OP_JEQ, .jt = 20, .jf = 0, .k = 0x00000223}, // (006) jeq #0x223 jt 27 jf 7 {.code = OP_JEQ, .jt = 14, .jf = 0, .k = 0x00000044}, // (006) jeq #0x44 jt 21 jf 7
{.code = OP_JEQ, .jt = 19, .jf = 0, .k = 0x00000043}, // (007) jeq #0x43 jt 27 jf 8 {.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x00000038}, // (007) ldh [56]
{.code = OP_JEQ, .jt = 18, .jf = 0, .k = 0x00000044}, // (008) jeq #0x44 jt 27 jf 9 {.code = OP_JEQ, .jt = 12, .jf = 11, .k = 0x00000043}, // (008) jeq #0x43 jt 21 jf 20
{.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x00000038}, // (009) ldh [56] {.code = OP_JEQ, .jt = 0, .jf = 12, .k = 0x00000800}, // (009) jeq #0x800 jt 10 jf 22
{.code = OP_JEQ, .jt = 16, .jf = 13, .k = 0x00000222}, // (010) jeq #0x222 jt 27 jf 24 {.code = OP_LDB, .jt = 0, .jf = 0, .k = 0x00000017}, // (010) ldb [23]
{.code = OP_JEQ, .jt = 0, .jf = 16, .k = 0x00000800}, // (011) jeq #0x800 jt 12 jf 28 {.code = OP_JEQ, .jt = 0, .jf = 10, .k = 0x00000011}, // (011) jeq #0x11 jt 12 jf 22
{.code = OP_LDB, .jt = 0, .jf = 0, .k = 0x00000017}, // (012) ldb [23] {.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x00000014}, // (012) ldh [20]
{.code = OP_JEQ, .jt = 0, .jf = 14, .k = 0x00000011}, // (013) jeq #0x11 jt 14 jf 28 {.code = OP_JSET, .jt = 8, .jf = 0, .k = 0x00001fff}, // (013) jset #0x1fff jt 22 jf 14
{.code = OP_LDHA, .jt = 0, .jf = 0, .k = 0x00000014}, // (014) ldh [20] {.code = OP_LDXB, .jt = 0, .jf = 0, .k = 0x0000000e}, // (014) ldxb 4*([14]&0xf)
{.code = OP_JSET, .jt = 12, .jf = 0, .k = 0x00001fff}, // (015) jset #0x1fff jt 28 jf 16 {.code = OP_LDHI, .jt = 0, .jf = 0, .k = 0x0000000e}, // (015) ldh [x + 14]
{.code = OP_LDXB, .jt = 0, .jf = 0, .k = 0x0000000e}, // (016) ldxb 4*([14]&0xf) {.code = OP_JEQ, .jt = 4, .jf = 0, .k = 0x00000043}, // (016) jeq #0x43 jt 21 jf 17
{.code = OP_LDHI, .jt = 0, .jf = 0, .k = 0x0000000e}, // (017) ldh [x + 14] {.code = OP_JEQ, .jt = 3, .jf = 0, .k = 0x00000044}, // (017) jeq #0x44 jt 21 jf 18
{.code = OP_JEQ, .jt = 8, .jf = 0, .k = 0x00000222}, // (018) jeq #0x222 jt 27 jf 19 {.code = OP_LDHI, .jt = 0, .jf = 0, .k = 0x00000010}, // (018) ldh [x + 16]
{.code = OP_JEQ, .jt = 7, .jf = 0, .k = 0x00000223}, // (019) jeq #0x223 jt 27 jf 20 {.code = OP_JEQ, .jt = 1, .jf = 0, .k = 0x00000043}, // (019) jeq #0x43 jt 21 jf 20
{.code = OP_JEQ, .jt = 6, .jf = 0, .k = 0x00000043}, // (020) jeq #0x43 jt 27 jf 21 {.code = OP_JEQ, .jt = 0, .jf = 1, .k = 0x00000044}, // (020) jeq #0x44 jt 21 jf 22
{.code = OP_JEQ, .jt = 5, .jf = 0, .k = 0x00000044}, // (021) jeq #0x44 jt 27 jf 22 {.code = OP_RET, .jt = 0, .jf = 0, .k = 0x00040000}, // (021) ret #262144
{.code = OP_LDHI, .jt = 0, .jf = 0, .k = 0x00000010}, // (022) ldh [x + 16] {.code = OP_RET, .jt = 0, .jf = 0, .k = 0x00000000}, // (022) ret #0
{.code = OP_JEQ, .jt = 3, .jf = 0, .k = 0x00000222}, // (023) jeq #0x222 jt 27 jf 24
{.code = OP_JEQ, .jt = 2, .jf = 0, .k = 0x00000223}, // (024) jeq #0x223 jt 27 jf 25
{.code = OP_JEQ, .jt = 1, .jf = 0, .k = 0x00000043}, // (025) jeq #0x43 jt 27 jf 26
{.code = OP_JEQ, .jt = 0, .jf = 1, .k = 0x00000044}, // (026) jeq #0x44 jt 27 jf 28
{.code = OP_RET, .jt = 0, .jf = 0, .k = 0x00040000}, // (027) ret #262144
{.code = OP_RET, .jt = 0, .jf = 0, .k = 0x00000000}, // (028) ret
}; };
/** Filter program socket struct */ /** Filter program socket struct */
@ -121,29 +89,16 @@ static struct sock_fprog dhcp_sock_bfp = {
*/ */
static dhcp_device_context_t aggregate_dev = {0}; static dhcp_device_context_t aggregate_dev = {0};
static dhcp_device_context_t *mgmt_intf = NULL; /** Monitored DHCP message type */
static dhcp_message_type_t monitored_msgs[] = {
/** Monitored DHCPv4 message type */ DHCP_MESSAGE_TYPE_DISCOVER,
static dhcpv4_message_type_t v4_monitored_msgs[] = { DHCP_MESSAGE_TYPE_OFFER,
DHCPv4_MESSAGE_TYPE_DISCOVER, DHCP_MESSAGE_TYPE_REQUEST,
DHCPv4_MESSAGE_TYPE_OFFER, DHCP_MESSAGE_TYPE_ACK
DHCPv4_MESSAGE_TYPE_REQUEST,
DHCPv4_MESSAGE_TYPE_ACK
}; };
/** Monitored DHCPv6 message type */ /** Number of monitored DHCP message type */
static dhcpv6_message_type_t v6_monitored_msgs[] = { static uint8_t monitored_msg_sz = sizeof(monitored_msgs) / sizeof(*monitored_msgs);
DHCPv6_MESSAGE_TYPE_SOLICIT,
DHCPv6_MESSAGE_TYPE_ADVERTISE,
DHCPv6_MESSAGE_TYPE_REQUEST,
DHCPv6_MESSAGE_TYPE_REPLY
};
/** Number of monitored DHCPv4 message type */
static uint8_t v4_monitored_msg_sz = sizeof(v4_monitored_msgs) / sizeof(*v4_monitored_msgs);
/** Number of monitored DHCPv6 message type */
static uint8_t v6_monitored_msg_sz = sizeof(v6_monitored_msgs) / sizeof(*v6_monitored_msgs);
/** /**
* @code handle_dhcp_option_53(context, dhcp_option, dir, iphdr, dhcphdr); * @code handle_dhcp_option_53(context, dhcp_option, dir, iphdr, dhcphdr);
@ -168,37 +123,27 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
switch (dhcp_option[2]) switch (dhcp_option[2])
{ {
// DHCP messages send by client // DHCP messages send by client
case DHCPv4_MESSAGE_TYPE_DISCOVER: case DHCP_MESSAGE_TYPE_DISCOVER:
case DHCPv4_MESSAGE_TYPE_REQUEST: case DHCP_MESSAGE_TYPE_REQUEST:
case DHCPv4_MESSAGE_TYPE_DECLINE: case DHCP_MESSAGE_TYPE_DECLINE:
case DHCPv4_MESSAGE_TYPE_RELEASE: case DHCP_MESSAGE_TYPE_RELEASE:
case DHCPv4_MESSAGE_TYPE_INFORM: case DHCP_MESSAGE_TYPE_INFORM:
giaddr = ntohl(dhcphdr[DHCP_GIADDR_OFFSET] << 24 | dhcphdr[DHCP_GIADDR_OFFSET + 1] << 16 | giaddr = ntohl(dhcphdr[DHCP_GIADDR_OFFSET] << 24 | dhcphdr[DHCP_GIADDR_OFFSET + 1] << 16 |
dhcphdr[DHCP_GIADDR_OFFSET + 2] << 8 | dhcphdr[DHCP_GIADDR_OFFSET + 3]); dhcphdr[DHCP_GIADDR_OFFSET + 2] << 8 | dhcphdr[DHCP_GIADDR_OFFSET + 3]);
if ((context->giaddr_ip == giaddr && context->is_uplink && dir == DHCP_TX) || if ((context->giaddr_ip == giaddr && context->is_uplink && dir == DHCP_TX) ||
(!context->is_uplink && dir == DHCP_RX && iphdr->ip_dst.s_addr == INADDR_BROADCAST)) { (!context->is_uplink && dir == DHCP_RX && iphdr->ip_dst.s_addr == INADDR_BROADCAST)) {
context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++; context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
// If the packet recieved on the mgmt interface, we don't want to increment the aggregate device aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
if (context == mgmt_intf)
{
break;
}
aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
} }
break; break;
// DHCP messages send by server // DHCP messages send by server
case DHCPv4_MESSAGE_TYPE_OFFER: case DHCP_MESSAGE_TYPE_OFFER:
case DHCPv4_MESSAGE_TYPE_ACK: case DHCP_MESSAGE_TYPE_ACK:
case DHCPv4_MESSAGE_TYPE_NAK: case DHCP_MESSAGE_TYPE_NAK:
if ((context->giaddr_ip == iphdr->ip_dst.s_addr && context->is_uplink && dir == DHCP_RX) || if ((context->giaddr_ip == iphdr->ip_dst.s_addr && context->is_uplink && dir == DHCP_RX) ||
(!context->is_uplink && dir == DHCP_TX)) { (!context->is_uplink && dir == DHCP_TX)) {
context->counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++; context->counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
// If the packet recieved on the mgmt interface, we don't want to increment the aggregate device aggregate_dev.counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
if (context == mgmt_intf)
{
break;
}
aggregate_dev.counters.v4counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option[2]]++;
} }
break; break;
default: default:
@ -207,48 +152,6 @@ static void handle_dhcp_option_53(dhcp_device_context_t *context,
} }
} }
/**
* @code handle_dhcpv6_option(context, dhcp_option, dir);
*
* @brief handle the logic related to DHCPv6 option
*
* @param context Device (interface) context
* @param dhcp_option pointer to DHCP option buffer space
* @param dir packet direction
*
* @return none
*/
static void handle_dhcpv6_option(dhcp_device_context_t *context,
const u_char dhcp_option,
dhcp_packet_direction_t dir)
{
switch (dhcp_option)
{
case DHCPv6_MESSAGE_TYPE_SOLICIT:
case DHCPv6_MESSAGE_TYPE_REQUEST:
case DHCPv6_MESSAGE_TYPE_CONFIRM:
case DHCPv6_MESSAGE_TYPE_RENEW:
case DHCPv6_MESSAGE_TYPE_REBIND:
case DHCPv6_MESSAGE_TYPE_RELEASE:
case DHCPv6_MESSAGE_TYPE_DECLINE:
case DHCPv6_MESSAGE_TYPE_ADVERTISE:
case DHCPv6_MESSAGE_TYPE_REPLY:
case DHCPv6_MESSAGE_TYPE_RECONFIGURE:
case DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST:
context->counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
// If the packet recieved on the mgmt interface, we don't want to increment the aggregate device
if (context == mgmt_intf)
{
break;
}
aggregate_dev.counters.v6counters[DHCP_COUNTERS_CURRENT][dir][dhcp_option]++;
break;
default:
syslog(LOG_WARNING, "handle_dhcpv6_option(%s): Unknown DHCPv6 option type %d", context->intf, dhcp_option);
break;
}
}
/** /**
* @code read_callback(fd, event, arg); * @code read_callback(fd, event, arg);
* *
@ -268,29 +171,16 @@ static void read_callback(int fd, short event, void *arg)
while ((event == EV_READ) && while ((event == EV_READ) &&
((buffer_sz = recv(fd, context->buffer, context->snaplen, MSG_DONTWAIT)) > 0)) { ((buffer_sz = recv(fd, context->buffer, context->snaplen, MSG_DONTWAIT)) > 0)) {
struct ether_header *ethhdr = (struct ether_header*) context->buffer; struct ether_header *ethhdr = (struct ether_header*) context->buffer;
struct ip *iphdr; struct ip *iphdr = (struct ip*) (context->buffer + IP_START_OFFSET);
struct ip6_hdr *ipv6hdr; struct udphdr *udp = (struct udphdr*) (context->buffer + UDP_START_OFFSET);
struct udphdr *udp; uint8_t *dhcphdr = context->buffer + DHCP_START_OFFSET;
uint8_t *dhcphdr; int dhcp_option_offset = DHCP_START_OFFSET + DHCP_OPTIONS_HEADER_SIZE;
int dhcp_option_offset;
bool is_ipv4 = (ntohs(ethhdr->ether_type) == ETHERTYPE_IP); if ((buffer_sz > UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) &&
if (is_ipv4) { (ntohs(udp->len) > DHCP_OPTIONS_HEADER_SIZE)) {
iphdr = (struct ip*) (context->buffer + IP_START_OFFSET); int dhcp_sz = ntohs(udp->len) < buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr) ?
udp = (struct udphdr*) (context->buffer + UDPv4_START_OFFSET); ntohs(udp->len) : buffer_sz - UDP_START_OFFSET - sizeof(struct udphdr);
dhcphdr = context->buffer + DHCPv4_START_OFFSET; int dhcp_option_sz = dhcp_sz - DHCP_OPTIONS_HEADER_SIZE;
dhcp_option_offset = DHCPv4_START_OFFSET + DHCPv4_OPTIONS_HEADER_SIZE;
} else {
ipv6hdr = (struct ip6_hdr*) (context->buffer + IP_START_OFFSET);
udp = (struct udphdr*) (context->buffer + UDPv6_START_OFFSET);
dhcphdr = context->buffer + DHCPv6_START_OFFSET;
dhcp_option_offset = DHCPv6_START_OFFSET;
}
if (is_ipv4 && dhcpv4_enabled && (buffer_sz > UDPv4_START_OFFSET + sizeof(struct udphdr) + DHCPv4_OPTIONS_HEADER_SIZE) &&
(ntohs(udp->len) > DHCPv4_OPTIONS_HEADER_SIZE)) {
int dhcp_sz = ntohs(udp->len) < buffer_sz - UDPv4_START_OFFSET - sizeof(struct udphdr) ?
ntohs(udp->len) : buffer_sz - UDPv4_START_OFFSET - sizeof(struct udphdr);
int dhcp_option_sz = dhcp_sz - DHCPv4_OPTIONS_HEADER_SIZE;
const u_char *dhcp_option = context->buffer + dhcp_option_offset; const u_char *dhcp_option = context->buffer + dhcp_option_offset;
dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] && dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
ethhdr->ether_shost[1] == context->mac[1] && ethhdr->ether_shost[1] == context->mac[1] &&
@ -324,37 +214,6 @@ static void read_callback(int fd, short event, void *arg)
offset += dhcp_option[offset + 1] + 2; offset += dhcp_option[offset + 1] + 2;
} }
} }
}
else if (!is_ipv4 && dhcpv6_enabled && (buffer_sz > UDPv6_START_OFFSET + sizeof(struct udphdr) + DHCPv6_TYPE_LENGTH)) {
const u_char* dhcp_header = context->buffer + dhcp_option_offset;
dhcp_packet_direction_t dir = (ethhdr->ether_shost[0] == context->mac[0] &&
ethhdr->ether_shost[1] == context->mac[1] &&
ethhdr->ether_shost[2] == context->mac[2] &&
ethhdr->ether_shost[3] == context->mac[3] &&
ethhdr->ether_shost[4] == context->mac[4] &&
ethhdr->ether_shost[5] == context->mac[5]) ?
DHCP_TX : DHCP_RX;
int offset = 0;
uint16_t option = 0;
uint16_t current_option_len = 0;
// Get to inner DHCP header from encapsulated RELAY_FORWARD or RELAY_REPLY header
while (dhcp_header[offset] == DHCPv6_MESSAGE_TYPE_RELAY_FORWARD || dhcp_header[offset] == DHCPv6_MESSAGE_TYPE_RELAY_REPLY)
{
// Get to DHCPv6_OPTION_RELAY_MSG from all options
offset += DHCPv6_RELAY_MSG_OPTIONS_OFFSET;
option = htons(*((uint16_t*)(&(dhcp_header[offset]))));
while (option != DHCPv6_OPTION_RELAY_MSG)
{
// Add to offset the option length and get the next option ID
current_option_len = htons(*((uint16_t*)(&(dhcp_header[offset + DHCPv6_OPTION_LENGTH]))));
offset += DHCPv6_OPTION_LENGTH + DHCPv6_OPTION_LEN_LENGTH + current_option_len;
option = htons(*((uint16_t*)(&(dhcp_header[offset]))));
}
// Set the offset to DHCP-relay-message data
offset += DHCPv6_OPTION_LENGTH + DHCPv6_OPTION_LEN_LENGTH;
}
handle_dhcpv6_option(context, dhcp_header[offset], dir);
} else { } else {
syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options", syslog(LOG_WARNING, "read_callback(%s): read length (%ld) is too small to capture DHCP options",
context->intf, buffer_sz); context->intf, buffer_sz);
@ -363,54 +222,29 @@ static void read_callback(int fd, short event, void *arg)
} }
/** /**
* @code dhcp_device_is_dhcp_inactive(v4counters, v6counters, type); * @code dhcp_device_is_dhcp_inactive(counters);
* *
* @brief Check if there were no DHCP activity * @brief Check if there were no DHCP activity
* *
* @param v4counters current/snapshot v4counter * @param counters current/snapshot counter
*
* @param v6counters current/snapshot v6counter
*
* @param type DHCP type
* *
* @return true if there were no DHCP activity, false otherwise * @return true if there were no DHCP activity, false otherwise
*/ */
static bool dhcp_device_is_dhcp_inactive(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT], static bool dhcp_device_is_dhcp_inactive(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
dhcp_type_t type)
{ {
uint64_t *rx_counters = counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
uint64_t *rx_counter_snapshot = counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
bool rv = true; bool rv = true;
uint64_t *rx_counters; for (uint8_t i = 0; (i < monitored_msg_sz) && rv; i++) {
uint64_t *rx_counter_snapshot; rv = rx_counters[monitored_msgs[i]] == rx_counter_snapshot[monitored_msgs[i]];
switch (type)
{
case DHCPv4_TYPE:
rx_counters = v4counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
rx_counter_snapshot = v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
for (uint8_t i = 0; (i < v4_monitored_msg_sz) && rv; i++) {
rv = rx_counters[v4_monitored_msgs[i]] == rx_counter_snapshot[v4_monitored_msgs[i]];
}
break;
case DHCPv6_TYPE:
rx_counters = v6counters[DHCP_COUNTERS_CURRENT][DHCP_RX];
rx_counter_snapshot = v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX];
for (uint8_t i = 0; (i < v6_monitored_msg_sz) && rv; i++) {
rv = rx_counters[v6_monitored_msgs[i]] == rx_counter_snapshot[v6_monitored_msgs[i]];
}
break;
default:
syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
break;
} }
return rv; return rv;
} }
/** /**
* @code dhcp_device_is_dhcpv4_msg_unhealthy(type, counters); * @code dhcp_device_is_dhcp_msg_unhealthy(type, counters);
* *
* @brief Check if DHCP relay is functioning properly for message of type 'type'. * @brief Check if DHCP relay is functioning properly for message of type 'type'.
* For every rx of message 'type', there should be increment of the same message type. * For every rx of message 'type', there should be increment of the same message type.
@ -420,76 +254,34 @@ static bool dhcp_device_is_dhcp_inactive(uint64_t v4counters[][DHCP_DIR_COUNT][D
* *
* @return true if DHCP message 'type' is transmitted,false otherwise * @return true if DHCP message 'type' is transmitted,false otherwise
*/ */
static bool dhcp_device_is_dhcpv4_msg_unhealthy(dhcpv4_message_type_t type, static bool dhcp_device_is_dhcp_msg_unhealthy(dhcp_message_type_t type,
uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT]) uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
{ {
// check if DHCP message 'type' is being relayed // check if DHCP message 'type' is being relayed
return ((v4counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] > v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) && return ((counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] > counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
(v4counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type]) ); (counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type]) );
} }
/** /**
* @code dhcp_device_is_dhcpv6_msg_unhealthy(type, counters); * @code dhcp_device_check_positive_health(counters, counters_snapshot);
* *
* @brief Check if DHCP relay is functioning properly for message of type 'type'. * @brief Check if DHCP relay is functioning properly for monitored messages (Discover, Offer, Request, ACK.)
* For every rx of message 'type', there should be increment of the same message type.
*
* @param type DHCP message type
* @param counters current/snapshot counter
*
* @return true if DHCP message 'type' is transmitted,false otherwise
*/
static bool dhcp_device_is_dhcpv6_msg_unhealthy(dhcpv6_message_type_t type,
uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT])
{
// check if DHCP message 'type' is being relayed
return ((v6counters[DHCP_COUNTERS_CURRENT][DHCP_RX][type] > v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_RX][type]) &&
(v6counters[DHCP_COUNTERS_CURRENT][DHCP_TX][type] <= v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX][type]) );
}
/**
* @code dhcp_device_check_positive_health(v4counters, v6counters, type);
*
* @brief Check if DHCPv4/6 relay is functioning properly for monitored messages.
* DHCPv4 (Discover, Offer, Request, ACK.) and DHCPv6 (Solicit, Advertise, Request, Reply).
* For every rx of monitored messages, there should be increment of the same message type. * For every rx of monitored messages, there should be increment of the same message type.
* *
* @param v4counters current/snapshot counter * @param counters current/snapshot counter
*
* @param v6counters current/snapshot counter
*
* @param type DHCP type
* *
* @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
*/ */
static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT], static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
dhcp_type_t type)
{ {
dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY; dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
bool is_dhcp_unhealthy = false; bool is_dhcp_unhealthy = false;
for (uint8_t i = 0; (i < monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
switch (type) is_dhcp_unhealthy = dhcp_device_is_dhcp_msg_unhealthy(monitored_msgs[i], counters);
{
case DHCPv4_TYPE:
for (uint8_t i = 0; (i < v4_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
is_dhcp_unhealthy = dhcp_device_is_dhcpv4_msg_unhealthy(v4_monitored_msgs[i], v4counters);
}
break;
case DHCPv6_TYPE:
for (uint8_t i = 0; (i < v6_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
is_dhcp_unhealthy = dhcp_device_is_dhcpv6_msg_unhealthy(v6_monitored_msgs[i], v6counters);
}
break;
default:
syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
break;
} }
// if we have rx DORA/SARR then we should have corresponding tx DORA/SARR (DORA/SARR being relayed) // if we have rx DORA then we should have corresponding tx DORA (DORA being relayed)
if (is_dhcp_unhealthy) { if (is_dhcp_unhealthy) {
rv = DHCP_MON_STATUS_UNHEALTHY; rv = DHCP_MON_STATUS_UNHEALTHY;
} }
@ -498,47 +290,27 @@ static dhcp_mon_status_t dhcp_device_check_positive_health(uint64_t v4counters[]
} }
/** /**
* @code dhcp_device_check_negative_health(v4counters, v6counters, type); * @code dhcp_device_check_negative_health(counters);
* *
* @brief Check that DHCP relayed messages are not being transmitted out of this interface/dev * @brief Check that DHCP relayed messages are not being transmitted out of this interface/dev
* using its counters. The interface is negatively healthy if there are not DHCP message * using its counters. The interface is negatively healthy if there are not DHCP message
* travelling through it. * travelling through it.
* *
* @param v4counters current/snapshot counter * @param counters recent interface counter
* @param v6counters current/snapshot counter * @param counters_snapshot snapshot counters
* @param type DHCP type
* *
* @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
*/ */
static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT], static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
dhcp_type_t type)
{ {
dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY; dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
uint64_t *tx_counters = counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
uint64_t *tx_counter_snapshot = counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
bool is_dhcp_unhealthy = false; bool is_dhcp_unhealthy = false;
for (uint8_t i = 0; (i < monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
uint64_t *tx_counters; is_dhcp_unhealthy = tx_counters[monitored_msgs[i]] > tx_counter_snapshot[monitored_msgs[i]];
uint64_t *tx_counter_snapshot;
switch (type)
{
case DHCPv4_TYPE:
tx_counters = v4counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
tx_counter_snapshot = v4counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
for (uint8_t i = 0; (i < v4_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
is_dhcp_unhealthy = tx_counters[v4_monitored_msgs[i]] > tx_counter_snapshot[v4_monitored_msgs[i]];
}
break;
case DHCPv6_TYPE:
tx_counters = v6counters[DHCP_COUNTERS_CURRENT][DHCP_TX];
tx_counter_snapshot = v6counters[DHCP_COUNTERS_SNAPSHOT][DHCP_TX];
for (uint8_t i = 0; (i < v6_monitored_msg_sz) && !is_dhcp_unhealthy; i++) {
is_dhcp_unhealthy = tx_counters[v6_monitored_msgs[i]] > tx_counter_snapshot[v6_monitored_msgs[i]];
}
break;
default:
syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
break;
} }
// for negative validation, return unhealthy if DHCP packet are being // for negative validation, return unhealthy if DHCP packet are being
@ -551,7 +323,7 @@ static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t v4counters[]
} }
/** /**
* @code dhcp_device_check_health(check_type, v4counters, v6counters, type); * @code dhcp_device_check_health(check_type, counters, counters_snapshot);
* *
* @brief Check that DHCP relay is functioning properly given a check type. Positive check * @brief Check that DHCP relay is functioning properly given a check type. Positive check
* indicates for every rx of DHCP message of type 'type', there would increment of * indicates for every rx of DHCP message of type 'type', there would increment of
@ -560,80 +332,59 @@ static dhcp_mon_status_t dhcp_device_check_negative_health(uint64_t v4counters[]
* considered unhealthy. * considered unhealthy.
* *
* @param check_type type of health check * @param check_type type of health check
* @param v4counters current/snapshot counters * @param counters current/snapshot counter
* @param v6counters current/snapshot counters
* @param type DHCP type
* *
* @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
*/ */
static dhcp_mon_status_t dhcp_device_check_health(dhcp_mon_check_t check_type, static dhcp_mon_status_t dhcp_device_check_health(dhcp_mon_check_t check_type,
uint64_t v4counters[][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT], uint64_t counters[][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT])
uint64_t v6counters[][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT],
dhcp_type_t type)
{ {
dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY; dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
if (dhcp_device_is_dhcp_inactive(v4counters, v6counters, type)) { if (dhcp_device_is_dhcp_inactive(aggregate_dev.counters)) {
rv = DHCP_MON_STATUS_INDETERMINATE; rv = DHCP_MON_STATUS_INDETERMINATE;
} else if (check_type == DHCP_MON_CHECK_POSITIVE) { } else if (check_type == DHCP_MON_CHECK_POSITIVE) {
rv = dhcp_device_check_positive_health(v4counters, v6counters, type); rv = dhcp_device_check_positive_health(counters);
} else if (check_type == DHCP_MON_CHECK_NEGATIVE) { } else if (check_type == DHCP_MON_CHECK_NEGATIVE) {
rv = dhcp_device_check_negative_health(v4counters, v6counters, type); rv = dhcp_device_check_negative_health(counters);
} }
return rv; return rv;
} }
/** /**
* @code dhcp_print_counters(vlan_intf, type, v4counters, v6counters); * @code dhcp_print_counters(vlan_intf, type, counters);
* *
* @brief prints DHCP counters to sylsog. * @brief prints DHCP counters to sylsog.
* *
* @param vlan_intf vlan interface name * @param vlan_intf vlan interface name
* @param type counter type * @param type counter type
* @param v4counters interface counter * @param counters interface counter
* @param v6counters interface counter
* *
* @return none * @return none
*/ */
static void dhcp_print_counters(const char *vlan_intf, static void dhcp_print_counters(const char *vlan_intf,
dhcp_counters_type_t type, dhcp_counters_type_t type,
uint64_t v4counters[][DHCPv4_MESSAGE_TYPE_COUNT], uint64_t counters[][DHCP_MESSAGE_TYPE_COUNT])
uint64_t v6counters[][DHCPv6_MESSAGE_TYPE_COUNT])
{ {
static const char *v4_counter_desc[DHCP_COUNTERS_COUNT] = { static const char *counter_desc[DHCP_COUNTERS_COUNT] = {
[DHCP_COUNTERS_CURRENT] = " Current",
[DHCP_COUNTERS_SNAPSHOT] = "Snapshot"
};
static const char *v6_counter_desc[DHCP_COUNTERS_COUNT] = {
[DHCP_COUNTERS_CURRENT] = " Current", [DHCP_COUNTERS_CURRENT] = " Current",
[DHCP_COUNTERS_SNAPSHOT] = "Snapshot" [DHCP_COUNTERS_SNAPSHOT] = "Snapshot"
}; };
syslog( syslog(
LOG_NOTICE, LOG_NOTICE,
"DHCPv4 [%*s-%*s rx/tx] Discover: %*lu/%*lu, Offer: %*lu/%*lu, Request: %*lu/%*lu, ACK: %*lu/%*lu\n\ "[%*s-%*s rx/tx] Discover: %*lu/%*lu, Offer: %*lu/%*lu, Request: %*lu/%*lu, ACK: %*lu/%*lu\n",
DHCPv6 [%*s-%*s rx/tx] Solicit: %*lu/%*lu, Advertise: %*lu/%*lu, Request: %*lu/%*lu, Reply: %*lu/%*lu\n",
IF_NAMESIZE, vlan_intf, IF_NAMESIZE, vlan_intf,
(int) strlen(v4_counter_desc[type]), v4_counter_desc[type], (int) strlen(counter_desc[type]), counter_desc[type],
DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_DISCOVER], DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_DISCOVER],
DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_DISCOVER], DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_DISCOVER],
DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_OFFER], DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_OFFER],
DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_OFFER], DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_OFFER],
DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_REQUEST], DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_REQUEST],
DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_REQUEST], DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_REQUEST],
DHCP_COUNTER_WIDTH, v4counters[DHCP_RX][DHCPv4_MESSAGE_TYPE_ACK], DHCP_COUNTER_WIDTH, counters[DHCP_RX][DHCP_MESSAGE_TYPE_ACK],
DHCP_COUNTER_WIDTH, v4counters[DHCP_TX][DHCPv4_MESSAGE_TYPE_ACK], DHCP_COUNTER_WIDTH, counters[DHCP_TX][DHCP_MESSAGE_TYPE_ACK]
IF_NAMESIZE, vlan_intf,
(int) strlen(v6_counter_desc[type]), v6_counter_desc[type],
DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_SOLICIT],
DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_SOLICIT],
DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_ADVERTISE],
DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_ADVERTISE],
DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_REQUEST],
DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_REQUEST],
DHCP_COUNTER_WIDTH, v6counters[DHCP_RX][DHCPv6_MESSAGE_TYPE_REPLY],
DHCP_COUNTER_WIDTH, v6counters[DHCP_TX][DHCPv6_MESSAGE_TYPE_REPLY]
); );
} }
@ -703,12 +454,12 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
strncpy(ifr.ifr_name, context->intf, sizeof(ifr.ifr_name) - 1); strncpy(ifr.ifr_name, context->intf, sizeof(ifr.ifr_name) - 1);
ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
// Get v4 network address // Get network address
if (ioctl(fd, SIOCGIFADDR, &ifr) == -1) { if (ioctl(fd, SIOCGIFADDR, &ifr) == -1) {
syslog(LOG_ALERT, "ioctl: %s", explain_ioctl(fd, SIOCGIFADDR, &ifr)); syslog(LOG_ALERT, "ioctl: %s", explain_ioctl(fd, SIOCGIFADDR, &ifr));
break; break;
} }
context->ipv4 = ((struct sockaddr_in*) &ifr.ifr_addr)->sin_addr.s_addr; context->ip = ((struct sockaddr_in*) &ifr.ifr_addr)->sin_addr.s_addr;
// Get mac address // Get mac address
if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) { if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) {
@ -719,30 +470,6 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
close(fd); close(fd);
// Get v6 network address
memset(&context->ipv6, 0, sizeof(context->ipv6));
struct ifaddrs *ifa, *ifa_tmp;
if (getifaddrs(&ifa) == -1) {
syslog(LOG_ALERT, "getifaddrs failed");
break;
}
ifa_tmp = ifa;
while (ifa_tmp) {
// Check if current interface has a valid IPv6 address (not link local address)
if ((strncmp(ifa_tmp->ifa_name, context->intf, sizeof(context->intf)) == 0) &&
(ifa_tmp->ifa_addr) &&
(ifa_tmp->ifa_addr->sa_family == AF_INET6) &&
(((struct sockaddr_in6*)(ifa_tmp->ifa_addr))->sin6_addr.__in6_u.__u6_addr16[0] != IPV6_LINK_LOCAL_PREFIX)) {
struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
memcpy(&context->ipv6, &in6->sin6_addr, sizeof(context->ipv6));
}
ifa_tmp = ifa_tmp->ifa_next;
}
freeifaddrs(ifa);
rv = 0; rv = 0;
} while (0); } while (0);
@ -750,41 +477,20 @@ int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context)
} }
/** /**
* @code dhcp_device_get_ipv4(context); * @code dhcp_device_get_ip(context);
* *
* @brief Accessor method * @brief Accessor method
* *
* @param context pointer to device (interface) context * @param context pointer to device (interface) context
* *
* @return interface IPv4 * @return interface IP
*/ */
int dhcp_device_get_ipv4(dhcp_device_context_t *context, in_addr_t *ip) int dhcp_device_get_ip(dhcp_device_context_t *context, in_addr_t *ip)
{ {
int rv = -1; int rv = -1;
if (context != NULL && ip != NULL) { if (context != NULL && ip != NULL) {
*ip = context->ipv4; *ip = context->ip;
rv = 0;
}
return rv;
}
/**
* @code dhcp_device_get_ipv6(context);
*
* @brief Accessor method
*
* @param context pointer to device (interface) context
*
* @return interface IPv6
*/
int dhcp_device_get_ipv6(dhcp_device_context_t *context, struct in6_addr *ip)
{
int rv = -1;
if (context != NULL && ip != NULL) {
*ip = context->ipv6;
rv = 0; rv = 0;
} }
@ -822,8 +528,7 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
dev_context->is_uplink = is_uplink; dev_context->is_uplink = is_uplink;
memset(dev_context->counters.v4counters, 0, sizeof(dev_context->counters.v4counters)); memset(dev_context->counters, 0, sizeof(dev_context->counters));
memset(dev_context->counters.v6counters, 0, sizeof(dev_context->counters.v6counters));
*context = dev_context; *context = dev_context;
rv = 0; rv = 0;
@ -838,15 +543,14 @@ int dhcp_device_init(dhcp_device_context_t **context, const char *intf, uint8_t
} }
/** /**
* @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip, v6_vlan_ip); * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
* *
* @brief starts packet capture on this interface * @brief starts packet capture on this interface
*/ */
int dhcp_device_start_capture(dhcp_device_context_t *context, int dhcp_device_start_capture(dhcp_device_context_t *context,
size_t snaplen, size_t snaplen,
struct event_base *base, struct event_base *base,
in_addr_t giaddr_ip, in_addr_t giaddr_ip)
struct in6_addr v6_vlan_ip)
{ {
int rv = -1; int rv = -1;
@ -856,20 +560,12 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
break; break;
} }
// snaplen check for DHCPv4 size if (snaplen < UDP_START_OFFSET + sizeof(struct udphdr) + DHCP_OPTIONS_HEADER_SIZE) {
if (dhcpv4_enabled && snaplen < UDPv4_START_OFFSET + sizeof(struct udphdr) + DHCPv4_OPTIONS_HEADER_SIZE) { syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCP options", context->intf);
syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCPv4 options", context->intf);
break;
}
// snaplen check for DHCPv6 size - DHCPv6 message type is the first byte of the udp payload
if (dhcpv6_enabled && snaplen < DHCPv6_START_OFFSET + 1) {
syslog(LOG_ALERT, "dhcp_device_start_capture(%s): snap length is too low to capture DHCPv6 option", context->intf);
break; break;
} }
context->giaddr_ip = giaddr_ip; context->giaddr_ip = giaddr_ip;
context->v6_vlan_ip = v6_vlan_ip;
context->buffer = (uint8_t *) malloc(snaplen); context->buffer = (uint8_t *) malloc(snaplen);
if (context->buffer == NULL) { if (context->buffer == NULL) {
@ -907,17 +603,17 @@ void dhcp_device_shutdown(dhcp_device_context_t *context)
} }
/** /**
* @code dhcp_device_get_status(check_type, context, type); * @code dhcp_device_get_status(check_type, context);
* *
* @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate * @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate
* status * status
*/ */
dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type) dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context)
{ {
dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY; dhcp_mon_status_t rv = DHCP_MON_STATUS_HEALTHY;
if (context != NULL) { if (context != NULL) {
rv = dhcp_device_check_health(check_type, context->counters.v4counters, context->counters.v6counters, type); rv = dhcp_device_check_health(check_type, context->counters);
} }
return rv; return rv;
@ -931,17 +627,9 @@ dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_devic
void dhcp_device_update_snapshot(dhcp_device_context_t *context) void dhcp_device_update_snapshot(dhcp_device_context_t *context)
{ {
if (context != NULL) { if (context != NULL) {
if (dhcpv4_enabled) { memcpy(context->counters[DHCP_COUNTERS_SNAPSHOT],
memcpy(context->counters.v4counters[DHCP_COUNTERS_SNAPSHOT], context->counters[DHCP_COUNTERS_CURRENT],
context->counters.v4counters[DHCP_COUNTERS_CURRENT], sizeof(context->counters[DHCP_COUNTERS_SNAPSHOT]));
sizeof(context->counters.v4counters[DHCP_COUNTERS_SNAPSHOT]));
}
if (dhcpv6_enabled) {
memcpy(context->counters.v6counters[DHCP_COUNTERS_SNAPSHOT],
context->counters.v6counters[DHCP_COUNTERS_CURRENT],
sizeof(context->counters.v6counters[DHCP_COUNTERS_SNAPSHOT]));
}
} }
} }
@ -953,27 +641,6 @@ void dhcp_device_update_snapshot(dhcp_device_context_t *context)
void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type) void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type)
{ {
if (context != NULL) { if (context != NULL) {
dhcp_print_counters(context->intf, type, context->counters.v4counters[type], context->counters.v6counters[type]); dhcp_print_counters(context->intf, type, context->counters[type]);
} }
} }
/**
* @code dhcp_device_active_types(dhcpv4, dhcpv6);
*
* @brief update local variables with active protocols
*/
void dhcp_device_active_types(bool dhcpv4, bool dhcpv6)
{
dhcpv4_enabled = dhcpv4;
dhcpv6_enabled = dhcpv6;
}
/**
* @code dhcp_device_init_mgmt_intf(mgmt_intf_context);
*
* @brief assign context address of mgmt interface
*/
void dhcp_device_init_mgmt_intf(dhcp_device_context_t *mgmt_intf_context)
{
mgmt_intf = mgmt_intf_context;
}

121
src/dhcpmon/src/dhcp_device.h
View File

@ -18,43 +18,21 @@
/** /**
* DHCPv4 message types * DHCP message types
**/ **/
typedef enum typedef enum
{ {
DHCPv4_MESSAGE_TYPE_DISCOVER = 1, DHCP_MESSAGE_TYPE_DISCOVER = 1,
DHCPv4_MESSAGE_TYPE_OFFER = 2, DHCP_MESSAGE_TYPE_OFFER = 2,
DHCPv4_MESSAGE_TYPE_REQUEST = 3, DHCP_MESSAGE_TYPE_REQUEST = 3,
DHCPv4_MESSAGE_TYPE_DECLINE = 4, DHCP_MESSAGE_TYPE_DECLINE = 4,
DHCPv4_MESSAGE_TYPE_ACK = 5, DHCP_MESSAGE_TYPE_ACK = 5,
DHCPv4_MESSAGE_TYPE_NAK = 6, DHCP_MESSAGE_TYPE_NAK = 6,
DHCPv4_MESSAGE_TYPE_RELEASE = 7, DHCP_MESSAGE_TYPE_RELEASE = 7,
DHCPv4_MESSAGE_TYPE_INFORM = 8, DHCP_MESSAGE_TYPE_INFORM = 8,
DHCPv4_MESSAGE_TYPE_COUNT DHCP_MESSAGE_TYPE_COUNT
} dhcpv4_message_type_t; } dhcp_message_type_t;
/**
* DHCPv6 message types
**/
typedef enum
{
DHCPv6_MESSAGE_TYPE_SOLICIT = 1,
DHCPv6_MESSAGE_TYPE_ADVERTISE = 2,
DHCPv6_MESSAGE_TYPE_REQUEST = 3,
DHCPv6_MESSAGE_TYPE_CONFIRM = 4,
DHCPv6_MESSAGE_TYPE_RENEW = 5,
DHCPv6_MESSAGE_TYPE_REBIND = 6,
DHCPv6_MESSAGE_TYPE_REPLY = 7,
DHCPv6_MESSAGE_TYPE_RELEASE = 8,
DHCPv6_MESSAGE_TYPE_DECLINE = 9,
DHCPv6_MESSAGE_TYPE_RECONFIGURE = 10,
DHCPv6_MESSAGE_TYPE_INFORMATION_REQUEST = 11,
DHCPv6_MESSAGE_TYPE_RELAY_FORWARD = 12,
DHCPv6_MESSAGE_TYPE_RELAY_REPLY = 13,
DHCPv6_MESSAGE_TYPE_COUNT
} dhcpv6_message_type_t;
/** packet direction */ /** packet direction */
typedef enum typedef enum
@ -82,13 +60,6 @@ typedef enum
DHCP_MON_STATUS_INDETERMINATE, /** DHCP relay health could not be determined */ DHCP_MON_STATUS_INDETERMINATE, /** DHCP relay health could not be determined */
} dhcp_mon_status_t; } dhcp_mon_status_t;
/** dhcp type */
typedef enum
{
DHCPv4_TYPE,
DHCPv6_TYPE,
} dhcp_type_t;
/** dhcp check type */ /** dhcp check type */
typedef enum typedef enum
{ {
@ -96,28 +67,19 @@ typedef enum
DHCP_MON_CHECK_POSITIVE, /** Validate that received DORA packets are relayed */ DHCP_MON_CHECK_POSITIVE, /** Validate that received DORA packets are relayed */
} dhcp_mon_check_t; } dhcp_mon_check_t;
typedef struct
{
uint64_t v4counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCPv4_MESSAGE_TYPE_COUNT];
/** current/snapshot counters of DHCPv4 packets */
uint64_t v6counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCPv6_MESSAGE_TYPE_COUNT];
/** current/snapshot counters of DHCPv6 packets */
} counters_t;
/** DHCP device (interface) context */ /** DHCP device (interface) context */
typedef struct typedef struct
{ {
int sock; /** Raw socket associated with this device/interface */ int sock; /** Raw socket associated with this device/interface */
in_addr_t ipv4; /** ipv4 network address of this device (interface) */ in_addr_t ip; /** network address of this device (interface) */
struct in6_addr ipv6; /** ipv6 network address of this device (interface) */
uint8_t mac[ETHER_ADDR_LEN]; /** hardware address of this device (interface) */ uint8_t mac[ETHER_ADDR_LEN]; /** hardware address of this device (interface) */
in_addr_t giaddr_ip; /** Gateway IPv4 address */ in_addr_t giaddr_ip; /** Gateway IP address */
struct in6_addr v6_vlan_ip; /** Vlan IPv6 address */
uint8_t is_uplink; /** north interface? */ uint8_t is_uplink; /** north interface? */
char intf[IF_NAMESIZE]; /** device (interface) name */ char intf[IF_NAMESIZE]; /** device (interface) name */
uint8_t *buffer; /** buffer used to read socket data */ uint8_t *buffer; /** buffer used to read socket data */
size_t snaplen; /** snap length or buffer size */ size_t snaplen; /** snap length or buffer size */
counters_t counters; /** counters for DHCPv4/6 packets */ uint64_t counters[DHCP_COUNTERS_COUNT][DHCP_DIR_COUNT][DHCP_MESSAGE_TYPE_COUNT];
/** current/snapshot counters of DHCP packets */
} dhcp_device_context_t; } dhcp_device_context_t;
/** /**
@ -132,28 +94,16 @@ typedef struct
int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context); int initialize_intf_mac_and_ip_addr(dhcp_device_context_t *context);
/** /**
* @code dhcp_device_get_ipv4(context, ip); * @code dhcp_device_get_ip(context, ip);
* *
* @brief Accessor method * @brief Accessor method
* *
* @param context pointer to device (interface) context * @param context pointer to device (interface) context
* @param ip(out) pointer to device IPv4 * @param ip(out) pointer to device IP
* *
* @return 0 on success, otherwise for failure * @return 0 on success, otherwise for failure
*/ */
int dhcp_device_get_ipv4(dhcp_device_context_t *context, in_addr_t *ip); int dhcp_device_get_ip(dhcp_device_context_t *context, in_addr_t *ip);
/**
* @code dhcp_device_get_ipv6(context, ip);
*
* @brief Accessor method
*
* @param context pointer to device (interface) context
* @param ip(out) pointer to device IPv6
*
* @return 0 on success, otherwise for failure
*/
int dhcp_device_get_ipv6(dhcp_device_context_t *context, struct in6_addr *ip);
/** /**
* @code dhcp_device_get_aggregate_context(); * @code dhcp_device_get_aggregate_context();
@ -180,7 +130,7 @@ int dhcp_device_init(dhcp_device_context_t **context,
uint8_t is_uplink); uint8_t is_uplink);
/** /**
* @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip, v6_vlan_ip); * @code dhcp_device_start_capture(context, snaplen, base, giaddr_ip);
* *
* @brief starts packet capture on this interface * @brief starts packet capture on this interface
* *
@ -188,15 +138,13 @@ int dhcp_device_init(dhcp_device_context_t **context,
* @param snaplen length of packet capture * @param snaplen length of packet capture
* @param base pointer to libevent base * @param base pointer to libevent base
* @param giaddr_ip gateway IP address * @param giaddr_ip gateway IP address
* @param v6_vlan_ip vlan IPv6 address
* *
* @return 0 on success, otherwise for failure * @return 0 on success, otherwise for failure
*/ */
int dhcp_device_start_capture(dhcp_device_context_t *context, int dhcp_device_start_capture(dhcp_device_context_t *context,
size_t snaplen, size_t snaplen,
struct event_base *base, struct event_base *base,
in_addr_t giaddr_ip, in_addr_t giaddr_ip);
struct in6_addr v6_vlan_ip);
/** /**
* @code dhcp_device_shutdown(context); * @code dhcp_device_shutdown(context);
@ -210,18 +158,17 @@ int dhcp_device_start_capture(dhcp_device_context_t *context,
void dhcp_device_shutdown(dhcp_device_context_t *context); void dhcp_device_shutdown(dhcp_device_context_t *context);
/** /**
* @code dhcp_device_get_status(check_type, context, type); * @code dhcp_device_get_status(check_type, context);
* *
* @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate * @brief collects DHCP relay status info for a given interface. If context is null, it will report aggregate
* status * status
* *
* @param check_type Type of validation * @param check_type Type of validation
* @param context Device (interface) context * @param context Device (interface) context
* @param type DHCP type
* *
* @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
*/ */
dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type); dhcp_mon_status_t dhcp_device_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context);
/** /**
* @code dhcp_device_update_snapshot(context); * @code dhcp_device_update_snapshot(context);
@ -238,32 +185,10 @@ void dhcp_device_update_snapshot(dhcp_device_context_t *context);
* @brief prints status counters to syslog. If context is null, it will print aggregate status * @brief prints status counters to syslog. If context is null, it will print aggregate status
* *
* @param context Device (interface) context * @param context Device (interface) context
* @param type Counter type to be printed * @param counters_type Counter type to be printed
* *
* @return none * @return none
*/ */
void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type); void dhcp_device_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type);
/**
* @code dhcp_device_active_types(dhcpv4, dhcpv6);
*
* @brief update local variables with active protocols
*
* @param dhcpv4 DHCPv4 enable flag
* @param dhcpv6 DHCPv6 enable flag
*
* @return none
*/
void dhcp_device_active_types(bool dhcpv4, bool dhcpv6);
/**
* @code dhcp_device_init_mgmt_intf(mgmt_intf_context);
*
* @brief assign context address of mgmt interface
*
* @param mgmt_intf_context MGMT interface context struct address
*
* @return none
*/
void dhcp_device_init_mgmt_intf(dhcp_device_context_t *mgmt_intf_context);
#endif /* DHCP_DEVICE_H_ */ #endif /* DHCP_DEVICE_H_ */

37
src/dhcpmon/src/dhcp_devman.c
View File

@ -9,8 +9,6 @@
#include <syslog.h> #include <syslog.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <stdlib.h> #include <stdlib.h>
#include <arpa/inet.h>
#include <stdbool.h>
#include "dhcp_devman.h" #include "dhcp_devman.h"
@ -37,8 +35,7 @@ static uint32_t dhcp_num_mgmt_intf = 0;
/** On Device vlan interface IP address corresponding vlan downlink IP /** On Device vlan interface IP address corresponding vlan downlink IP
* This IP is used to filter Offer/Ack packet coming from DHCP server */ * This IP is used to filter Offer/Ack packet coming from DHCP server */
static in_addr_t v4_vlan_ip = 0; static in_addr_t vlan_ip = 0;
static struct in6_addr v6_vlan_ip = {0};
/* Device loopback interface ip, which will be used as the giaddr in dual tor setup. */ /* Device loopback interface ip, which will be used as the giaddr in dual tor setup. */
static in_addr_t loopback_ip = 0; static in_addr_t loopback_ip = 0;
@ -139,8 +136,7 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
rv = dhcp_device_init(&dev->dev_context, dev->name, dev->is_uplink); rv = dhcp_device_init(&dev->dev_context, dev->name, dev->is_uplink);
if (rv == 0 && intf_type == 'd') { if (rv == 0 && intf_type == 'd') {
rv = dhcp_device_get_ipv4(dev->dev_context, &v4_vlan_ip); rv = dhcp_device_get_ip(dev->dev_context, &vlan_ip);
rv = dhcp_device_get_ipv6(dev->dev_context, &v6_vlan_ip);
dhcp_device_context_t *agg_dev = dhcp_device_get_aggregate_context(); dhcp_device_context_t *agg_dev = dhcp_device_get_aggregate_context();
@ -148,9 +144,6 @@ int dhcp_devman_add_intf(const char *name, char intf_type)
strncpy(agg_dev->intf + sizeof(AGG_DEV_PREFIX) - 1, name, sizeof(agg_dev->intf) - sizeof(AGG_DEV_PREFIX)); strncpy(agg_dev->intf + sizeof(AGG_DEV_PREFIX) - 1, name, sizeof(agg_dev->intf) - sizeof(AGG_DEV_PREFIX));
agg_dev->intf[sizeof(agg_dev->intf) - 1] = '\0'; agg_dev->intf[sizeof(agg_dev->intf) - 1] = '\0';
} }
else if (rv == 0 && intf_type == 'm') {
dhcp_device_init_mgmt_intf(dev->dev_context);
}
LIST_INSERT_HEAD(&intfs, dev, entry); LIST_INSERT_HEAD(&intfs, dev, entry);
} }
@ -181,7 +174,7 @@ int dhcp_devman_setup_dual_tor_mode(const char *name)
} }
if (initialize_intf_mac_and_ip_addr(&loopback_intf_context) == 0 && if (initialize_intf_mac_and_ip_addr(&loopback_intf_context) == 0 &&
dhcp_device_get_ipv4(&loopback_intf_context, &loopback_ip) == 0) { dhcp_device_get_ip(&loopback_intf_context, &loopback_ip) == 0) {
dual_tor_mode = 1; dual_tor_mode = 1;
} else { } else {
syslog(LOG_ALERT, "failed to retrieve ip addr for loopback interface (%s)", name); syslog(LOG_ALERT, "failed to retrieve ip addr for loopback interface (%s)", name);
@ -204,13 +197,11 @@ int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
if ((dhcp_num_south_intf == 1) && (dhcp_num_north_intf >= 1)) { if ((dhcp_num_south_intf == 1) && (dhcp_num_north_intf >= 1)) {
LIST_FOREACH(int_ptr, &intfs, entry) { LIST_FOREACH(int_ptr, &intfs, entry) {
rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : v4_vlan_ip, v6_vlan_ip); rv = dhcp_device_start_capture(int_ptr->dev_context, snaplen, base, dual_tor_mode ? loopback_ip : vlan_ip);
if (rv == 0) { if (rv == 0) {
char ipv6_addr[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &int_ptr->dev_context->ipv6, ipv6_addr, sizeof(ipv6_addr));
syslog(LOG_INFO, syslog(LOG_INFO,
"Capturing DHCP packets on interface %s, ipv4: 0x%08x, ipv6: %s, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n", "Capturing DHCP packets on interface %s, ip: 0x%08x, mac [%02x:%02x:%02x:%02x:%02x:%02x] \n",
int_ptr->name, int_ptr->dev_context->ipv4, ipv6_addr, int_ptr->dev_context->mac[0], int_ptr->name, int_ptr->dev_context->ip, int_ptr->dev_context->mac[0],
int_ptr->dev_context->mac[1], int_ptr->dev_context->mac[2], int_ptr->dev_context->mac[3], int_ptr->dev_context->mac[1], int_ptr->dev_context->mac[2], int_ptr->dev_context->mac[3],
int_ptr->dev_context->mac[4], int_ptr->dev_context->mac[5]); int_ptr->dev_context->mac[4], int_ptr->dev_context->mac[5]);
} }
@ -228,13 +219,13 @@ int dhcp_devman_start_capture(size_t snaplen, struct event_base *base)
} }
/** /**
* @code dhcp_devman_get_status(check_type, context, type); * @code dhcp_devman_get_status(check_type, context);
* *
* @brief collects DHCP relay status info. * @brief collects DHCP relay status info.
*/ */
dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type) dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context)
{ {
return dhcp_device_get_status(check_type, context, type); return dhcp_device_get_status(check_type, context);
} }
/** /**
@ -276,13 +267,3 @@ void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type
dhcp_device_print_status(context, type); dhcp_device_print_status(context, type);
} }
} }
/**
* @code dhcp_devman_active_types(dhcpv4, dhcpv6);
*
* @brief update local variables with active protocols
*/
void dhcp_devman_active_types(bool dhcpv4, bool dhcpv6)
{
dhcp_device_active_types(dhcpv4, dhcpv6);
}

17
src/dhcpmon/src/dhcp_devman.h
View File

@ -87,17 +87,16 @@ int dhcp_devman_setup_dual_tor_mode(const char *name);
int dhcp_devman_start_capture(size_t snaplen, struct event_base *base); int dhcp_devman_start_capture(size_t snaplen, struct event_base *base);
/** /**
* @code dhcp_devman_get_status(check_type, context, type); * @code dhcp_devman_get_status(check_type, context);
* *
* @brief collects DHCP relay status info. * @brief collects DHCP relay status info.
* *
* @param check_type Type of validation * @param check_type Type of validation
* @param context pointer to device (interface) context * @param context pointer to device (interface) context
* @param type DHCP type
* *
* @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE * @return DHCP_MON_STATUS_HEALTHY, DHCP_MON_STATUS_UNHEALTHY, or DHCP_MON_STATUS_INDETERMINATE
*/ */
dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context, dhcp_type_t type); dhcp_mon_status_t dhcp_devman_get_status(dhcp_mon_check_t check_type, dhcp_device_context_t *context);
/** /**
* @code dhcp_devman_update_snapshot(context); * @code dhcp_devman_update_snapshot(context);
@ -120,16 +119,4 @@ void dhcp_devman_update_snapshot(dhcp_device_context_t *context);
*/ */
void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type); void dhcp_devman_print_status(dhcp_device_context_t *context, dhcp_counters_type_t type);
/**
* @code dhcp_devman_active_types(dhcpv4, dhcpv6);
*
* @brief update local variables with active protocols
*
* @param dhcpv4 flag indicating dhcpv4 is enabled
* @param dhcpv6 flag indicating dhcpv6 is enabled
*
* @return none
*/
void dhcp_devman_active_types(bool dhcpv4, bool dhcpv6);
#endif /* DHCP_DEVMAN_H_ */ #endif /* DHCP_DEVMAN_H_ */

102
src/dhcpmon/src/dhcp_mon.c
View File

@ -12,24 +12,16 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <syslog.h> #include <syslog.h>
#include <assert.h> #include <assert.h>
#include <stdbool.h>
#include "dhcp_mon.h" #include "dhcp_mon.h"
#include "dhcp_devman.h" #include "dhcp_devman.h"
/** DHCP device/interface state counters */
typedef struct
{
int v4_count; /** count in the number of DHCPv4 unhealthy checks */
int v6_count; /** count in the number of DHCPv6 unhealthy checks */
} dhcp_mon_count_t;
/** DHCP device/interface state */ /** DHCP device/interface state */
typedef struct typedef struct
{ {
dhcp_mon_check_t check_type; /** check type */ dhcp_mon_check_t check_type; /** check type */
dhcp_device_context_t* (*get_context)(); /** functor to a device context accessor function */ dhcp_device_context_t* (*get_context)(); /** functor to a device context accessor function */
dhcp_mon_count_t counters; /** count in the number of unhealthy checks */ int count; /** count in the number of unhealthy checks */
const char *msg; /** message to be printed if unhealthy state is determined */ const char *msg; /** message to be printed if unhealthy state is determined */
} dhcp_mon_state_t; } dhcp_mon_state_t;
@ -37,10 +29,6 @@ typedef struct
static int window_interval_sec = 18; static int window_interval_sec = 18;
/** dhcp_unhealthy_max_count max count of consecutive unhealthy statuses before reporting to syslog */ /** dhcp_unhealthy_max_count max count of consecutive unhealthy statuses before reporting to syslog */
static int dhcp_unhealthy_max_count = 10; static int dhcp_unhealthy_max_count = 10;
/** DHCP versions flags */
static bool dhcpv4_enabled;
static bool dhcpv6_enabled;
/** libevent base struct */ /** libevent base struct */
static struct event_base *base; static struct event_base *base;
/** libevent timeout event struct */ /** libevent timeout event struct */
@ -57,15 +45,13 @@ static dhcp_mon_state_t state_data[] = {
[0] = { [0] = {
.check_type = DHCP_MON_CHECK_POSITIVE, .check_type = DHCP_MON_CHECK_POSITIVE,
.get_context = dhcp_devman_get_agg_dev, .get_context = dhcp_devman_get_agg_dev,
.counters.v4_count = 0, .count = 0,
.counters.v6_count = 0,
.msg = "dhcpmon detected disparity in DHCP Relay behavior. Duration: %d (sec) for vlan: '%s'\n" .msg = "dhcpmon detected disparity in DHCP Relay behavior. Duration: %d (sec) for vlan: '%s'\n"
}, },
[1] = { [1] = {
.check_type = DHCP_MON_CHECK_NEGATIVE, .check_type = DHCP_MON_CHECK_NEGATIVE,
.get_context = dhcp_devman_get_mgmt_dev, .get_context = dhcp_devman_get_mgmt_dev,
.counters.v4_count = 0, .count = 0,
.counters.v6_count = 0,
.msg = "dhcpmon detected DHCP packets traveling through mgmt interface (please check BGP routes.)" .msg = "dhcpmon detected DHCP packets traveling through mgmt interface (please check BGP routes.)"
" Duration: %d (sec) for intf: '%s'\n" " Duration: %d (sec) for intf: '%s'\n"
} }
@ -92,89 +78,36 @@ static void signal_callback(evutil_socket_t fd, short event, void *arg)
} }
/** /**
* @code check_dhcp_relay_health(state_data, dhcp_type); * @code check_dhcp_relay_health(state_data);
* *
* @brief check DHCP relay overall health * @brief check DHCP relay overall health
* *
* @param state_data pointer to dhcpmon state data * @param state_data pointer to dhcpmon state data
* *
* @param type DHCP type
*
* @return none * @return none
*/ */
static void check_dhcp_relay_health(dhcp_mon_state_t *state_data, dhcp_type_t type) static void check_dhcp_relay_health(dhcp_mon_state_t *state_data)
{ {
dhcp_device_context_t *context = state_data->get_context(); dhcp_device_context_t *context = state_data->get_context();
dhcp_mon_status_t dhcp_mon_status = dhcp_devman_get_status(state_data->check_type, context, type); dhcp_mon_status_t dhcp_mon_status = dhcp_devman_get_status(state_data->check_type, context);
switch (dhcp_mon_status) switch (dhcp_mon_status)
{ {
case DHCP_MON_STATUS_UNHEALTHY: case DHCP_MON_STATUS_UNHEALTHY:
switch (type) if (++state_data->count > dhcp_unhealthy_max_count) {
{ syslog(LOG_ALERT, state_data->msg, state_data->count * window_interval_sec, context->intf);
case DHCPv4_TYPE:
if (++state_data->counters.v4_count > dhcp_unhealthy_max_count) {
syslog(LOG_ALERT, state_data->msg, state_data->counters.v4_count * window_interval_sec, context->intf);
dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT); dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT); dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
} }
break; break;
case DHCPv6_TYPE:
if (++state_data->counters.v6_count > dhcp_unhealthy_max_count) {
syslog(LOG_ALERT, state_data->msg, state_data->counters.v6_count * window_interval_sec, context->intf);
dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
}
break;
default:
syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
break;
}
break;
case DHCP_MON_STATUS_HEALTHY: case DHCP_MON_STATUS_HEALTHY:
switch (type) state_data->count = 0;
{
case DHCPv4_TYPE:
state_data->counters.v4_count = 0;
break; break;
case DHCPv6_TYPE:
state_data->counters.v6_count = 0;
break;
default:
syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
break;
}
break;
case DHCP_MON_STATUS_INDETERMINATE: case DHCP_MON_STATUS_INDETERMINATE:
switch (type) if (state_data->count) {
{ state_data->count++;
case DHCPv4_TYPE:
if (state_data->counters.v4_count) {
if (++state_data->counters.v4_count > dhcp_unhealthy_max_count) {
syslog(LOG_ALERT, state_data->msg, state_data->counters.v4_count * window_interval_sec, context->intf);
dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
}
} }
break; break;
case DHCPv6_TYPE:
if (state_data->counters.v6_count) {
if (++state_data->counters.v6_count > dhcp_unhealthy_max_count) {
syslog(LOG_ALERT, state_data->msg, state_data->counters.v6_count * window_interval_sec, context->intf);
dhcp_devman_print_status(context, DHCP_COUNTERS_SNAPSHOT);
dhcp_devman_print_status(context, DHCP_COUNTERS_CURRENT);
}
}
break;
default:
syslog(LOG_ERR, "Unknown DHCP type %d\n", type);
break;
}
break;
default: default:
syslog(LOG_ERR, "DHCP Relay returned unknown status %d\n", dhcp_mon_status); syslog(LOG_ERR, "DHCP Relay returned unknown status %d\n", dhcp_mon_status);
break; break;
@ -195,12 +128,7 @@ static void check_dhcp_relay_health(dhcp_mon_state_t *state_data, dhcp_type_t ty
static void timeout_callback(evutil_socket_t fd, short event, void *arg) static void timeout_callback(evutil_socket_t fd, short event, void *arg)
{ {
for (uint8_t i = 0; i < sizeof(state_data) / sizeof(*state_data); i++) { for (uint8_t i = 0; i < sizeof(state_data) / sizeof(*state_data); i++) {
if (dhcpv4_enabled) { check_dhcp_relay_health(&state_data[i]);
check_dhcp_relay_health(&state_data[i], DHCPv4_TYPE);
}
if (dhcpv6_enabled) {
check_dhcp_relay_health(&state_data[i], DHCPv6_TYPE);
}
} }
dhcp_devman_update_snapshot(NULL); dhcp_devman_update_snapshot(NULL);
@ -213,17 +141,13 @@ static void timeout_callback(evutil_socket_t fd, short event, void *arg)
* seconds. It also writes to syslog when dhcp relay has been unhealthy for consecutive max_count checks. * seconds. It also writes to syslog when dhcp relay has been unhealthy for consecutive max_count checks.
* *
*/ */
int dhcp_mon_init(int window_sec, int max_count, bool dhcpv4, bool dhcpv6) int dhcp_mon_init(int window_sec, int max_count)
{ {
int rv = -1; int rv = -1;
do { do {
window_interval_sec = window_sec; window_interval_sec = window_sec;
dhcp_unhealthy_max_count = max_count; dhcp_unhealthy_max_count = max_count;
dhcpv4_enabled = dhcpv4;
dhcpv6_enabled = dhcpv6;
dhcp_devman_active_types(dhcpv4, dhcpv6);
base = event_base_new(); base = event_base_new();
if (base == NULL) { if (base == NULL) {

4
src/dhcpmon/src/dhcp_mon.h
View File

@ -17,12 +17,10 @@
* *
* @param window_sec time interval between health checks * @param window_sec time interval between health checks
* @param max_count max count of consecutive unhealthy statuses before reporting to syslog * @param max_count max count of consecutive unhealthy statuses before reporting to syslog
* @param dhcpv4 flag indicating dhcpv4 is enabled
* @param dhcpv6 flag indicating dhcpv6 is enabled
* *
* @return 0 upon success, otherwise upon failure * @return 0 upon success, otherwise upon failure
*/ */
int dhcp_mon_init(int window_sec, int max_count, bool dhcpv4, bool dhcpv6); int dhcp_mon_init(int window_sec, int max_count);
/** /**
* @code dhcp_mon_shutdown(); * @code dhcp_mon_shutdown();

20
src/dhcpmon/src/main.c
View File

@ -16,7 +16,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <stdbool.h>
#include "dhcp_mon.h" #include "dhcp_mon.h"
#include "dhcp_devman.h" #include "dhcp_devman.h"
@ -42,8 +41,7 @@ static const uint32_t dhcpmon_default_unhealthy_max_count = 10;
static void usage(const char *prog) static void usage(const char *prog)
{ {
printf("Usage: %s -id <south interface> {-iu <north interface>}+ -im <mgmt interface> [-u <loopback interface>]" printf("Usage: %s -id <south interface> {-iu <north interface>}+ -im <mgmt interface> [-u <loopback interface>]"
"[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>]" "[-w <snapshot window in sec>] [-c <unhealthy status count>] [-s <snap length>] [-d]\n", prog);
"[-4 <DHCPv4 monitoring>] [-6 <DHCPv4 monitoring>] [-d]\n", prog);
printf("where\n"); printf("where\n");
printf("\tsouth interface: is a vlan interface,\n"); printf("\tsouth interface: is a vlan interface,\n");
printf("\tnorth interface: is a TOR-T1 interface,\n"); printf("\tnorth interface: is a TOR-T1 interface,\n");
@ -114,8 +112,6 @@ int main(int argc, char **argv)
int max_unhealthy_count = dhcpmon_default_unhealthy_max_count; int max_unhealthy_count = dhcpmon_default_unhealthy_max_count;
size_t snaplen = dhcpmon_default_snaplen; size_t snaplen = dhcpmon_default_snaplen;
int make_daemon = 0; int make_daemon = 0;
bool dhcpv4_enabled = false;
bool dhcpv6_enabled = false;
setlogmask(LOG_UPTO(LOG_INFO)); setlogmask(LOG_UPTO(LOG_INFO));
openlog(basename(argv[0]), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON); openlog(basename(argv[0]), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON);
@ -159,14 +155,6 @@ int main(int argc, char **argv)
max_unhealthy_count = atoi(argv[i + 1]); max_unhealthy_count = atoi(argv[i + 1]);
i += 2; i += 2;
break; break;
case '4':
dhcpv4_enabled = true;
i++;
break;
case '6':
dhcpv6_enabled = true;
i++;
break;
default: default:
fprintf(stderr, "%s: %c: Unknown option\n", basename(argv[0]), argv[i][1]); fprintf(stderr, "%s: %c: Unknown option\n", basename(argv[0]), argv[i][1]);
usage(basename(argv[0])); usage(basename(argv[0]));
@ -177,11 +165,7 @@ int main(int argc, char **argv)
dhcpmon_daemonize(); dhcpmon_daemonize();
} }
if (!dhcpv4_enabled && !dhcpv6_enabled) { if ((dhcp_mon_init(window_interval, max_unhealthy_count) == 0) &&
dhcpv4_enabled = true;
}
if ((dhcp_mon_init(window_interval, max_unhealthy_count, dhcpv4_enabled, dhcpv6_enabled) == 0) &&
(dhcp_mon_start(snaplen) == 0)) { (dhcp_mon_start(snaplen) == 0)) {
rv = EXIT_SUCCESS; rv = EXIT_SUCCESS;

2
src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf
View File

@ -68,7 +68,7 @@ dependent_startup_wait_for=start:exited
programs=dhcpmon-Vlan1000 programs=dhcpmon-Vlan1000
[program:dhcpmon-Vlan1000] [program:dhcpmon-Vlan1000]
command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0 -4 -6 command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -iu PortChannel01 -im eth0
priority=4 priority=4
autostart=false autostart=false
autorestart=false autorestart=false

2
src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf
View File

@ -68,7 +68,7 @@ dependent_startup_wait_for=start:exited
programs=dhcpmon-Vlan1000 programs=dhcpmon-Vlan1000
[program:dhcpmon-Vlan1000] [program:dhcpmon-Vlan1000]
command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0 -4 -6 command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortChannel02 -iu PortChannel03 -iu PortChannel04 -im eth0
priority=4 priority=4
autostart=false autostart=false
autorestart=false autorestart=false