From db2e926da147c5bb67660e40d0b2ab4d8e6a7728 Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Tue, 6 Sep 2016 10:56:32 +0200

Subject: [PATCH 01/11] logging: don't round subsecond part in logging

 timestamp

tv.tv_usec is guaranteed to have less then 6 digits, however rounding it up

we might reach 1000000 and thus the value becomes mis-aligned. To round

correctly, we would have to carry over a potential overflow to the seconds.

But that seems too much effort for little gain. Just truncate the value.

(cherry picked from commit c1b4b99a3c758f320c369a8daadb219eeb50ee83)

(cherry picked from commit 99e30bdf700220e98db76602645a9844360e3fab)

---

 src/nm-logging.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nm-logging.c b/src/nm-logging.c

index 3db8d20..6ecc160 100644

--- a/src/nm-logging.c

+++ b/src/nm-logging.c

@@ -512,7 +512,7 @@ _nm_log_impl (const char *file,

 	va_end (args);

 	g_get_current_time (&tv;;

-	nm_sprintf_buf (s_buf_timestamp, " [%ld.%04ld]", tv.tv_sec, (tv.tv_usec + 50) / 100);

+	nm_sprintf_buf (s_buf_timestamp, " [%ld.%04ld]", tv.tv_sec, tv.tv_usec / 100);

 	switch (global.log_backend) {

 #if SYSTEMD_JOURNAL

-- 

2.7.4

From fdf9c355eb35a7de1919a53c09349296a395f72e Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Mon, 5 Sep 2016 14:12:41 +0200

Subject: [PATCH 02/11] shared: add NM_MIN()/NM_MAX() macros to replace glib's

 MIN()/MAX()

(cherry picked from commit b2016fd2a52b82d45324526c965e7545d026cebe)

(cherry picked from commit 811aaead4ca6f2f815f49b7353fa7a88554dca42)

---

 shared/nm-utils/nm-macros-internal.h | 44 ++++++++++++++++++++++++++++++++++++

 1 file changed, 44 insertions(+)

diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h

index c66cb53..2067dba 100644

--- a/shared/nm-utils/nm-macros-internal.h

+++ b/shared/nm-utils/nm-macros-internal.h

@@ -542,6 +542,50 @@ nm_strcmp_p_with_data (gconstpointer a, gconstpointer b, gpointer user_data)

 /*****************************************************************************/

+/* Taken from systemd's UNIQ_T and UNIQ macros. */

+

+#define NM_UNIQ_T(x, uniq) G_PASTE(__unique_prefix_, G_PASTE(x, uniq))

+#define NM_UNIQ __COUNTER__

+

+/*****************************************************************************/

+

+/* glib's MIN()/MAX() macros don't have function-like behavior, in that they evaluate

+ * the argument possibly twice.

+ *

+ * Taken from systemd's MIN()/MAX() macros. */

+

+#define NM_MIN(a, b) __NM_MIN(NM_UNIQ, a, NM_UNIQ, b)

+#define __NM_MIN(aq, a, bq, b) \

+	({ \

+		typeof (a) NM_UNIQ_T(A, aq) = (a); \

+		typeof (b) NM_UNIQ_T(B, bq) = (b); \

+		((NM_UNIQ_T(A, aq) < NM_UNIQ_T(B, bq)) ? NM_UNIQ_T(A, aq) : NM_UNIQ_T(B, bq)); \

+	})

+

+#define NM_MAX(a, b) __NM_MAX(NM_UNIQ, a, NM_UNIQ, b)

+#define __NM_MAX(aq, a, bq, b) \

+	({ \

+		typeof (a) NM_UNIQ_T(A, aq) = (a); \

+		typeof (b) NM_UNIQ_T(B, bq) = (b); \

+		((NM_UNIQ_T(A, aq) > NM_UNIQ_T(B, bq)) ? NM_UNIQ_T(A, aq) : NM_UNIQ_T(B, bq)); \

+	})

+

+#define NM_CLAMP(x, low, high) __NM_CLAMP(NM_UNIQ, x, NM_UNIQ, low, NM_UNIQ, high)

+#define __NM_CLAMP(xq, x, lowq, low, highq, high) \

+	({ \

+		typeof(x)NM_UNIQ_T(X,xq) = (x); \

+		typeof(low) NM_UNIQ_T(LOW,lowq) = (low); \

+		typeof(high) NM_UNIQ_T(HIGH,highq) = (high); \

+		\

+		( (NM_UNIQ_T(X,xq) > NM_UNIQ_T(HIGH,highq)) \

+		  ? NM_UNIQ_T(HIGH,highq) \

+		  : (NM_UNIQ_T(X,xq) < NM_UNIQ_T(LOW,lowq)) \

+		     ? NM_UNIQ_T(LOW,lowq) \

+		     : NM_UNIQ_T(X,xq)); \

+	})

+

+/*****************************************************************************/

+

 static inline guint

 nm_encode_version (guint major, guint minor, guint micro) {

 	/* analog to the preprocessor macro NM_ENCODE_VERSION(). */

-- 

2.7.4

From 58ccecb75f8f367a25f1defadddb9826735a24d7 Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Mon, 5 Sep 2016 16:49:50 +0200

Subject: [PATCH 03/11] shared: add _NM_GET_PRIVATE() macro

(cherry picked from commit 2cae9ba348ed6ea4d41ebd714d8c55f4d49feae9)

(cherry picked from commit 5bac57496c0ee458456f5cf68560263cea6c23de)

---

 shared/nm-utils/nm-macros-internal.h | 18 ++++++++++++++++++

 1 file changed, 18 insertions(+)

diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h

index 2067dba..91970c3 100644

--- a/shared/nm-utils/nm-macros-internal.h

+++ b/shared/nm-utils/nm-macros-internal.h

@@ -372,6 +372,24 @@ _notify (obj_type *obj, _PropertyEnums prop) \

 /*****************************************************************************/

+#define __NM_GET_PRIVATE(self, type, is_check, result_cmd) \

+	({ \

+		/* preserve the const-ness of self. Unfortunately, that

+		 * way, @self cannot be a void pointer */ \

+		typeof (self) _self = (self); \

+		\

+		/* Get compiler error if variable is of wrong type */ \

+		_nm_unused const type *_self2 = (_self); \

+		\

+		nm_assert (is_check (_self)); \

+		( result_cmd ); \

+	})

+

+#define _NM_GET_PRIVATE(self, type, is_check)     __NM_GET_PRIVATE(self, type, is_check, &_self->_priv)

+#define _NM_GET_PRIVATE_PTR(self, type, is_check) __NM_GET_PRIVATE(self, type, is_check,  _self->_priv)

+

+/*****************************************************************************/

+

 static inline gpointer

 nm_g_object_ref (gpointer obj)

 {

-- 

2.7.4

From c6e898fea24c5e86a2a8b7b43fe5131f655d1c38 Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Mon, 5 Sep 2016 16:55:07 +0200

Subject: [PATCH 04/11] core: use _NM_GET_PRIVATE() macros

(cherry picked from commit cdf6ad40572f23be6f8b6971bd57b1002ffb9aaf)

(cherry picked from commit 3940d63a7e6bff088bb3fb5e81c8cb2792b19b3a)

---

 src/devices/nm-device-ethernet.c    | 13 +------------

 src/devices/nm-device-veth.c        | 13 +------------

 src/devices/nm-device.c             | 31 ++++++++++---------------------

 src/devices/nm-device.h             |  2 +-

 src/devices/wifi/nm-device-wifi.c   | 13 +------------

 src/devices/wifi/nm-wifi-ap.c       | 13 +------------

 src/dns-manager/nm-dns-manager.c    | 13 +------------

 src/nm-auth-subject.c               | 13 +------------

 src/nm-checkpoint.c                 | 15 ++-------------

 src/nm-ip4-config.c                 | 13 +------------

 src/nm-ip6-config.c                 | 13 +------------

 src/nm-manager.c                    | 15 ++-------------

 src/rdisc/nm-lndp-rdisc.c           | 13 +------------

 src/rdisc/nm-rdisc.c                | 13 +------------

 src/vpn-manager/nm-vpn-connection.c | 13 +------------

 15 files changed, 26 insertions(+), 180 deletions(-)

diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c

index 90d472d..b213a0c 100644

--- a/src/devices/nm-device-ethernet.c

+++ b/src/devices/nm-device-ethernet.c

@@ -127,18 +127,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceEthernet,

 G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE)

-#define NM_DEVICE_ETHERNET_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMDeviceEthernet *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_DEVICE_ETHERNET (_self)); \

-		_self->_priv; \

-	})

+#define NM_DEVICE_ETHERNET_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMDeviceEthernet, NM_IS_DEVICE_ETHERNET)

 /*****************************************************************************/

diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c

index cca86fb..5692331 100644

--- a/src/devices/nm-device-veth.c

+++ b/src/devices/nm-device-veth.c

@@ -62,18 +62,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceVeth,

 G_DEFINE_TYPE (NMDeviceVeth, nm_device_veth, NM_TYPE_DEVICE_ETHERNET)

-#define NM_DEVICE_VETH_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMDeviceVeth *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_DEVICE_VETH (_self)); \

-		&_self->_priv; \

-	})

