This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch perf/no-resize-ibar
in repository enlightenment.
View the commit online.
commit c54cc550b42d9b60c942f2acc289e25140f3284c
Author: Carsten Haitzler <[email protected]>
AuthorDate: Tue Sep 15 11:23:09 2026 +0100
networkmanager: move logging to L()
Convert INF, DBG, WRN and ERR calls to L() with an NM: prefix.
---
src/modules/networkmanager/agent.c | 2 +-
src/modules/networkmanager/e_mod_main.c | 64 +++---
src/modules/networkmanager/e_networkmanager.c | 231 +++++++++++-----------
src/modules/networkmanager/e_networkmanager_vpn.c | 76 +++----
4 files changed, 188 insertions(+), 185 deletions(-)
diff --git a/src/modules/networkmanager/agent.c b/src/modules/networkmanager/agent.c
index 2011c1434..5faa2b236 100644
--- a/src/modules/networkmanager/agent.c
+++ b/src/modules/networkmanager/agent.c
@@ -537,7 +537,7 @@ _agent_ui_request_cb(void *data EINA_UNUSED, E_NM_Agent_Request *req,
_current_dialog = _dialog_new(req, ssid);
if (!_current_dialog)
{
- ERR("Failed to create SecretAgent dialog");
+ L("NM: Failed to create SecretAgent dialog");
e_nm_agent_reply_cancel(req);
return;
}
diff --git a/src/modules/networkmanager/e_mod_main.c b/src/modules/networkmanager/e_mod_main.c
index d0df5a11a..5c9256f7b 100644
--- a/src/modules/networkmanager/e_mod_main.c
+++ b/src/modules/networkmanager/e_mod_main.c
@@ -541,7 +541,7 @@ _enm_vpn_import_done_cb(void *data, Eina_Bool ok, const char *err,
return;
}
- ERR("VPN import failed: %s", err ?: "(no output)");
+ L("NM: VPN import failed: %s", err ?: "(no output)");
err_dlg = e_dialog_new(NULL, "E", "nm_vpn_import_error");
if (!err_dlg) return;
@@ -1027,14 +1027,14 @@ _enm_item_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
* activates. Mirrors the wifi/ethernet row-tap UX. */
if (vc->active_path)
{
- INF("VPN row tapped (active): deactivating '%s'\n",
- vc->name ?: "?");
+ L("NM: VPN row tapped (active): deactivating '%s'",
+ vc->name ?: "?");
if (!selected) enm_vpn_deactivate(ctxt->nm, vc);
}
else
{
- INF("VPN row tapped (inactive): activating '%s'",
- vc->name ?: "?");
+ L("NM: VPN row tapped (inactive): activating '%s'",
+ vc->name ?: "?");
if (selected) enm_vpn_activate(ctxt->nm, vc);
}
}
@@ -1055,17 +1055,17 @@ _enm_item_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
if (nm->active_conn_type == NM_DEVICE_TYPE_BLUETOOTH &&
id->dev->state >= NM_DEVICE_STATE_ACTIVATED)
{
- INF("Disconnect bluetooth connection %s",
- id->bt->name ?: id->connection_path);
+ L("NM: Disconnect bluetooth connection %s",
+ id->bt->name ?: id->connection_path);
if (!selected) enm_ap_disconnect(nm);
}
else
{
enm_disconnect_type(nm, NM_DEVICE_TYPE_ETHERNET);
enm_disconnect_type(nm, NM_DEVICE_TYPE_WIFI);
- INF("Connect bluetooth profile %s on device %s",
- id->bt->name ?: id->connection_path,
- id->dev->interface ?: id->dev->path);
+ L("NM: Connect bluetooth profile %s on device %s",
+ id->bt->name ?: id->connection_path,
+ id->dev->interface ?: id->dev->path);
if (selected) enm_bluetooth_connect(nm, id->dev, id->connection_path);
}
return;
@@ -1078,16 +1078,16 @@ _enm_item_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
if (id->dev->state >= NM_DEVICE_STATE_ACTIVATED &&
id->dev->active_conn_path)
{
- INF("Disconnect ethernet device %s",
- id->dev->interface ?: id->dev->path);
+ L("NM: Disconnect ethernet device %s",
+ id->dev->interface ?: id->dev->path);
if (!selected) enm_disconnect_type(nm, NM_DEVICE_TYPE_ETHERNET);
}
else
{
enm_disconnect_type(nm, NM_DEVICE_TYPE_BLUETOOTH);
enm_disconnect_type(nm, NM_DEVICE_TYPE_WIFI);
- INF("Connect ethernet device %s",
- id->dev->interface ?: id->dev->path);
+ L("NM: Connect ethernet device %s",
+ id->dev->interface ?: id->dev->path);
if (selected) enm_ethernet_connect(nm, id->dev);
}
return;
@@ -1096,7 +1096,7 @@ _enm_item_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
/* If this AP's SSID is currently active, disconnect */
if (nm->active_ap_path && _enm_ssid_is_active(nm, id->ap->ssid))
{
- INF("Disconnect from %s", id->ap->ssid ?: id->ap_path);
+ L("NM: Disconnect from %s", id->ap->ssid ?: id->ap_path);
if (!selected) enm_ap_disconnect(nm);
return;
}
@@ -1111,9 +1111,9 @@ _enm_item_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
{
enm_disconnect_type(nm, NM_DEVICE_TYPE_ETHERNET);
enm_disconnect_type(nm, NM_DEVICE_TYPE_BLUETOOTH);
- INF("Connect to %s on device %s",
- id->ap->ssid ?: id->ap_path,
- dev->interface ?: dev->path);
+ L("NM: Connect to %s on device %s",
+ id->ap->ssid ?: id->ap_path,
+ dev->interface ?: dev->path);
if (selected) enm_ap_connect(nm, dev, id->ap);
return;
}
@@ -1206,7 +1206,7 @@ _enm_forget_click_cb(void *data, Evas_Object *obj EINA_UNUSED,
* fd — including its connection_path stringshare — before we use it. */
const char *conn_path = eina_stringshare_ref(fd->connection_path);
- INF("Forget connection: %s (ssid=%s)", conn_path, fd->ssid ?: "(null)");
+ L("NM: Forget connection: %s (ssid=%s)", conn_path, fd->ssid ?: "(null)");
/* Optimistic update: remove SSID from local hash immediately so the
* forget icon disappears at once without waiting for D-Bus round trips.
@@ -1248,19 +1248,19 @@ _enm_ap_end_new(struct NM_Manager *nm, struct NM_Access_Point *ap,
/* Only show forget for saved (known) networks */
if (!nm->saved_connections || !ap->ssid)
{
- DBG("forget: no hash (%p) or no ssid (%p)", nm->saved_connections, ap->ssid);
+ L("NM: forget: no hash (%p) or no ssid (%p)", nm->saved_connections, ap->ssid);
return NULL;
}
conn_path = eina_hash_find(nm->saved_connections, ap->ssid);
if (!conn_path)
{
- DBG("forget: ssid '%s' not in saved_connections hash (size=%d)",
- ap->ssid, nm->saved_connections ? eina_hash_population(nm->saved_connections) : -1);
+ L("NM: forget: ssid '%s' not in saved_connections hash (size=%d)",
+ ap->ssid, nm->saved_connections ? eina_hash_population(nm->saved_connections) : -1);
return NULL;
}
- INF("forget: creating button for ssid '%s' -> %s", ap->ssid, conn_path);
+ L("NM: forget: creating button for ssid '%s' -> %s", ap->ssid, conn_path);
fd = malloc(sizeof(*fd));
if (!fd) return NULL;
@@ -2200,7 +2200,7 @@ _enm_gadget_setup(E_NM_Instance *inst)
E_NM_Module_Context *ctxt = inst->ctxt;
Evas_Object *o = inst->ui.gadget;
- DBG("has_manager=%d", ctxt->nm != NULL);
+ L("NM: has_manager=%d", ctxt->nm != NULL);
if (!ctxt->nm)
{
@@ -2262,9 +2262,9 @@ _enm_mod_manager_update_inst(E_NM_Module_Context *ctxt EINA_UNUSED,
else
strength = active_ap ? active_ap->strength : 0;
- DBG("gadget_update: state=%d type=%s ap=%s strength=%d active_ap=%p",
- state, typestr, nm ? (nm->active_ap_path ?: "(null)") : "no-nm",
- strength, active_ap);
+ L("NM: gadget_update: state=%d type=%s ap=%s strength=%d active_ap=%p",
+ state, typestr, nm ? (nm->active_ap_path ?: "(null)") : "no-nm",
+ strength, active_ap);
theme_state = _enm_state_to_connman(state);
msg = malloc(sizeof(*msg) + sizeof(int));
@@ -2422,7 +2422,7 @@ _enm_connected(Eina_Bool online)
{
E_NM_Module_Context *ctxt = networkmanager_mod->data;
- INF("Network connected (_online_=%d)", online);
+ L("NM: Network connected (_online_=%d)", online);
if (online) enm_online_check_stop(ctxt->online_check);
else enm_online_check_start(ctxt->online_check);
}
@@ -2432,7 +2432,7 @@ _enm_disconnected(void)
{
E_NM_Module_Context *ctxt = networkmanager_mod->data;
- INF("Network disconnected");
+ L("NM: Network disconnected");
enm_online_check_stop(ctxt->online_check);
}
@@ -2516,7 +2516,7 @@ _enm_mod_manager_inout(struct NM_Manager *nm)
const Eina_List *l;
E_NM_Instance *inst;
- DBG("Manager %s", nm ? "in" : "out");
+ L("NM: Manager %s", nm ? "in" : "out");
ctxt->nm = nm;
EINA_LIST_FOREACH(ctxt->instances, l, inst)
@@ -2558,8 +2558,8 @@ _enm_vpn_emit_shield(E_NM_Module_Context *ctxt)
unsigned int n = enm_vpn_active_count(ctxt->nm);
const char *sig = n > 0 ? "e,vpn,active" : "e,vpn,inactive";
- DBG("VPN shield emit: active_count=%u -> signal='%s' (%u instances)",
- n, sig, (unsigned int)eina_list_count(ctxt->instances));
+ L("NM: VPN shield emit: active_count=%u -> signal='%s' (%u instances)",
+ n, sig, (unsigned int)eina_list_count(ctxt->instances));
E_NM_Instance *inst; Eina_List *l;
EINA_LIST_FOREACH(ctxt->instances, l, inst)
diff --git a/src/modules/networkmanager/e_networkmanager.c b/src/modules/networkmanager/e_networkmanager.c
index 2eb077c06..4c0a1e163 100644
--- a/src/modules/networkmanager/e_networkmanager.c
+++ b/src/modules/networkmanager/e_networkmanager.c
@@ -222,13 +222,13 @@ _ap_get_props_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &name, &text))
{
if (strcmp(name, ELDBUS_ERROR_PENDING_CANCELED) != 0)
- WRN("Could not get AP properties. %s: %s", name, text);
+ L("NM: Could not get AP properties. %s: %s", name, text);
return;
}
if (!eldbus_message_arguments_get(msg, "a{sv}", &array))
{
- WRN("AP GetAll: error getting arguments");
+ L("NM: AP GetAll: error getting arguments");
return;
}
@@ -284,8 +284,8 @@ _ap_get_props_cb(void *data, const Eldbus_Message *msg,
}
}
- DBG("AP %s ssid=%s strength=%d", ap->path, ap->ssid ?: "(hidden)",
- ap->strength);
+ L("NM: AP %s ssid=%s strength=%d", ap->path, ap->ssid ?: "(hidden)",
+ ap->strength);
/* Refresh gadget now that AP data (strength, security, frequency) is
* available — avoids leaving stale strength=0/no-lock state if this
@@ -589,13 +589,13 @@ _device_get_aps_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &name, &text))
{
- WRN("GetAccessPoints failed: %s: %s", name, text);
+ L("NM: GetAccessPoints failed: %s: %s", name, text);
return;
}
if (!eldbus_message_arguments_get(msg, "ao", &array))
{
- WRN("GetAccessPoints: cannot parse reply");
+ L("NM: GetAccessPoints: cannot parse reply");
return;
}
@@ -605,7 +605,7 @@ _device_get_aps_cb(void *data, const Eldbus_Message *msg,
if (!ap) continue;
dev->access_points = eina_inlist_append(dev->access_points,
EINA_INLIST_GET(ap));
- DBG("Added AP %s to device %s", ap_path, dev->path);
+ L("NM: Added AP %s to device %s", ap_path, dev->path);
}
/* Guard: nm_manager may have been freed if NM exited while GetAccessPoints
@@ -631,7 +631,7 @@ _device_ap_added(void *data, const Eldbus_Message *msg)
if (!eldbus_message_arguments_get(msg, "o", &ap_path))
return;
- DBG("AP added: %s on device %s", ap_path, dev->path);
+ L("NM: AP added: %s on device %s", ap_path, dev->path);
/* Check not already tracked */
struct NM_Access_Point *ap;
@@ -662,7 +662,7 @@ _device_ap_removed(void *data, const Eldbus_Message *msg)
if (!eldbus_message_arguments_get(msg, "o", &ap_path))
return;
- DBG("AP removed: %s on device %s", ap_path, dev->path);
+ L("NM: AP removed: %s on device %s", ap_path, dev->path);
shared = eina_stringshare_add(ap_path);
EINA_INLIST_FOREACH(dev->access_points, ap)
@@ -700,7 +700,7 @@ _device_prop_changed(void *data, const Eldbus_Message *msg)
if (eldbus_message_iter_arguments_get(var, "u", &state))
{
dev->state = state;
- DBG("Device %s state -> %u", dev->path, state);
+ L("NM: Device %s state -> %u", dev->path, state);
_notify_manager_update(nm_manager);
try_adopt = EINA_TRUE;
}
@@ -717,7 +717,7 @@ _device_prop_changed(void *data, const Eldbus_Message *msg)
{
free(dev->active_conn_path);
dev->active_conn_path = strdup(aconn_path);
- DBG("Device %s ActiveConnection -> %s", dev->path, aconn_path);
+ L("NM: Device %s ActiveConnection -> %s", dev->path, aconn_path);
}
else
{
@@ -775,8 +775,8 @@ _try_ethernet_adopt(struct NM_Device *dev)
/* First active device wins — skip if another already adopted. */
if (nm_manager->active_connection_path) return;
- DBG("Ethernet device %s adopting connection %s (state=%u)",
- dev->path, dev->active_conn_path, dev->state);
+ L("NM: Ethernet device %s adopting connection %s (state=%u)",
+ dev->path, dev->active_conn_path, dev->state);
nm_manager->probe_generation++;
_manager_active_conn_watch_free(nm_manager);
@@ -815,8 +815,8 @@ _try_wifi_adopt(struct NM_Device *dev)
/* First active device wins — skip if another already adopted. */
if (nm_manager->active_connection_path) return;
- DBG("WiFi device %s adopting conn=%s ap=%s (state=%u)",
- dev->path, dev->active_conn_path, dev->active_ap_path, dev->state);
+ L("NM: WiFi device %s adopting conn=%s ap=%s (state=%u)",
+ dev->path, dev->active_conn_path, dev->active_ap_path, dev->state);
nm_manager->probe_generation++;
_manager_active_conn_watch_free(nm_manager);
@@ -854,8 +854,8 @@ _try_bluetooth_adopt(struct NM_Device *dev)
if (nm_manager->active_connection_path) return;
- DBG("Bluetooth device %s adopting connection %s (state=%u)",
- dev->path, dev->active_conn_path, dev->state);
+ L("NM: Bluetooth device %s adopting connection %s (state=%u)",
+ dev->path, dev->active_conn_path, dev->state);
nm_manager->probe_generation++;
_manager_active_conn_watch_free(nm_manager);
@@ -913,7 +913,7 @@ _device_wifi_prop_changed(void *data, const Eldbus_Message *msg)
if (path && strcmp(path, "/") != 0)
{
dev->active_ap_path = strdup(path);
- DBG("Device %s ActiveAccessPoint -> %s", dev->path, path);
+ L("NM: Device %s ActiveAccessPoint -> %s", dev->path, path);
}
else
dev->active_ap_path = NULL;
@@ -958,13 +958,13 @@ _device_get_props_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &name, &text))
{
- WRN("Device GetAll failed: %s: %s", name, text);
+ L("NM: Device GetAll failed: %s: %s", name, text);
return;
}
if (!eldbus_message_arguments_get(msg, "a{sv}", &array))
{
- WRN("Device GetAll: cannot parse reply");
+ L("NM: Device GetAll: cannot parse reply");
return;
}
@@ -1003,7 +1003,7 @@ _device_get_props_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_iter_arguments_get(var, "u", &dtype))
{
dev->type = (enum NM_Device_Type)dtype;
- DBG("Device %s type=%u", dev->path, dtype);
+ L("NM: Device %s type=%u", dev->path, dtype);
}
}
else if (!strcmp(key, "State"))
@@ -1103,13 +1103,13 @@ _device_wifi_props_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &name, &text))
{
- WRN("Device Wireless GetAll failed: %s: %s", name, text);
+ L("NM: Device Wireless GetAll failed: %s: %s", name, text);
return;
}
if (!eldbus_message_arguments_get(msg, "a{sv}", &array))
{
- WRN("Device Wireless GetAll: cannot parse reply");
+ L("NM: Device Wireless GetAll: cannot parse reply");
return;
}
@@ -1130,8 +1130,8 @@ _device_wifi_props_cb(void *data, const Eldbus_Message *msg,
}
}
- DBG("Device %s ActiveAccessPoint=%s state=%u",
- dev->path, ap_path ?: "(none)", dev->state);
+ L("NM: Device %s ActiveAccessPoint=%s state=%u",
+ dev->path, ap_path ?: "(none)", dev->state);
/* Persist the active AP path on the device so that _try_wifi_adopt() can
* be called from multiple entry points (here, _device_wifi_prop_changed)
@@ -1298,7 +1298,7 @@ _ip4_parse_address_data(struct NM_Manager *nm, Eldbus_Message_Iter *var)
{
free(nm->ip_address);
nm->ip_address = strdup(addr);
- DBG("IP address: %s", nm->ip_address);
+ L("NM: IP address: %s", nm->ip_address);
}
}
}
@@ -1342,7 +1342,7 @@ _ip4config_get_props_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &name, &text))
{
- WRN("IP4Config GetAll failed: %s: %s", name, text);
+ L("NM: IP4Config GetAll failed: %s: %s", name, text);
return;
}
@@ -1461,7 +1461,7 @@ _active_conn_prop_changed(void *data, const Eldbus_Message *msg)
const char *ap_path;
if (eldbus_message_iter_arguments_get(var, "o", &ap_path))
{
- DBG("ActiveConn SpecificObject changed: %s", ap_path);
+ L("NM: ActiveConn SpecificObject changed: %s", ap_path);
eina_stringshare_replace(&nm->active_ap_path,
(ap_path && strcmp(ap_path, "/"))
? ap_path : NULL);
@@ -1519,22 +1519,22 @@ _active_conn_probe_cb(void *data, const Eldbus_Message *msg,
/* Discard stale probes that were superseded by a newer batch */
if (probe->generation != nm->probe_generation)
{
- DBG("Discarding stale probe (gen %u vs current %u) path=%s",
- probe->generation, nm->probe_generation, probe->path ?: "?");
+ L("NM: Discarding stale probe (gen %u vs current %u) path=%s",
+ probe->generation, nm->probe_generation, probe->path ?: "?");
_active_conn_probe_free(probe);
return;
}
if (eldbus_message_error_get(msg, &name, &text))
{
- WRN("ActiveConnection GetAll failed: %s: %s", name, text);
+ L("NM: ActiveConnection GetAll failed: %s: %s", name, text);
_active_conn_probe_free(probe);
return;
}
if (!eldbus_message_arguments_get(msg, "a{sv}", &array))
{
- WRN("ActiveConnection GetAll: cannot parse a{sv}");
+ L("NM: ActiveConnection GetAll: cannot parse a{sv}");
_active_conn_probe_free(probe);
return;
}
@@ -1566,14 +1566,14 @@ _active_conn_probe_cb(void *data, const Eldbus_Message *msg,
conn_type != NM_DEVICE_TYPE_ETHERNET &&
conn_type != NM_DEVICE_TYPE_BLUETOOTH)
{
- DBG("ActiveConn type=%s (%d) — skipping", type_str ?: "?", conn_type);
+ L("NM: ActiveConn type=%s (%d) — skipping", type_str ?: "?", conn_type);
_active_conn_probe_free(probe);
return;
}
/* This is a useful connection — promote probe to persistent watcher */
- DBG("ActiveConn type=%s (%d) — adopting path=%s",
- type_str ?: "?", conn_type, probe->path);
+ L("NM: ActiveConn type=%s (%d) — adopting path=%s",
+ type_str ?: "?", conn_type, probe->path);
/* Tear down any previous persistent watcher */
_manager_active_conn_watch_free(nm);
@@ -1613,7 +1613,7 @@ _manager_probe_active_conn(struct NM_Manager *nm,
{
struct _Active_Conn_Probe *probe;
- DBG("_manager_probe_active_conn path=%s", active_conn_path ?: "(null)");
+ L("NM: _manager_probe_active_conn path=%s", active_conn_path ?: "(null)");
if (!active_conn_path || !strcmp(active_conn_path, "/")) return;
/* Skip if already watching this exact connection */
@@ -1678,24 +1678,24 @@ _enm_vpn_resolve_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &err_name, &err_msg))
{
- DBG("VPN resolve Connection: %s %s", err_name ?: "", err_msg ?: "");
+ L("NM: VPN resolve Connection: %s %s", err_name ?: "", err_msg ?: "");
goto out;
}
if (!eldbus_message_arguments_get(msg, "v", &var)) goto out;
if (!eldbus_message_iter_arguments_get(var, "o", &settings_path)) goto out;
- DBG("VPN resolve: active_path=%s -> settings_path=%s",
- ctx->active_path ?: "?", settings_path ?: "?");
+ L("NM: VPN resolve: active_path=%s -> settings_path=%s",
+ ctx->active_path ?: "?", settings_path ?: "?");
vc = enm_vpn_find_by_path(ctx->nm, settings_path);
if (vc)
{
- DBG("VPN resolve: binding vc='%s' to active=%s",
- vc->name ?: "?", ctx->active_path);
+ L("NM: VPN resolve: binding vc='%s' to active=%s",
+ vc->name ?: "?", ctx->active_path);
enm_vpn_active_bind(vc, ctx->active_path);
}
else
- DBG("VPN resolve: no vc matches settings path %s", settings_path);
+ L("NM: VPN resolve: no vc matches settings path %s", settings_path);
out:
eldbus_proxy_unref(ctx->proxy);
@@ -1807,8 +1807,8 @@ _manager_prop_changed(void *data, const Eldbus_Message *msg)
if (eldbus_message_iter_arguments_get(var, "u", &state))
{
nm->state = (enum NM_State)state;
- DBG("NM state changed: %u (%s)", state,
- enm_state_to_str(nm->state));
+ L("NM: NM state changed: %u (%s)", state,
+ enm_state_to_str(nm->state));
_notify_manager_update(nm);
}
}
@@ -1903,13 +1903,13 @@ _manager_get_props_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &name, &text))
{
- WRN("NM GetAll failed: %s: %s", name, text);
+ L("NM: NM GetAll failed: %s: %s", name, text);
return;
}
if (!eldbus_message_arguments_get(msg, "a{sv}", &array))
{
- WRN("NM GetAll: cannot parse reply");
+ L("NM: NM GetAll: cannot parse reply");
return;
}
@@ -1940,7 +1940,7 @@ _manager_get_props_cb(void *data, const Eldbus_Message *msg,
if (!eldbus_message_iter_arguments_get(var, "ao", &conn_array))
{
- WRN("ActiveConnections: cannot parse ao from variant");
+ L("NM: ActiveConnections: cannot parse ao from variant");
continue;
}
@@ -1956,8 +1956,8 @@ _manager_get_props_cb(void *data, const Eldbus_Message *msg,
* re-run reconcile once the final GetSettings reply arrives. */
while (eldbus_message_iter_get_and_next(conn_array, 'o', &aconn_path))
{
- DBG("ActiveConnections (startup): cached path=%s",
- aconn_path);
+ L("NM: ActiveConnections (startup): cached path=%s",
+ aconn_path);
nm->vpn_pending_active_paths =
eina_list_append(nm->vpn_pending_active_paths,
(void *)eina_stringshare_add(aconn_path));
@@ -1965,8 +1965,8 @@ _manager_get_props_cb(void *data, const Eldbus_Message *msg,
}
}
- DBG("manager_get_props done: state=%d active_ap=%s conn_type=%d",
- nm->state, nm->active_ap_path ?: "(null)", nm->active_conn_type);
+ L("NM: manager_get_props done: state=%d active_ap=%s conn_type=%d",
+ nm->state, nm->active_ap_path ?: "(null)", nm->active_conn_type);
/* Always update the UI now so that disconnected/VPN-only/unassociated
* states are shown immediately. Device callbacks will call
@@ -1994,13 +1994,13 @@ _manager_get_devices_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &name, &text))
{
- WRN("GetDevices failed: %s: %s", name, text);
+ L("NM: GetDevices failed: %s: %s", name, text);
return;
}
if (!eldbus_message_arguments_get(msg, "ao", &array))
{
- WRN("GetDevices: cannot parse reply");
+ L("NM: GetDevices: cannot parse reply");
return;
}
@@ -2009,7 +2009,7 @@ _manager_get_devices_cb(void *data, const Eldbus_Message *msg,
struct NM_Device *dev = _device_new(dev_path);
if (!dev) continue;
nm->devices = eina_inlist_append(nm->devices, EINA_INLIST_GET(dev));
- DBG("Added device %s", dev_path);
+ L("NM: Added device %s", dev_path);
}
}
@@ -2024,7 +2024,7 @@ _manager_device_added(void *data, const Eldbus_Message *msg)
if (!eldbus_message_arguments_get(msg, "o", &dev_path))
return;
- DBG("Device added: %s", dev_path);
+ L("NM: Device added: %s", dev_path);
shared = eina_stringshare_add(dev_path);
EINA_INLIST_FOREACH(nm->devices, dev)
@@ -2051,7 +2051,7 @@ _manager_device_removed(void *data, const Eldbus_Message *msg)
if (!eldbus_message_arguments_get(msg, "o", &dev_path))
return;
- DBG("Device removed: %s", dev_path);
+ L("NM: Device removed: %s", dev_path);
shared = eina_stringshare_add(dev_path);
EINA_INLIST_FOREACH(nm->devices, dev)
@@ -2097,8 +2097,8 @@ _saved_conn_settings_cb(void *data, const Eldbus_Message *msg,
* this D-Bus call was in flight — avoids writing to freed/stale state. */
if (ctx->generation != ctx->nm->saved_conn_generation)
{
- DBG("_saved_conn_settings_cb: stale generation %u vs %u, discarding",
- ctx->generation, ctx->nm->saved_conn_generation);
+ L("NM: _saved_conn_settings_cb: stale generation %u vs %u, discarding",
+ ctx->generation, ctx->nm->saved_conn_generation);
goto done;
}
@@ -2106,13 +2106,13 @@ _saved_conn_settings_cb(void *data, const Eldbus_Message *msg,
const char *err_name = NULL, *err_msg = NULL;
if (eldbus_message_error_get(msg, &err_name, &err_msg))
{
- ERR("GetSettings failed: %s %s", err_name ?: "", err_msg ?: "");
+ L("NM: GetSettings failed: %s %s", err_name ?: "", err_msg ?: "");
goto done;
}
}
if (!eldbus_message_arguments_get(msg, "a{sa{sv}}", &settings))
{
- ERR("GetSettings: failed to parse reply arguments");
+ L("NM: GetSettings: failed to parse reply arguments");
goto done;
}
@@ -2181,14 +2181,14 @@ _saved_conn_settings_cb(void *data, const Eldbus_Message *msg,
eina_hash_del_by_key(ctx->nm->saved_connections, ssid_str);
eina_hash_add(ctx->nm->saved_connections, ssid_str,
eina_stringshare_add(ctx->path));
- INF("saved_conn: added '%s' -> %s", ssid_str, ctx->path);
+ L("NM: saved_conn: added '%s' -> %s", ssid_str, ctx->path);
}
else if (conn_type && !strcmp(conn_type, "bluetooth"))
{
_nm_bluetooth_connection_add(ctx->nm, ctx->path,
conn_name ?: _("Bluetooth"),
bt_addr);
- INF("saved_bt_conn: added '%s' (%s) -> %s",
+ L("NM: saved_bt_conn: added '%s' (%s) -> %s",
conn_name ?: _("Bluetooth"), bt_addr ?: "?", ctx->path);
}
else if (conn_type && !strcmp(conn_type, "802-3-ethernet"))
@@ -2196,7 +2196,7 @@ _saved_conn_settings_cb(void *data, const Eldbus_Message *msg,
_nm_wired_connection_add(ctx->nm, ctx->path,
conn_name ?: _("Wired"),
conn_iface, eth_addr);
- INF("saved_eth_conn: added '%s' (%s/%s) -> %s",
+ L("NM: saved_eth_conn: added '%s' (%s/%s) -> %s",
conn_name ?: _("Wired"), conn_iface ?: "?",
eth_addr ?: "?", ctx->path);
}
@@ -2241,8 +2241,8 @@ _saved_conn_list_cb(void *data, const Eldbus_Message *msg,
/* Bail out if a newer batch was started or manager was freed. */
if (generation != nm->saved_conn_generation)
{
- DBG("_saved_conn_list_cb: stale generation %u vs %u, discarding",
- generation, nm->saved_conn_generation);
+ L("NM: _saved_conn_list_cb: stale generation %u vs %u, discarding",
+ generation, nm->saved_conn_generation);
return;
}
@@ -2250,13 +2250,13 @@ _saved_conn_list_cb(void *data, const Eldbus_Message *msg,
const char *err_name = NULL, *err_msg = NULL;
if (eldbus_message_error_get(msg, &err_name, &err_msg))
{
- ERR("ListConnections failed: %s %s", err_name ?: "", err_msg ?: "");
+ L("NM: ListConnections failed: %s %s", err_name ?: "", err_msg ?: "");
return;
}
}
if (!eldbus_message_arguments_get(msg, "ao", &conn_array))
{
- ERR("ListConnections: failed to parse reply");
+ L("NM: ListConnections: failed to parse reply");
return;
}
@@ -2336,8 +2336,8 @@ _connection_delete_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &err_name, &err_msg))
{
- ERR("Failed to delete connection %s: %s %s",
- ctx->path, err_name, err_msg);
+ L("NM: Failed to delete connection %s: %s %s",
+ ctx->path, err_name, err_msg);
/* Recover: the optimistic UI removal already hid the forget button.
* Refresh saved_connections so the button reappears if the delete
* failed (e.g. stale connection path). */
@@ -2345,8 +2345,8 @@ _connection_delete_cb(void *data, const Eldbus_Message *msg,
goto done;
}
- INF("Connection %s deleted successfully — awaiting ConnectionRemoved signal",
- ctx->path);
+ L("NM: Connection %s deleted successfully — awaiting ConnectionRemoved signal",
+ ctx->path);
/* Do NOT call enm_saved_connections_get here: NM may not have removed the
* connection from its internal list yet, so ListConnections would still
* return the deleted path and the SSID would be re-added to the hash.
@@ -2400,13 +2400,13 @@ _settings_conn_removed_cb(void *data, const Eldbus_Message *msg)
if (eldbus_message_arguments_get(msg, "o", &path) && path)
{
- INF("ConnectionRemoved signal for %s", path);
+ L("NM: ConnectionRemoved signal for %s", path);
enm_vpn_remove_by_path(nm, path);
}
else
{
/* No path in the signal — fall back to a full re-enumerate. */
- WRN("ConnectionRemoved without object path; full re-enumerate");
+ L("NM: ConnectionRemoved without object path; full re-enumerate");
enm_vpn_enumerate(nm);
}
}
@@ -2425,12 +2425,12 @@ _settings_conn_added_cb(void *data, const Eldbus_Message *msg)
if (eldbus_message_arguments_get(msg, "o", &path) && path)
{
- INF("NewConnection signal for %s", path);
+ L("NM: NewConnection signal for %s", path);
enm_vpn_settings_fetch_one(nm, path);
}
else
{
- WRN("NewConnection without object path; full re-enumerate");
+ L("NM: NewConnection without object path; full re-enumerate");
enm_vpn_enumerate(nm);
}
}
@@ -2646,9 +2646,9 @@ _activate_cb(void *data, const Eldbus_Message *msg,
const char *name, *text;
if (eldbus_message_error_get(msg, &name, &text))
- ERR("ActivateConnection failed: %s: %s", name, text);
+ L("NM: ActivateConnection failed: %s: %s", name, text);
else
- INF("ActivateConnection succeeded");
+ L("NM: ActivateConnection succeeded");
free(cd);
}
@@ -2661,9 +2661,9 @@ _add_activate_cb(void *data, const Eldbus_Message *msg,
const char *name, *text;
if (eldbus_message_error_get(msg, &name, &text))
- ERR("AddAndActivateConnection failed: %s: %s", name, text);
+ L("NM: AddAndActivateConnection failed: %s: %s", name, text);
else
- INF("AddAndActivateConnection succeeded");
+ L("NM: AddAndActivateConnection succeeded");
free(cd);
}
@@ -2692,8 +2692,8 @@ enm_ap_connect(struct NM_Manager *nm, struct NM_Device *dev,
if (conn_path)
{
/* Known saved profile — activate it directly */
- INF("ActivateConnection: saved profile %s for ssid=%s",
- conn_path, ap->ssid);
+ L("NM: ActivateConnection: saved profile %s for ssid=%s",
+ conn_path, ap->ssid);
eldbus_proxy_call(nm->proxy, "ActivateConnection",
_activate_cb, cd, NM_CONNECTION_TIMEOUT,
"ooo", conn_path, dev->path, ap->path);
@@ -2705,8 +2705,8 @@ enm_ap_connect(struct NM_Manager *nm, struct NM_Device *dev,
Eldbus_Message *msg_call;
Eldbus_Message_Iter *iter, *empty_dict;
- INF("AddAndActivateConnection: no saved profile for ssid=%s",
- ap->ssid ?: "(null)");
+ L("NM: AddAndActivateConnection: no saved profile for ssid=%s",
+ ap->ssid ?: "(null)");
msg_call = eldbus_proxy_method_call_new(nm->proxy,
"AddAndActivateConnection");
@@ -2728,9 +2728,9 @@ _deactivate_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
const char *name, *text;
if (eldbus_message_error_get(msg, &name, &text))
- ERR("DeactivateConnection failed: %s: %s", name, text);
+ L("NM: DeactivateConnection failed: %s: %s", name, text);
else
- INF("DeactivateConnection succeeded");
+ L("NM: DeactivateConnection succeeded");
}
static void
@@ -2741,7 +2741,7 @@ _enm_connection_deactivate(struct NM_Manager *nm, const char *connection_path)
if (!strcmp(connection_path, "/"))
{
- WRN("Refusing to disconnect null connection path");
+ L("NM: Refusing to disconnect null connection path");
return;
}
@@ -2758,7 +2758,7 @@ enm_ap_disconnect(struct NM_Manager *nm)
if (!nm->active_connection_path ||
!strcmp(nm->active_connection_path, "/"))
{
- WRN("No active connection to disconnect");
+ L("NM: No active connection to disconnect");
return;
}
@@ -2779,10 +2779,10 @@ enm_disconnect_type(struct NM_Manager *nm, enum NM_Device_Type type)
if (dev->state < 100) continue;
if (!dev->active_conn_path) continue;
- INF("Disconnect %s connection on device %s (%s)",
- enm_device_type_to_str(type),
- dev->interface ?: dev->path,
- dev->active_conn_path);
+ L("NM: Disconnect %s connection on device %s (%s)",
+ enm_device_type_to_str(type),
+ dev->interface ?: dev->path,
+ dev->active_conn_path);
_enm_connection_deactivate(nm, dev->active_conn_path);
disconnected = EINA_TRUE;
}
@@ -2793,9 +2793,9 @@ enm_disconnect_type(struct NM_Manager *nm, enum NM_Device_Type type)
nm->active_connection_path &&
strcmp(nm->active_connection_path, "/"))
{
- INF("Disconnect primary %s connection %s",
- enm_device_type_to_str(type),
- nm->active_connection_path);
+ L("NM: Disconnect primary %s connection %s",
+ enm_device_type_to_str(type),
+ nm->active_connection_path);
_enm_connection_deactivate(nm, nm->active_connection_path);
}
}
@@ -2816,8 +2816,8 @@ enm_bluetooth_connect(struct NM_Manager *nm, struct NM_Device *dev,
cd->nm = nm;
cd->dev = dev;
- INF("ActivateConnection: bluetooth profile %s on device %s",
- connection_path, dev->path);
+ L("NM: ActivateConnection: bluetooth profile %s on device %s",
+ connection_path, dev->path);
eldbus_proxy_call(nm->proxy, "ActivateConnection",
_activate_cb, cd, NM_CONNECTION_TIMEOUT,
"ooo", connection_path, dev->path, "/");
@@ -2841,8 +2841,8 @@ enm_ethernet_connect(struct NM_Manager *nm, struct NM_Device *dev)
if (wc && wc->path)
{
- INF("ActivateConnection: ethernet profile %s on device %s",
- wc->path, dev->path);
+ L("NM: ActivateConnection: ethernet profile %s on device %s",
+ wc->path, dev->path);
eldbus_proxy_call(nm->proxy, "ActivateConnection",
_activate_cb, cd, NM_CONNECTION_TIMEOUT,
"ooo", wc->path, dev->path, "/");
@@ -2853,8 +2853,8 @@ enm_ethernet_connect(struct NM_Manager *nm, struct NM_Device *dev)
Eldbus_Message *msg_call;
Eldbus_Message_Iter *iter, *empty_dict;
- INF("AddAndActivateConnection: no saved ethernet profile for device %s",
- dev->path);
+ L("NM: AddAndActivateConnection: no saved ethernet profile for device %s",
+ dev->path);
msg_call = eldbus_proxy_method_call_new(nm->proxy,
"AddAndActivateConnection");
@@ -3573,12 +3573,12 @@ _agent_get_secrets(const Eldbus_Service_Interface *iface,
&conn_props, &conn_path,
&setting_name, &hints, &flags))
{
- WRN("GetSecrets: cannot parse arguments");
+ L("NM: GetSecrets: cannot parse arguments");
return eldbus_message_method_return_new(msg);
}
- DBG("GetSecrets for %s setting=%s flags=%u",
- conn_path, setting_name, flags);
+ L("NM: GetSecrets for %s setting=%s flags=%u",
+ conn_path, setting_name, flags);
/* Only extract the SSID for wifi requests — _agent_ssid_extract walks
* conn_props with a forward-only iterator that we cannot reset, and the
@@ -3615,7 +3615,7 @@ _agent_get_secrets(const Eldbus_Service_Interface *iface,
(!is_challenge &&
!_agent_vpn_fields_add_defaults(&info, &fields)))
{
- WRN("GetSecrets: failed to build VPN secret request");
+ L("NM: GetSecrets: failed to build VPN secret request");
e_nm_agent_reply_cancel(req);
_agent_vpn_field_list_clear(&fields);
_agent_vpn_conn_info_clear(&info);
@@ -3624,7 +3624,7 @@ _agent_get_secrets(const Eldbus_Service_Interface *iface,
if (fields.len == 0)
{
- WRN("GetSecrets: no VPN secrets requested by hints or flags");
+ L("NM: GetSecrets: no VPN secrets requested by hints or flags");
e_nm_agent_reply_cancel(req);
_agent_vpn_field_list_clear(&fields);
_agent_vpn_conn_info_clear(&info);
@@ -3641,7 +3641,7 @@ _agent_get_secrets(const Eldbus_Service_Interface *iface,
}
else
{
- WRN("No VPN SecretAgent UI callback; cancelling");
+ L("NM: No VPN SecretAgent UI callback; cancelling");
e_nm_agent_reply_cancel(req);
}
@@ -3653,11 +3653,14 @@ _agent_get_secrets(const Eldbus_Service_Interface *iface,
if (_agent_cbs.request)
_agent_cbs.request(_agent_cb_data, req, ssid[0] ? ssid : NULL);
else
- { WRN("No SecretAgent UI cb"); e_nm_agent_reply_cancel(req); }
+ {
+ L("NM: No SecretAgent UI cb");
+ e_nm_agent_reply_cancel(req);
+ }
}
else
{
- WRN("Unhandled secret setting %s; cancelling", setting_name);
+ L("NM: Unhandled secret setting %s; cancelling", setting_name);
e_nm_agent_reply_cancel(req);
}
@@ -3673,12 +3676,12 @@ _agent_cancel_get_secrets(const Eldbus_Service_Interface *iface,
Eina_List *l, *ln;
E_NM_Agent_Request *req;
- DBG("CancelGetSecrets");
+ L("NM: CancelGetSecrets");
if (!eldbus_message_arguments_get(msg, "os",
&cancel_path, &cancel_setting))
{
- WRN("CancelGetSecrets: cannot parse arguments");
+ L("NM: CancelGetSecrets: cannot parse arguments");
return eldbus_message_method_return_new(msg);
}
@@ -3759,9 +3762,9 @@ _agent_register_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
const char *name, *text;
if (eldbus_message_error_get(msg, &name, &text))
- WRN("SecretAgent Register failed: %s: %s", name, text);
+ L("NM: SecretAgent Register failed: %s: %s", name, text);
else
- INF("SecretAgent registered with NetworkManager");
+ L("NM: SecretAgent registered with NetworkManager");
}
static E_NM_Agent *
@@ -3779,7 +3782,7 @@ _e_nm_agent_new(Eldbus_Connection *eldbus_conn)
&_agent_desc);
if (!iface)
{
- ERR("Failed to register SecretAgent D-Bus interface");
+ L("NM: Failed to register SecretAgent D-Bus interface");
free(a);
return NULL;
}
@@ -3875,7 +3878,7 @@ e_nm_system_shutdown(void)
{
if (init_count == 0)
{
- ERR("networkmanager system already shut down.");
+ L("NM: networkmanager system already shut down.");
return 0;
}
diff --git a/src/modules/networkmanager/e_networkmanager_vpn.c b/src/modules/networkmanager/e_networkmanager_vpn.c
index e2bc007cc..2611fdb85 100644
--- a/src/modules/networkmanager/e_networkmanager_vpn.c
+++ b/src/modules/networkmanager/e_networkmanager_vpn.c
@@ -72,13 +72,13 @@ _vpn_get_settings_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &err_name, &err_msg))
{
- ERR("VPN GetSettings failed for %s: %s %s",
- ctx->path, err_name ?: "", err_msg ?: "");
+ L("NM: VPN GetSettings failed for %s: %s %s",
+ ctx->path, err_name ?: "", err_msg ?: "");
goto out;
}
if (!eldbus_message_arguments_get(msg, "a{sa{sv}}", &settings))
{
- ERR("VPN GetSettings: cannot parse reply for %s", ctx->path);
+ L("NM: VPN GetSettings: cannot parse reply for %s", ctx->path);
goto out;
}
@@ -165,9 +165,9 @@ _vpn_get_settings_cb(void *data, const Eldbus_Message *msg,
eina_inlist_append(ctx->nm->vpn_connections, EINA_INLIST_GET(vc));
}
- DBG("Found VPN connection: %s (%s/%s)",
- vc->name ?: "(unnamed)", vc->conn_type,
- vc->service_type ?: "-");
+ L("NM: Found VPN connection: %s (%s/%s)",
+ vc->name ?: "(unnamed)", vc->conn_type,
+ vc->service_type ?: "-");
}
out:
@@ -195,9 +195,9 @@ out:
if (ctx->nm->vpn_pending == 0)
{
- DBG("VPN enumeration terminal: vpn_connections=%u, cached active paths=%u",
- eina_inlist_count(ctx->nm->vpn_connections),
- (unsigned int)eina_list_count(ctx->nm->vpn_pending_active_paths));
+ L("NM: VPN enumeration terminal: vpn_connections=%u, cached active paths=%u",
+ eina_inlist_count(ctx->nm->vpn_connections),
+ (unsigned int)eina_list_count(ctx->nm->vpn_pending_active_paths));
/* Re-run VPN active reconcile for paths that were seen at startup
* (cached in vpn_pending_active_paths) before vpn_connections was
@@ -249,13 +249,13 @@ _vpn_list_cb(void *data, const Eldbus_Message *msg,
if (eldbus_message_error_get(msg, &err_name, &err_msg))
{
- ERR("VPN ListConnections failed: %s %s",
- err_name ?: "", err_msg ?: "");
+ L("NM: VPN ListConnections failed: %s %s",
+ err_name ?: "", err_msg ?: "");
return;
}
if (!eldbus_message_arguments_get(msg, "ao", &array))
{
- ERR("VPN ListConnections: cannot parse reply");
+ L("NM: VPN ListConnections: cannot parse reply");
return;
}
@@ -404,8 +404,8 @@ enm_vpn_enumerate(struct NM_Manager *nm)
if (!nm || !nm->settings_proxy) return;
- DBG("enm_vpn_enumerate called (cache has %u active paths)",
- (unsigned int)eina_list_count(nm->vpn_pending_active_paths));
+ L("NM: enm_vpn_enumerate called (cache has %u active paths)",
+ (unsigned int)eina_list_count(nm->vpn_pending_active_paths));
/* Bump generation so any in-flight reply from the previous call is
* recognised as stale in its callback. */
@@ -507,8 +507,8 @@ _vpn_delete_cb(void *data, const Eldbus_Message *msg,
const char *err_name, *err_msg;
if (eldbus_message_error_get(msg, &err_name, &err_msg))
- ERR("VPN Delete failed for %s: %s %s",
- ctx->path, err_name ?: "", err_msg ?: "");
+ L("NM: VPN Delete failed for %s: %s %s",
+ ctx->path, err_name ?: "", err_msg ?: "");
/* On success NM emits ConnectionRemoved, which triggers enm_vpn_enumerate
* via _settings_conn_removed_cb — no further action needed here. */
@@ -654,8 +654,8 @@ _autoconn_del_cb(void *data, int type EINA_UNUSED, void *event)
stderr_text = ctx->stderr_buf ? eina_strbuf_string_get(ctx->stderr_buf) : "";
if (!(ev->exited && (ev->exit_code == 0)))
{
- ERR("nmcli autoconnect modify failed for %s: %s",
- ctx->uuid ?: "?", stderr_text ?: "");
+ L("NM: nmcli autoconnect modify failed for %s: %s",
+ ctx->uuid ?: "?", stderr_text ?: "");
}
else
{
@@ -683,7 +683,7 @@ enm_vpn_set_autoconnect(struct NM_Manager *nm,
nmcli = enm_import_nmcli_path();
if (!nmcli)
{
- ERR("enm_vpn_set_autoconnect: nmcli not found on PATH");
+ L("NM: enm_vpn_set_autoconnect: nmcli not found on PATH");
return;
}
@@ -725,7 +725,7 @@ enm_vpn_set_autoconnect(struct NM_Manager *nm,
ctx);
if (!ctx->exe)
{
- ERR("enm_vpn_set_autoconnect: failed to spawn nmcli");
+ L("NM: enm_vpn_set_autoconnect: failed to spawn nmcli");
nm->vpn_pending_autoconn =
eina_list_remove(nm->vpn_pending_autoconn, ctx);
_autoconn_ctx_free(ctx);
@@ -850,8 +850,8 @@ _vpn_ip4_get_all_cb(void *data, const Eldbus_Message *msg,
if (err_name &&
strcmp(err_name, ELDBUS_ERROR_PENDING_CANCELED) != 0 &&
strcmp(err_name, "org.freedesktop.DBus.Error.NoReply") != 0)
- WRN("Ip4Config GetAll failed for VPN '%s': %s %s",
- vc->name ?: "?", err_name ?: "", err_msg ?: "");
+ L("NM: Ip4Config GetAll failed for VPN '%s': %s %s",
+ vc->name ?: "?", err_name ?: "", err_msg ?: "");
return;
}
if (!eldbus_message_arguments_get(msg, "a{sv}", &props)) return;
@@ -893,8 +893,8 @@ _vpn_ip4_get_all_cb(void *data, const Eldbus_Message *msg,
{
free(vc->ip_address);
vc->ip_address = found_addr;
- DBG("VPN '%s' got IP address %s", vc->name ?: "?",
- vc->ip_address ?: "(none)");
+ L("NM: VPN '%s' got IP address %s", vc->name ?: "?",
+ vc->ip_address ?: "(none)");
break; /* first entry is sufficient */
}
}
@@ -976,7 +976,7 @@ _vpn_bind_ip4(struct NM_VPN_Connection *vc, const char *ip4_path)
_vpn_ip4_get_all_cb, vc, -1,
"s", NM_IFACE_IP4CONFIG);
- DBG("VPN '%s' bound Ip4Config path=%s", vc->name ?: "?", ip4_path);
+ L("NM: VPN '%s' bound Ip4Config path=%s", vc->name ?: "?", ip4_path);
}
static void
@@ -987,22 +987,22 @@ _vpn_active_props_get_cb(void *data, const Eldbus_Message *msg,
Eldbus_Message_Iter *dict, *entry, *var;
const char *err_name, *err_msg, *key;
- DBG("VPN active props cb fired for vc='%s'", vc->name ?: "?");
+ L("NM: VPN active props cb fired for vc='%s'", vc->name ?: "?");
vc->pending_get_props = NULL;
if (eldbus_message_error_get(msg, &err_name, &err_msg))
{
- ERR("VPN active props cb: error '%s' / '%s' — bailing",
- err_name ?: "(null)", err_msg ?: "(null)");
+ L("NM: VPN active props cb: error '%s' / '%s' — bailing",
+ err_name ?: "(null)", err_msg ?: "(null)");
return;
}
if (!eldbus_message_arguments_get(msg, "a{sv}", &dict))
{
- ERR("VPN active props cb: failed to parse reply as a{sv} — bailing");
+ L("NM: VPN active props cb: failed to parse reply as a{sv} — bailing");
return;
}
- DBG("VPN active props cb: reply parsed, iterating dict");
+ L("NM: VPN active props cb: reply parsed, iterating dict");
{
/* Two-pass: first collect Ip4Config path so we can bind after state. */
@@ -1047,8 +1047,8 @@ _vpn_active_props_get_cb(void *data, const Eldbus_Message *msg,
}
}
- DBG("VPN '%s' state -> %u (prev %u)",
- vc->name ?: "?", vc->vpn_state, vc->prev_state);
+ L("NM: VPN '%s' state -> %u (prev %u)",
+ vc->name ?: "?", vc->vpn_state, vc->prev_state);
/* Initial GetAll is informational, not a transition. Sync prev_state so
* a pre-existing FAILED state at startup does not trigger a notification
@@ -1087,8 +1087,8 @@ _vpn_active_prop_changed(void *data, const Eldbus_Message *msg)
* first (e.g. Ip4Config). */
vc->prev_state = vc->vpn_state;
vc->vpn_state = (enum NM_VPN_State)s;
- DBG("VPN '%s' state -> %u (prev %u)",
- vc->name ?: "?", vc->vpn_state, vc->prev_state);
+ L("NM: VPN '%s' state -> %u (prev %u)",
+ vc->name ?: "?", vc->vpn_state, vc->prev_state);
}
}
else if (!strcmp(key, "State") &&
@@ -1099,8 +1099,8 @@ _vpn_active_prop_changed(void *data, const Eldbus_Message *msg)
{
vc->prev_state = vc->vpn_state;
vc->vpn_state = _wg_state_to_vpn_state(s);
- DBG("VPN '%s' state -> %u (prev %u)",
- vc->name ?: "?", vc->vpn_state, vc->prev_state);
+ L("NM: VPN '%s' state -> %u (prev %u)",
+ vc->name ?: "?", vc->vpn_state, vc->prev_state);
}
}
else if (!strcmp(key, "Reason"))
@@ -1182,8 +1182,8 @@ enm_vpn_active_bind(struct NM_VPN_Connection *vc, const char *active_path)
_vpn_active_props_get_cb, vc, -1,
"s", iface);
- DBG("VPN '%s' bound to active_path=%s (iface=%s) pending=%p",
- vc->name ?: "?", active_path, iface, vc->pending_get_props);
+ L("NM: VPN '%s' bound to active_path=%s (iface=%s) pending=%p",
+ vc->name ?: "?", active_path, iface, vc->pending_get_props);
}
void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
