net: net_mgmt events a unique bit

Transition net_mgmt event codes to be bit enumerations instead of
integer enumerations. This is required in order for the standard
usage (and documented behaviour) of ORing together events for
`net_mgmt_init_event_callback` to work properly.

Since `mgmt_run_slist_callbacks` runs the event handler if *ANY* bits
between the occuring command code and the registered event command bits
match, ORing together integers results in event being delivered to
handlers that never asked for them.

Signed-off-by: Jordan Yates <jordan@embeint.com>

Author: JordanYates

include/zephyr/net/coap_mgmt.h

@@ -42,11 +42,11 @@ struct coap_observer;
 
 enum net_event_coap_cmd {
 	/* Service events */
-	NET_EVENT_COAP_CMD_SERVICE_STARTED = 1,
-	NET_EVENT_COAP_CMD_SERVICE_STOPPED,
+	NET_EVENT_COAP_CMD_SERVICE_STARTED = BIT(0),
+	NET_EVENT_COAP_CMD_SERVICE_STOPPED = BIT(1),
 	/* Observer events */
-	NET_EVENT_COAP_CMD_OBSERVER_ADDED,
-	NET_EVENT_COAP_CMD_OBSERVER_REMOVED,
+	NET_EVENT_COAP_CMD_OBSERVER_ADDED = BIT(2),
+	NET_EVENT_COAP_CMD_OBSERVER_REMOVED = BIT(3),
 };
 
 /** @endcond */

include/zephyr/net/conn_mgr_connectivity.h

@@ -42,8 +42,8 @@ extern "C" {
 #define _NET_MGMT_CONN_IF_EVENT			(NET_MGMT_IFACE_BIT | _NET_MGMT_CONN_BASE)
 
 enum net_event_conn_cmd {
-	NET_EVENT_CONN_CMD_IF_TIMEOUT = 1,
-	NET_EVENT_CONN_CMD_IF_FATAL_ERROR,
+	NET_EVENT_CONN_CMD_IF_TIMEOUT = BIT(0),
+	NET_EVENT_CONN_CMD_IF_FATAL_ERROR = BIT(1),
 };
 
 /** @endcond */

include/zephyr/net/ethernet_mgmt.h

@@ -189,10 +189,10 @@ struct ethernet_req_params {
 };
 
 enum net_event_ethernet_cmd {
-	NET_EVENT_ETHERNET_CMD_CARRIER_ON = 1,
-	NET_EVENT_ETHERNET_CMD_CARRIER_OFF,
-	NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED,
-	NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED,
+	NET_EVENT_ETHERNET_CMD_CARRIER_ON = BIT(0),
+	NET_EVENT_ETHERNET_CMD_CARRIER_OFF = BIT(1),
+	NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED = BIT(2),
+	NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED = BIT(3),
 };
 
 #define NET_EVENT_ETHERNET_CARRIER_ON					\

include/zephyr/net/ieee802154_mgmt.h

@@ -256,7 +256,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_SECURITY_SETTINGS);
  */
 
 enum net_event_ieee802154_cmd {
-	NET_EVENT_IEEE802154_CMD_SCAN_RESULT = 1,
+	NET_EVENT_IEEE802154_CMD_SCAN_RESULT = BIT(0),
 };
 
 /**

include/zephyr/net/net_event.h

@@ -35,10 +35,10 @@ extern "C" {
 				 NET_MGMT_LAYER_CODE(_NET_IF_CORE_CODE))
 
 enum net_event_if_cmd {
-	NET_EVENT_IF_CMD_DOWN = 1,
-	NET_EVENT_IF_CMD_UP,
-	NET_EVENT_IF_CMD_ADMIN_DOWN,
-	NET_EVENT_IF_CMD_ADMIN_UP,
+	NET_EVENT_IF_CMD_DOWN = BIT(0),
+	NET_EVENT_IF_CMD_UP = BIT(1),
+	NET_EVENT_IF_CMD_ADMIN_DOWN = BIT(2),
+	NET_EVENT_IF_CMD_ADMIN_UP = BIT(3),
 };
 
 /* IPv6 Events */