+#define NM_DEVICE_VETH_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceVeth, NM_IS_DEVICE_VETH)

 /*****************************************************************************/

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c

index 84246b7..240e590 100644

--- a/src/devices/nm-device.c

+++ b/src/devices/nm-device.c

@@ -75,18 +75,7 @@ _LOG_DECLARE_SELF (NMDevice);

 G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, NM_TYPE_EXPORTED_OBJECT)

-#define NM_DEVICE_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMDevice *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_DEVICE (_self)); \

-		_self->priv; \

-	})

+#define NM_DEVICE_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMDevice, NM_IS_DEVICE)

 enum {

 	STATE_CHANGED,

@@ -2029,7 +2018,7 @@ link_type_compatible (NMDevice *self,

 		return FALSE;

 	}

-	device_type = self->priv->link_type;

+	device_type = self->_priv->link_type;

 	if (device_type > NM_LINK_TYPE_UNKNOWN && device_type != link_type) {

 		g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,

 		             "Needed link type 0x%x does not match the platform link type 0x%X",

@@ -10063,7 +10052,7 @@ nm_device_set_unmanaged_by_user_udev (NMDevice *self)

 	int ifindex;

 	gboolean platform_unmanaged = FALSE;

-	ifindex = self->priv->ifindex;

+	ifindex = self->_priv->ifindex;

 	if (   ifindex <= 0

 	    || !nm_platform_link_get_unmanaged (NM_PLATFORM_GET, ifindex, &platform_unmanaged))

@@ -10150,7 +10139,7 @@ nm_device_reapply_settings_immediately (NMDevice *self)

 	if (g_strcmp0 ((zone = nm_setting_connection_get_zone (s_con_settings)),

 	               nm_setting_connection_get_zone (s_con_applied)) != 0) {

-		version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->priv->act_request);

+		version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->_priv->act_request);

 		_LOGD (LOGD_DEVICE, "reapply setting: zone = %s%s%s (version-id %llu)", NM_PRINT_FMT_QUOTE_STRING (zone), (long long unsigned) version_id);

 		g_object_set (G_OBJECT (s_con_applied),

@@ -10162,7 +10151,7 @@ nm_device_reapply_settings_immediately (NMDevice *self)

 	if ((metered = nm_setting_connection_get_metered (s_con_settings)) != nm_setting_connection_get_metered (s_con_applied)) {

-		version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->priv->act_request);

+		version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->_priv->act_request);

 		_LOGD (LOGD_DEVICE, "reapply setting: metered = %d (version-id %llu)", (int) metered, (long long unsigned) version_id);

 		g_object_set (G_OBJECT (s_con_applied),

@@ -10341,22 +10330,22 @@ nm_device_check_connection_available (NMDevice *self,

 static gboolean

 available_connections_del_all (NMDevice *self)

 {

-	if (g_hash_table_size (self->priv->available_connections) == 0)

+	if (g_hash_table_size (self->_priv->available_connections) == 0)

 		return FALSE;

-	g_hash_table_remove_all (self->priv->available_connections);

+	g_hash_table_remove_all (self->_priv->available_connections);

 	return TRUE;

 }

 static gboolean

 available_connections_add (NMDevice *self, NMConnection *connection)

 {

-	return nm_g_hash_table_add (self->priv->available_connections, g_object_ref (connection));

+	return nm_g_hash_table_add (self->_priv->available_connections, g_object_ref (connection));

 }

 static gboolean

 available_connections_del (NMDevice *self, NMConnection *connection)

 {

-	return g_hash_table_remove (self->priv->available_connections, connection);

+	return g_hash_table_remove (self->_priv->available_connections, connection);

 }

 static gboolean

@@ -12137,7 +12126,7 @@ nm_device_init (NMDevice *self)

 	priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NM_TYPE_DEVICE, NMDevicePrivate);

-	self->priv = priv;

+	self->_priv = priv;

 	priv->type = NM_DEVICE_TYPE_UNKNOWN;

 	priv->capabilities = NM_DEVICE_CAP_NM_SUPPORTED;

diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h

index 0f91b21..a757a37 100644

--- a/src/devices/nm-device.h

+++ b/src/devices/nm-device.h

@@ -125,7 +125,7 @@ struct _NMDevice {

 	NMExportedObject parent;

 	/* private */

-	struct _NMDevicePrivate *priv;

+	struct _NMDevicePrivate *_priv;

 };

 /* The flags have an relaxing meaning, that means, specifying more flags, can make

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c

index 49c380a..f97e668 100644

--- a/src/devices/wifi/nm-device-wifi.c

+++ b/src/devices/wifi/nm-device-wifi.c

@@ -138,18 +138,7 @@ struct _NMDeviceWifiClass

 G_DEFINE_TYPE (NMDeviceWifi, nm_device_wifi, NM_TYPE_DEVICE)

-#define NM_DEVICE_WIFI_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMDeviceWifi *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_DEVICE_WIFI (_self)); \

-		&_self->_priv; \

-	})

+#define NM_DEVICE_WIFI_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceWifi, NM_IS_DEVICE_WIFI)

 /*****************************************************************************/

diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c

index e1beb85..2232f82 100644

--- a/src/devices/wifi/nm-wifi-ap.c

+++ b/src/devices/wifi/nm-wifi-ap.c

@@ -68,18 +68,7 @@ struct _NMAccessPointClass{

 	NMExportedObjectClass parent;

 };

-#define NM_AP_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMAccessPoint *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_AP (_self)); \

-		&_self->_priv; \

-	})

