Revert "Added DHCPv6 Monitor"

This reverts commit 5737c22.

dockers/docker-dhcp-relay/dhcp-relay.monitors.j2

@@ -0,0 +1,71 @@
+[group:dhcpmon]
+programs=
+{%- set add_preceding_comma = { 'flag': False } %}
+{% set monitor_instance = { 'flag': False } %}
+{% for vlan_name in vlan_list %}
+{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
+{% set _dummy = monitor_instance.update({'flag': True}) %}
+{%- endif %}
+{% if DHCP_RELAY and vlan_name in DHCP_RELAY and 'dhcpv6_servers' in DHCP_RELAY[vlan_name] %}
+{% set _dummy = monitor_instance.update({'flag': True}) %}
+{% endif %}
+{% if monitor_instance.flag %}
+{% if add_preceding_comma.flag %},{% endif %}
+{% set _dummy = add_preceding_comma.update({'flag': True}) %}
+dhcpmon-{{ vlan_name }}
+{%- set _dummy = monitor_instance.update({'flag': False}) %}
+{%- endif %}
+{% endfor %}
+
+
+{# Create a program entry for each DHCP MONitor instance #}
+{% set relay_for_ipv4 = { 'flag': False } %}
+{% set relay_for_ipv6 = { 'flag': False } %}
+{% for vlan_name in vlan_list %}
+{# Check DHCPv4 agents #}
+{% if VLAN and vlan_name in VLAN and VLAN[vlan_name]['dhcp_servers'] %}
+{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
+{% if dhcp_server | ipv4 %}
+{% set _dummy = relay_for_ipv4.update({'flag': True}) %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{# Check DHCPv6 agents #}
+{% if DHCP_RELAY and vlan_name in DHCP_RELAY and 'dhcpv6_servers' in DHCP_RELAY[vlan_name] %}
+{% for dhcpv6_server in DHCP_RELAY[vlan_name]['dhcpv6_servers'] %}
+{% if dhcpv6_server | ipv6 %}
+{% set _dummy = relay_for_ipv6.update({'flag': True}) %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% if relay_for_ipv4.flag or relay_for_ipv6.flag %}
+[program:dhcpmon-{{ vlan_name }}]
+{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
+command=/usr/sbin/dhcpmon -id {{ vlan_name }}
+{#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
+{% for (name, prefix) in VLAN_INTERFACE %}
+{% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% for (name, prefix) in INTERFACE %}
+{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% for (name, prefix) in PORTCHANNEL_INTERFACE %}
+{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
+{% endfor %}
+{% if MGMT_INTERFACE %}
+{% for (name, prefix) in MGMT_INTERFACE %}
+{% if prefix | ipv4 %} -im {{ name }}{% endif -%}
+{% endfor %}
+{% endif %}
+
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+
+{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
+{% set _dummy = relay_for_ipv6.update({'flag': False}) %}
+{% endif %}
+{% endfor %}

dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2

@@ -24,6 +24,7 @@ stderr_logfile=syslog
 {# Count how many VLANs require a DHCP relay agent... #}
 {% set ipv4_num_relays = { 'count': 0 } %}
 {% set ipv6_num_relays = { 'count': 0 } %}
+{% set d = namespace(vlan_list=[]) %}
 {% for (name, prefix) in VLAN_INTERFACE %}
 {% if name not in d.vlan_list %}
 {% set d.vlan_list = d.vlan_list + [name] %}

src/dhcpmon/src/dhcp_device.h

@@ -18,43 +18,21 @@
 
 
 /**
- * DHCPv4 message types
+ * DHCP message types
  **/
 typedef enum
 {
-    DHCPv4_MESSAGE_TYPE_DISCOVER = 1,
-    DHCPv4_MESSAGE_TYPE_OFFER    = 2,
-    DHCPv4_MESSAGE_TYPE_REQUEST  = 3,
-    DHCPv4_MESSAGE_TYPE_DECLINE  = 4,
-    DHCPv4_MESSAGE_TYPE_ACK      = 5,
-    DHCPv4_MESSAGE_TYPE_NAK      = 6,
-    DHCPv4_MESSAGE_TYPE_RELEASE  = 7,
-    DHCPv4_MESSAGE_TYPE_INFORM   = 8,
-
-    DHCPv4_MESSAGE_TYPE_COUNT
-} dhcpv4_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;
+    DHCP_MESSAGE_TYPE_DISCOVER = 1,
+    DHCP_MESSAGE_TYPE_OFFER    = 2,
+    DHCP_MESSAGE_TYPE_REQUEST  = 3,
+    DHCP_MESSAGE_TYPE_DECLINE  = 4,
+    DHCP_MESSAGE_TYPE_ACK      = 5,
+    DHCP_MESSAGE_TYPE_NAK      = 6,
+    DHCP_MESSAGE_TYPE_RELEASE  = 7,
+    DHCP_MESSAGE_TYPE_INFORM   = 8,
+
+    DHCP_MESSAGE_TYPE_COUNT
+} dhcp_message_type_t;
 
 /** packet direction */
 typedef enum
@@ -82,78 +60,39 @@ typedef enum
     DHCP_MON_STATUS_INDETERMINATE,  /** DHCP relay health could not be determined */
 } dhcp_mon_status_t;
 
-/** dhcp type */
-typedef enum
-{
-    DHCPv4_TYPE,
-    DHCPv6_TYPE,
-} dhcp_type_t;
-
 /** dhcp check type */
 typedef enum
 {
     DHCP_MON_CHECK_NEGATIVE,    /** Presence of relayed DHCP packets activity is flagged as unhealthy state */
     DHCP_MON_CHECK_POSITIVE,    /** Validate that received DORA packets are relayed */
 } 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 */
 typedef struct
 {
     int sock;                       /** Raw socket associated with this device/interface */
-    in_addr_t ipv4;                 /** ipv4 network address of this device (interface) */
-    struct in6_addr ipv6;           /** ipv6 network address of this device (interface) */
+    in_addr_t ip;                   /** network 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 */
-    struct in6_addr v6_vlan_ip;     /** Vlan IPv6 address */
+    in_addr_t vlan_ip;              /** Vlan IP address */
     uint8_t is_uplink;              /** north interface? */
     char intf[IF_NAMESIZE];         /** device (interface) name */
     uint8_t *buffer;                /** buffer used to read socket data */
     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;
 
 /**
- * @code initialize_intf_mac_and_ip_addr(context);
- *
- * @brief initializes device (interface) mac/ip addresses
- *
- * @param context           pointer to device (interface) context
- *
- * @return 0 on success, otherwise for failure
- */
-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
  *
  * @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
  */
-int dhcp_device_get_ipv4(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);
+int dhcp_device_get_ip(dhcp_device_context_t *context, in_addr_t *ip);
 
 /**
  * @code dhcp_device_get_aggregate_context();
@@ -180,23 +119,21 @@ int dhcp_device_init(dhcp_device_context_t **context,
                      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, vlan_ip);
  *
  * @brief starts packet capture on this interface
  *
  * @param context           pointer to device (interface) context
  * @param snaplen           length of packet capture
  * @param base              pointer to libevent base
- * @param giaddr_ip         gateway IP address
- * @param v6_vlan_ip        vlan IPv6 address
+ * @param vlan_ip           vlan IP address
  *
  * @return 0 on success, otherwise for failure
  */
 int dhcp_device_start_capture(dhcp_device_context_t *context,
                               size_t snaplen,
                               struct event_base *base,
-                              in_addr_t giaddr_ip,
-                              struct in6_addr v6_vlan_ip);
+                              in_addr_t vlan_ip);
 
 /**
  * @code dhcp_device_shutdown(context);
@@ -210,18 +147,17 @@ int dhcp_device_start_capture(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
  *        status
  *
  * @param check_type        Type of validation
  * @param context           Device (interface) context
- * @param type              DHCP type
  *
  * @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);
@@ -238,32 +174,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
  *
  * @param context       Device (interface) context
- * @param type          Counter type to be printed
+ * @param counters_type Counter type to be printed
  *
  * @return none
  */
 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_ */