@@ -86,21 +86,21 @@ enum net_event_ipv6_cmd {
 				 NET_MGMT_LAYER_CODE(_NET_IPV4_CORE_CODE))
 
 enum net_event_ipv4_cmd {
-	NET_EVENT_IPV4_CMD_ADDR_ADD	= 1,
-	NET_EVENT_IPV4_CMD_ADDR_DEL,
-	NET_EVENT_IPV4_CMD_MADDR_ADD,
-	NET_EVENT_IPV4_CMD_MADDR_DEL,
-	NET_EVENT_IPV4_CMD_ROUTER_ADD,
-	NET_EVENT_IPV4_CMD_ROUTER_DEL,
-	NET_EVENT_IPV4_CMD_DHCP_START,
-	NET_EVENT_IPV4_CMD_DHCP_BOUND,
-	NET_EVENT_IPV4_CMD_DHCP_STOP,
-	NET_EVENT_IPV4_CMD_MCAST_JOIN,
-	NET_EVENT_IPV4_CMD_MCAST_LEAVE,
-	NET_EVENT_IPV4_CMD_ACD_SUCCEED,
-	NET_EVENT_IPV4_CMD_ACD_FAILED,
-	NET_EVENT_IPV4_CMD_ACD_CONFLICT,
-	NET_EVENT_IPV4_CMD_PMTU_CHANGED,
+	NET_EVENT_IPV4_CMD_ADDR_ADD = BIT(0),
+	NET_EVENT_IPV4_CMD_ADDR_DEL = BIT(1),
+	NET_EVENT_IPV4_CMD_MADDR_ADD = BIT(2),
+	NET_EVENT_IPV4_CMD_MADDR_DEL = BIT(3),
+	NET_EVENT_IPV4_CMD_ROUTER_ADD = BIT(4),
+	NET_EVENT_IPV4_CMD_ROUTER_DEL = BIT(5),
+	NET_EVENT_IPV4_CMD_DHCP_START = BIT(6),
+	NET_EVENT_IPV4_CMD_DHCP_BOUND = BIT(7),
+	NET_EVENT_IPV4_CMD_DHCP_STOP = BIT(8),
+	NET_EVENT_IPV4_CMD_MCAST_JOIN = BIT(9),
+	NET_EVENT_IPV4_CMD_MCAST_LEAVE = BIT(10),
+	NET_EVENT_IPV4_CMD_ACD_SUCCEED = BIT(11),
+	NET_EVENT_IPV4_CMD_ACD_FAILED = BIT(12),
+	NET_EVENT_IPV4_CMD_ACD_CONFLICT = BIT(13),
+	NET_EVENT_IPV4_CMD_PMTU_CHANGED = BIT(14),
 };
 
 /* L4 network events */
@@ -112,21 +112,21 @@ enum net_event_ipv4_cmd {
 				 NET_MGMT_LAYER_CODE(_NET_L4_CORE_CODE))
 
 enum net_event_l4_cmd {
-	NET_EVENT_L4_CMD_CONNECTED = 1,
-	NET_EVENT_L4_CMD_DISCONNECTED,
-	NET_EVENT_L4_CMD_IPV4_CONNECTED,
-	NET_EVENT_L4_CMD_IPV4_DISCONNECTED,
-	NET_EVENT_L4_CMD_IPV6_CONNECTED,
-	NET_EVENT_L4_CMD_IPV6_DISCONNECTED,
-	NET_EVENT_L4_CMD_DNS_SERVER_ADD,
-	NET_EVENT_L4_CMD_DNS_SERVER_DEL,
-	NET_EVENT_L4_CMD_HOSTNAME_CHANGED,
-	NET_EVENT_L4_CMD_CAPTURE_STARTED,
-	NET_EVENT_L4_CMD_CAPTURE_STOPPED,
-	NET_EVENT_L4_CMD_VPN_CONNECTED,
-	NET_EVENT_L4_CMD_VPN_DISCONNECTED,
-	NET_EVENT_L4_CMD_VPN_PEER_ADD,
-	NET_EVENT_L4_CMD_VPN_PEER_DEL,
+	NET_EVENT_L4_CMD_CONNECTED = BIT(0),
+	NET_EVENT_L4_CMD_DISCONNECTED = BIT(1),
+	NET_EVENT_L4_CMD_IPV4_CONNECTED = BIT(2),
+	NET_EVENT_L4_CMD_IPV4_DISCONNECTED = BIT(3),
+	NET_EVENT_L4_CMD_IPV6_CONNECTED = BIT(4),
+	NET_EVENT_L4_CMD_IPV6_DISCONNECTED = BIT(5),
+	NET_EVENT_L4_CMD_DNS_SERVER_ADD = BIT(6),
+	NET_EVENT_L4_CMD_DNS_SERVER_DEL = BIT(7),
+	NET_EVENT_L4_CMD_HOSTNAME_CHANGED = BIT(8),
+	NET_EVENT_L4_CMD_CAPTURE_STARTED = BIT(9),
+	NET_EVENT_L4_CMD_CAPTURE_STOPPED = BIT(10),
+	NET_EVENT_L4_CMD_VPN_CONNECTED = BIT(11),
+	NET_EVENT_L4_CMD_VPN_DISCONNECTED = BIT(12),
+	NET_EVENT_L4_CMD_VPN_PEER_ADD = BIT(13),
+	NET_EVENT_L4_CMD_VPN_PEER_DEL = BIT(14),
 };
 
 /** @endcond */

include/zephyr/net/wifi_mgmt.h