+#define NM_AP_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMAccessPoint, NM_IS_AP)

 G_DEFINE_TYPE (NMAccessPoint, nm_ap, NM_TYPE_EXPORTED_OBJECT)

diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c

index 3efd5ac..ce8f4d9 100644

--- a/src/dns-manager/nm-dns-manager.c

+++ b/src/dns-manager/nm-dns-manager.c

@@ -151,18 +151,7 @@ G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, G_TYPE_OBJECT)

 NM_DEFINE_SINGLETON_INSTANCE (NMDnsManager);

-#define NM_DNS_MANAGER_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMDnsManager *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_DNS_MANAGER (_self)); \

-		&_self->_priv; \

-	})

+#define NM_DNS_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDnsManager, NM_IS_DNS_MANAGER)

 /*****************************************************************************/

diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c

index eb496b2..54d3595 100644

--- a/src/nm-auth-subject.c

+++ b/src/nm-auth-subject.c

@@ -68,18 +68,7 @@ struct _NMAuthSubjectClass {

 G_DEFINE_TYPE (NMAuthSubject, nm_auth_subject, G_TYPE_OBJECT)

-#define NM_AUTH_SUBJECT_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMAuthSubject *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_AUTH_SUBJECT (_self)); \

-		&_self->_priv; \

-	})

