fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-19 08:58:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

firewall: refactor allocation of CBInfo data in NMFirewallManager

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-06-02 15:56:24 +02:00
parent dde731f0ad
commit e3605ab924
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/firewall-manager/nm-firewall-manager.c
View file

@ -70,6 +70,19 @@ cb_info_free (CBInfo *info)
g_free (info);
}
static CBInfo *
_cb_info_create (const char *iface, FwAddToZoneFunc callback, gpointer user_data)
{
CBInfo *info;
info = g_malloc0 (sizeof (CBInfo));
info->iface = g_strdup (iface);
info->callback = callback;
info->user_data = user_data;
return info;
}
static void
add_or_change_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
{
@ -113,10 +126,7 @@ nm_firewall_manager_add_or_change_zone (NMFirewallManager *self,
return NULL;
}
info = g_malloc0 (sizeof (*info));
info->iface = g_strdup (iface);
info->callback = callback;
info->user_data = user_data;
info = _cb_info_create (iface, callback, user_data);
nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone %s -> %s%s%s", iface, add ? "add" : "change",
zone?"\"":"", zone ? zone : "default", zone?"\"":"");
@ -166,8 +176,7 @@ nm_firewall_manager_remove_from_zone (NMFirewallManager *self,
return NULL;
}
info = g_malloc0 (sizeof (*info));
info->iface = g_strdup (iface);
info = _cb_info_create (iface, NULL, NULL);
nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone remove -> %s", iface, zone );
return dbus_g_proxy_begin_call_with_timeout (priv->proxy,