@@ -320,41 +320,41 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_NEIGHBOR_REP_COMPLETE);
 /** @brief Wi-Fi management events */
 enum net_event_wifi_cmd {
 	/** Scan results available */
-	NET_EVENT_WIFI_CMD_SCAN_RESULT = 1,
+	NET_EVENT_WIFI_CMD_SCAN_RESULT = BIT(0),
 	/** Scan done */
-	NET_EVENT_WIFI_CMD_SCAN_DONE,
+	NET_EVENT_WIFI_CMD_SCAN_DONE = BIT(1),
 	/** Connect result */
-	NET_EVENT_WIFI_CMD_CONNECT_RESULT,
+	NET_EVENT_WIFI_CMD_CONNECT_RESULT = BIT(2),
 	/** Disconnect result */
-	NET_EVENT_WIFI_CMD_DISCONNECT_RESULT,
+	NET_EVENT_WIFI_CMD_DISCONNECT_RESULT = BIT(3),
 	/** Interface status */
-	NET_EVENT_WIFI_CMD_IFACE_STATUS,
+	NET_EVENT_WIFI_CMD_IFACE_STATUS = BIT(4),
 	/** TWT events */
-	NET_EVENT_WIFI_CMD_TWT,
+	NET_EVENT_WIFI_CMD_TWT = BIT(5),
 	/** TWT sleep status: awake or sleeping, can be used by application
 	 * to determine if it can send data or not.
 	 */
-	NET_EVENT_WIFI_CMD_TWT_SLEEP_STATE,
+	NET_EVENT_WIFI_CMD_TWT_SLEEP_STATE = BIT(6),
 	/** Raw scan results available */
-	NET_EVENT_WIFI_CMD_RAW_SCAN_RESULT,
+	NET_EVENT_WIFI_CMD_RAW_SCAN_RESULT = BIT(7),
 	/** Disconnect complete */
-	NET_EVENT_WIFI_CMD_DISCONNECT_COMPLETE,
+	NET_EVENT_WIFI_CMD_DISCONNECT_COMPLETE = BIT(8),
 	/** Signal change event */
-	NET_EVENT_WIFI_CMD_SIGNAL_CHANGE,
+	NET_EVENT_WIFI_CMD_SIGNAL_CHANGE = BIT(9),
 	/** Neighbor Report */
-	NET_EVENT_WIFI_CMD_NEIGHBOR_REP_RECEIVED,
+	NET_EVENT_WIFI_CMD_NEIGHBOR_REP_RECEIVED = BIT(10),
 	/** Neighbor Report complete */
-	NET_EVENT_WIFI_CMD_NEIGHBOR_REP_COMPLETE,
+	NET_EVENT_WIFI_CMD_NEIGHBOR_REP_COMPLETE = BIT(11),
 	/** AP mode enable result */
-	NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+	NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT = BIT(12),
 	/** AP mode disable result */
-	NET_EVENT_WIFI_CMD_AP_DISABLE_RESULT,
+	NET_EVENT_WIFI_CMD_AP_DISABLE_RESULT = BIT(13),
 	/** STA connected to AP */
-	NET_EVENT_WIFI_CMD_AP_STA_CONNECTED,
+	NET_EVENT_WIFI_CMD_AP_STA_CONNECTED = BIT(14),
 	/** STA disconnected from AP */
-	NET_EVENT_WIFI_CMD_AP_STA_DISCONNECTED,
+	NET_EVENT_WIFI_CMD_AP_STA_DISCONNECTED = BIT(15),
 	/** Supplicant specific event */
-	NET_EVENT_WIFI_CMD_SUPPLICANT,
+	NET_EVENT_WIFI_CMD_SUPPLICANT = BIT(16),
 };
 
 /** Event emitted for Wi-Fi scan result */

modules/hostap/src/supp_events.h

@@ -18,13 +18,13 @@
 #define _NET_MGMT_SUPPLICANT_EVENT (NET_MGMT_EVENT_BIT | _NET_MGMT_SUPPLICANT_BASE)
 
 enum net_event_supplicant_cmd {
-	NET_EVENT_SUPPLICANT_CMD_READY = 1,
-	NET_EVENT_SUPPLICANT_CMD_NOT_READY,
-	NET_EVENT_SUPPLICANT_CMD_IFACE_ADDED,
-	NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVING,
-	NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVED,
-	NET_EVENT_SUPPLICANT_CMD_INT_EVENT,
-	NET_EVENT_WIFI_CMD_MAX
+	NET_EVENT_SUPPLICANT_CMD_READY = BIT(0),
+	NET_EVENT_SUPPLICANT_CMD_NOT_READY = BIT(1),
+	NET_EVENT_SUPPLICANT_CMD_IFACE_ADDED = BIT(2),
+	NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVING = BIT(3),
+	NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVED = BIT(4),
+	NET_EVENT_SUPPLICANT_CMD_INT_EVENT = BIT(5),
+	NET_EVENT_WIFI_CMD_MAX = BIT(6),
 };
 
 #define NET_EVENT_SUPPLICANT_READY					\