+#define NM_AUTH_SUBJECT_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMAuthSubject, NM_IS_AUTH_SUBJECT)

 /**************************************************************/

diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c

index cb1adc3..605e070 100644

--- a/src/nm-checkpoint.c

+++ b/src/nm-checkpoint.c

@@ -70,7 +70,7 @@ typedef struct {

 struct _NMCheckpoint {

 	NMExportedObject parent;

-	NMCheckpointPrivate priv;

+	NMCheckpointPrivate _priv;

 };

 typedef struct {

@@ -79,18 +79,7 @@ typedef struct {

 G_DEFINE_TYPE (NMCheckpoint, nm_checkpoint, NM_TYPE_EXPORTED_OBJECT)

-#define NM_CHECKPOINT_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMCheckpoint *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_CHECKPOINT (_self)); \

-		&_self->priv; \

-	})

+#define NM_CHECKPOINT_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMCheckpoint, NM_IS_CHECKPOINT)

 NM_GOBJECT_PROPERTIES_DEFINE_BASE (

 	PROP_DEVICES,

diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c

index 22d1d07..a4d4361 100644

--- a/src/nm-ip4-config.c

+++ b/src/nm-ip4-config.c

@@ -68,18 +68,7 @@ struct _NMIP4ConfigClass {

 G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, NM_TYPE_EXPORTED_OBJECT)

-#define NM_IP4_CONFIG_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMIP4Config *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_IP4_CONFIG (_self)); \

-		&_self->_priv; \

-	})

