Previously, station state 'connected' used to identify an interface associated with AP. With the introduction of netconfig, an interface is assumed to be connected after the IP addresses have been assigned to it. If netconfig is disabled, the behavior remains unchanged. The change of station state by netconfig to 'connected' is implemented in the follow up patches. --- src/station.c | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/src/station.c b/src/station.c index 72393d51..9997352e 100644 --- a/src/station.c +++ b/src/station.c @@ -1162,23 +1162,6 @@ static void station_enter_state(struct station *station, break; case STATION_STATE_CONNECTED: - periodic_scan_stop(station); - - if (!station->netconfig) - break; - - if (station->state == STATION_STATE_ROAMING) { - netconfig_reconfigure(station->netconfig); - - break; - } - - netconfig_configure(station->netconfig, - network_get_settings( - station->connected_network), - netdev_get_address( - station->netdev)); - break; case STATION_STATE_DISCONNECTING: case STATION_STATE_ROAMING: break; @@ -1326,6 +1309,28 @@ static void station_roam_failed(struct station *station) station_roam_timeout_rearm(station, 60); } +static void station_connected(struct station *station) +{ + periodic_scan_stop(station); + + if (!station->netconfig) { + station_enter_state(station, STATION_STATE_CONNECTED); + + return; + } + + if (station->state == STATION_STATE_ROAMING) { + netconfig_reconfigure(station->netconfig); + + return; + } + + netconfig_configure(station->netconfig, + network_get_settings( + station->connected_network), + netdev_get_address(station->netdev)); +} + static void station_reassociate_cb(struct netdev *netdev, enum netdev_result result, void *event_data, @@ -1340,9 +1345,10 @@ static void station_reassociate_cb(struct netdev *netdev, if (result == NETDEV_RESULT_OK) { station_roamed(station); - station_enter_state(station, STATION_STATE_CONNECTED); - } else + station_connected(station); + } else { station_roam_failed(station); + } } static void station_fast_transition_cb(struct netdev *netdev, @@ -1359,9 +1365,10 @@ static void station_fast_transition_cb(struct netdev *netdev, if (result == NETDEV_RESULT_OK) { station_roamed(station); - station_enter_state(station, STATION_STATE_CONNECTED); - } else + station_connected(station); + } else { station_roam_failed(station); + } } static void station_netdev_event(struct netdev *netdev, enum netdev_event event, @@ -2280,7 +2287,7 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result, } network_connected(station->connected_network); - station_enter_state(station, STATION_STATE_CONNECTED); + station_connected(station); } int __station_connect_network(struct station *station, struct network *network, -- 2.13.6

The notifier allows to subscribe for the netconfig events such as ‘connected’. --- src/netconfig.c | 28 +++++++++++++++++++++------- src/netconfig.h | 11 ++++++++++- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/netconfig.c b/src/netconfig.c index 31cbeb2a..ec8d0af3 100644 --- a/src/netconfig.c +++ b/src/netconfig.c @@ -50,6 +50,9 @@ struct netconfig { uint8_t rtm_v6_protocol; const struct l_settings *active_settings; + + netconfig_notify_func_t notify; + void *user_data; }; struct netconfig_ifaddr { @@ -595,11 +598,18 @@ static void netconfig_route_add_cmd_cb(int error, uint16_t type, const void *data, uint32_t len, void *user_data) { - if (!error) - return; + struct netconfig *netconfig = user_data; - l_error("netconfig: Failed to add route. Error %d: %s", + if (error) { + l_error("netconfig: Failed to add route. Error %d: %s", error, strerror(-error)); + return; + } + + if (!netconfig->notify) + return; + + netconfig->notify(NETCONFIG_EVENT_CONNECTED, netconfig->user_data); } static void netconfig_route_del_cmd_cb(int error, uint16_t type, @@ -611,6 +621,7 @@ static void netconfig_route_del_cmd_cb(int error, uint16_t type, l_error("netconfig: Failed to delete route. Error %d: %s", error, strerror(-error)); + } static bool netconfig_ipv4_routes_install(struct netconfig *netconfig, @@ -635,7 +646,7 @@ static bool netconfig_ipv4_routes_install(struct netconfig *netconfig, ifaddr->ip, netconfig->rtm_protocol, netconfig_route_add_cmd_cb, - NULL, NULL)) { + netconfig, NULL)) { l_error("netconfig: Failed to add subnet route."); return false; @@ -655,7 +666,7 @@ static bool netconfig_ipv4_routes_install(struct netconfig *netconfig, ROUTE_PRIORITY_OFFSET, netconfig->rtm_protocol, netconfig_route_add_cmd_cb, - NULL, NULL)) { + netconfig, NULL)) { l_error("netconfig: Failed to add route for: %s gateway.", gateway); @@ -723,7 +734,7 @@ static bool netconfig_ipv6_routes_install(struct netconfig *netconfig) ROUTE_PRIORITY_OFFSET, netconfig->rtm_v6_protocol, netconfig_route_add_cmd_cb, - NULL, NULL)) { + netconfig, NULL)) { l_error("netconfig: Failed to add route for: %s gateway.", gateway); @@ -1020,9 +1031,12 @@ static void netconfig_ipv6_select_and_uninstall(struct netconfig *netconfig) bool netconfig_configure(struct netconfig *netconfig, const struct l_settings *active_settings, - const uint8_t *mac_address) + const uint8_t *mac_address, + netconfig_notify_func_t notify, void *user_data) { netconfig->active_settings = active_settings; + netconfig->notify = notify; + netconfig->user_data = user_data; l_dhcp_client_set_address(netconfig->dhcp_client, ARPHRD_ETHER, mac_address, ETH_ALEN); diff --git a/src/netconfig.h b/src/netconfig.h index cacd384a..5a527950 100644 --- a/src/netconfig.h +++ b/src/netconfig.h @@ -22,9 +22,18 @@ struct netconfig; +enum netconfig_event { + NETCONFIG_EVENT_CONNECTED, +}; + +typedef void (*netconfig_notify_func_t)(enum netconfig_event event, + void *user_data); + bool netconfig_configure(struct netconfig *netconfig, const struct l_settings *active_settings, - const uint8_t *mac_address); + const uint8_t *mac_address, + netconfig_notify_func_t notify, + void *user_data); bool netconfig_reconfigure(struct netconfig *netconfig); bool netconfig_reset(struct netconfig *netconfig); -- 2.13.6

--- src/station.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/station.c b/src/station.c index 46f2a02e..dc9ec7a1 100644 --- a/src/station.c +++ b/src/station.c @@ -1131,16 +1131,16 @@ static void station_enter_state(struct station *station, struct l_dbus *dbus = dbus_get_bus(); bool disconnected; - l_debug("Old State: %s, new state: %s", - station_state_to_string(station->state), - station_state_to_string(state)); - disconnected = !station_is_busy(station); if ((disconnected && state > STATION_STATE_AUTOCONNECT_FULL) || - (!disconnected && state != station->state)) + (!disconnected && state != station->state)) { l_dbus_property_changed(dbus, netdev_get_path(station->netdev), IWD_STATION_INTERFACE, "State"); + l_debug("Old State: %s, new state: %s", + station_state_to_string(station->state), + station_state_to_string(state)); + } switch (state) { case STATION_STATE_AUTOCONNECT_QUICK: -- 2.13.6