diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-11-12 15:27:35 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-11-13 15:05:25 +0100 |
| commit | f8f0893375a8f3133a4ec30710912f9e9b977886 (patch) | |
| tree | 8504727ed7a7f571f47bd9875f66050ef6ea4bd0 | |
| parent | 16030b29e4a8d4807471dcd4e61068b48a329e8d (diff) | |
| download | NetworkManager-f8f0893375a8f3133a4ec30710912f9e9b977886.tar.gz | |
firewall: make call handle an opaque pointer type
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/nm-firewall-manager.c | 42 | ||||
| -rw-r--r-- | src/nm-firewall-manager.h | 25 |
3 files changed, 36 insertions, 33 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 263e1f64d3..6387e359dc 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -259,7 +259,7 @@ typedef struct { gulong dnsmasq_state_id; /* Firewall */ - DBusGProxyCall *fw_call; + NMFirewallPendingCall fw_call; /* avahi-autoipd stuff */ GPid aipd_pid; diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 7a81731d84..bed77f40fb 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -125,7 +125,7 @@ add_or_change_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data g_clear_error (&error); } -gpointer +NMFirewallPendingCall nm_firewall_manager_add_or_change_zone (NMFirewallManager *self, const char *iface, const char *zone, @@ -147,15 +147,15 @@ nm_firewall_manager_add_or_change_zone (NMFirewallManager *self, nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone %s -> %s%s%s [%u]", iface, add ? "add" : "change", zone?"\"":"", zone ? zone : "default", zone?"\"":"", info->id); - return dbus_g_proxy_begin_call_with_timeout (priv->proxy, - add ? "addInterface" : "changeZone", - add_or_change_cb, - info, - (GDestroyNotify) cb_info_free, - 10000, /* timeout */ - G_TYPE_STRING, zone ? zone : "", - G_TYPE_STRING, iface, - G_TYPE_INVALID); + return (NMFirewallPendingCall) dbus_g_proxy_begin_call_with_timeout (priv->proxy, + add ? "addInterface" : "changeZone", + add_or_change_cb, + info, + (GDestroyNotify) cb_info_free, + 10000, /* timeout */ + G_TYPE_STRING, zone ? zone : "", + G_TYPE_STRING, iface, + G_TYPE_INVALID); } static void @@ -187,7 +187,7 @@ remove_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data) g_clear_error (&error); } -gpointer +NMFirewallPendingCall nm_firewall_manager_remove_from_zone (NMFirewallManager *self, const char *iface, const char *zone) @@ -204,18 +204,18 @@ nm_firewall_manager_remove_from_zone (NMFirewallManager *self, nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone remove -> %s%s%s [%u]", iface, zone?"\"":"", zone ? zone : "*", zone?"\"":"", info->id); - return dbus_g_proxy_begin_call_with_timeout (priv->proxy, - "removeInterface", - remove_cb, - info, - (GDestroyNotify) cb_info_free, - 10000, /* timeout */ - G_TYPE_STRING, zone ? zone : "", - G_TYPE_STRING, iface, - G_TYPE_INVALID); + return (NMFirewallPendingCall) dbus_g_proxy_begin_call_with_timeout (priv->proxy, + "removeInterface", + remove_cb, + info, + (GDestroyNotify) cb_info_free, + 10000, /* timeout */ + G_TYPE_STRING, zone ? zone : "", + G_TYPE_STRING, iface, + G_TYPE_INVALID); } -void nm_firewall_manager_cancel_call (NMFirewallManager *self, gpointer call) +void nm_firewall_manager_cancel_call (NMFirewallManager *self, NMFirewallPendingCall call) { g_return_if_fail (NM_IS_FIREWALL_MANAGER (self)); dbus_g_proxy_cancel_call (NM_FIREWALL_MANAGER_GET_PRIVATE (self)->proxy, diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h index 5ccbc72341..84cb5498ae 100644 --- a/src/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h @@ -40,6 +40,9 @@ G_BEGIN_DECLS #define NM_FIREWALL_MANAGER_AVAILABLE "available" +struct _NMFirewallPendingCall; +typedef struct _NMFirewallPendingCall *NMFirewallPendingCall; + typedef struct { GObject parent; } NMFirewallManager; @@ -57,16 +60,16 @@ NMFirewallManager *nm_firewall_manager_get (void); typedef void (*FwAddToZoneFunc) (GError *error, gpointer user_data); -gpointer nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr, - const char *iface, - const char *zone, - gboolean add, - FwAddToZoneFunc callback, - gpointer user_data); -gpointer nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr, - const char *iface, - const char *zone); - -void nm_firewall_manager_cancel_call (NMFirewallManager *mgr, gpointer fw_call); +NMFirewallPendingCall nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr, + const char *iface, + const char *zone, + gboolean add, + FwAddToZoneFunc callback, + gpointer user_data); +NMFirewallPendingCall nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr, + const char *iface, + const char *zone); + +void nm_firewall_manager_cancel_call (NMFirewallManager *mgr, NMFirewallPendingCall fw_call); #endif /* __NETWORKMANAGER_FIREWALL_MANAGER_H__ */ |