+#define NM_IP4_CONFIG_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMIP4Config, NM_IS_IP4_CONFIG)

 /* internal guint32 are assigned to gobject properties of type uint. Ensure, that uint is large enough */

 G_STATIC_ASSERT (sizeof (uint) >= sizeof (guint32));

diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c

index ac9e6cd..8002d61 100644

--- a/src/nm-ip6-config.c

+++ b/src/nm-ip6-config.c

@@ -61,18 +61,7 @@ struct _NMIP6ConfigClass {

 G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, NM_TYPE_EXPORTED_OBJECT)

-#define NM_IP6_CONFIG_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMIP6Config *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_IP6_CONFIG (_self)); \

-		&_self->_priv; \

-	})

+#define NM_IP6_CONFIG_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMIP6Config, NM_IS_IP6_CONFIG)

 NM_GOBJECT_PROPERTIES_DEFINE (NMIP6Config,

 	PROP_IFINDEX,

diff --git a/src/nm-manager.c b/src/nm-manager.c

index 5794bb9..9ad6517 100644

--- a/src/nm-manager.c

+++ b/src/nm-manager.c

@@ -158,21 +158,10 @@ typedef struct {

 	NMExportedObjectClass parent;

 } NMManagerClass;

-#define NM_MANAGER_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMManager *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_MANAGER (_self)); \

-		&_self->_priv; \

-	})

-

 G_DEFINE_TYPE (NMManager, nm_manager, NM_TYPE_EXPORTED_OBJECT)

+#define NM_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMManager, NM_IS_MANAGER)

+

 enum {

 	DEVICE_ADDED,

 	INTERNAL_DEVICE_ADDED,

diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c

index 12c2e30..db2965b 100644

--- a/src/rdisc/nm-lndp-rdisc.c

+++ b/src/rdisc/nm-lndp-rdisc.c

@@ -60,18 +60,7 @@ struct _NMLndpRDiscClass {

 G_DEFINE_TYPE (NMLndpRDisc, nm_lndp_rdisc, NM_TYPE_RDISC)

-#define NM_LNDP_RDISC_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMLndpRDisc *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_LNDP_RDISC (_self)); \

-		&_self->_priv; \

-	})

+#define NM_LNDP_RDISC_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMLndpRDisc, NM_IS_LNDP_RDISC)

 /*****************************************************************************/

diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c

index cf993bc..3bc6975 100644

--- a/src/rdisc/nm-rdisc.c

+++ b/src/rdisc/nm-rdisc.c

@@ -87,18 +87,7 @@ static guint signals[LAST_SIGNAL] = { 0 };

 G_DEFINE_TYPE (NMRDisc, nm_rdisc, G_TYPE_OBJECT)

-#define NM_RDISC_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMRDisc *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_RDISC (_self)); \

-		_self->_priv; \

-	})

+#define NM_RDISC_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMRDisc, NM_IS_RDISC)

 /*****************************************************************************/

diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c

index 92c5bd8..69b45dc 100644

--- a/src/vpn-manager/nm-vpn-connection.c

+++ b/src/vpn-manager/nm-vpn-connection.c

@@ -168,18 +168,7 @@ struct _NMVpnConnectionClass {

 G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION)

-#define NM_VPN_CONNECTION_GET_PRIVATE(self) \

-	({ \

-		/* preserve the const-ness of self. Unfortunately, that

-		 * way, @self cannot be a void pointer */ \

-		typeof (self) _self = (self); \

-		\

-		/* Get compiler error if variable is of wrong type */ \

-		_nm_unused const NMVpnConnection *_self2 = (_self); \

-		\

-		nm_assert (NM_IS_VPN_CONNECTION (_self)); \

-		&_self->_priv; \

-	})

+#define NM_VPN_CONNECTION_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMVpnConnection, NM_IS_VPN_CONNECTION)

 /*****************************************************************************/

-- 

2.7.4

From ae7affc152479c0b50de63c0495bb81e7fa05405 Mon Sep 17 00:00:00 2001

From: Thomas Haller <thaller@redhat.com>

Date: Mon, 5 Sep 2016 16:42:59 +0200

Subject: [PATCH 05/11] dhcp-listener: refactor type definition and embed

 private data in @self

(cherry picked from commit 822f01a8fdb63831c887d5db9fb06eb840f53c88)

(cherry picked from commit 75e13f0e15b7618d7fafbe3f1b990871be0950a7)

---

 src/dhcp-manager/nm-dhcp-listener.c | 50 +++++++++++++++++++++----------------

 src/dhcp-manager/nm-dhcp-listener.h |  4 +--

 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c

index eadff3e..d3616cb 100644

--- a/src/dhcp-manager/nm-dhcp-listener.c

+++ b/src/dhcp-manager/nm-dhcp-listener.c

@@ -13,12 +13,14 @@

  * with this program; if not, write to the Free Software Foundation, Inc.,

  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

  *

- * Copyright 2014 Red Hat, Inc.

+ * Copyright 2014 - 2016 Red Hat, Inc.

  *

  */

 #include "nm-default.h"

+#include "nm-dhcp-listener.h"

+

 #include <sys/socket.h>

 #include <sys/wait.h>

 #include <signal.h>

@@ -27,7 +29,6 @@

 #include <errno.h>

 #include <unistd.h>

-#include "nm-dhcp-listener.h"

 #include "nm-core-internal.h"

 #include "nm-bus-manager.h"

 #include "NetworkManagerUtils.h"

@@ -36,6 +37,8 @@

 #define PRIV_SOCK_PATH            NMRUNDIR "/private-dhcp"

 #define PRIV_SOCK_TAG             "dhcp"

+/*****************************************************************************/

+

 typedef struct {

 	NMBusManager *      dbus_mgr;

 	gulong              new_conn_id;

@@ -43,17 +46,26 @@ typedef struct {

 	GHashTable *        signal_handlers;

 } NMDhcpListenerPrivate;

-#define NM_DHCP_LISTENER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_LISTENER, NMDhcpListenerPrivate))

+struct _NMDhcpListener {

+	GObject parent;

+	NMDhcpListenerPrivate _priv;

+};

+

+struct _NMDhcpListenerClass {

+	GObjectClass parent_class;

+};

 G_DEFINE_TYPE (NMDhcpListener, nm_dhcp_listener, G_TYPE_OBJECT)

+#define NM_DHCP_LISTENER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDhcpListener, NM_IS_DHCP_LISTENER)

+

 enum {

 	EVENT,

 	LAST_SIGNAL

 };

 static guint signals[LAST_SIGNAL] = { 0 };

-/***************************************************/

+/*****************************************************************************/

 static char *

 get_option (GVariant *options, const char *key)

@@ -188,7 +200,7 @@ nm_dhcp_listener_init (NMDhcpListener *self)

 {

 	NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE (self);

-	/* Maps GDBusConnection :: GDBusProxy */

+	/* Maps GDBusConnection :: signal-id */

 	priv->signal_handlers = g_hash_table_new (NULL, NULL);

 	priv->dbus_mgr = nm_bus_manager_get ();

@@ -208,7 +220,7 @@ nm_dhcp_listener_init (NMDhcpListener *self)

 static void

 dispose (GObject *object)

 {

-	NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE (object);

+	NMDhcpListenerPrivate *priv = NM_DHCP_LISTENER_GET_PRIVATE ((NMDhcpListener *) object);

 	nm_clear_g_signal_handler (priv->dbus_mgr, &priv->new_conn_id);

 	nm_clear_g_signal_handler (priv->dbus_mgr, &priv->dis_conn_id);

@@ -224,22 +236,18 @@ nm_dhcp_listener_class_init (NMDhcpListenerClass *listener_class)

 {

 	GObjectClass *object_class = G_OBJECT_CLASS (listener_class);

-	g_type_class_add_private (listener_class, sizeof (NMDhcpListenerPrivate));

-

-	/* virtual methods */

 	object_class->dispose = dispose;

-	/* signals */