From 795d1d8a82a45f4097481a99ea82062a48c411fd Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 2 May 2014 11:23:16 -0500
Subject: [PATCH] wimax: implement plugin symbol visibility

The only public symbols should be the factory functions.
---
 src/devices/wimax/Makefile.am       | 16 +++++++++-
 src/devices/wimax/exports.ver       |  7 +++++
 src/devices/wimax/nm-device-wimax.c | 48 -----------------------------
 src/devices/wimax/nm-device-wimax.h | 12 --------
 4 files changed, 22 insertions(+), 61 deletions(-)
 create mode 100644 src/devices/wimax/exports.ver

diff --git a/src/devices/wimax/Makefile.am b/src/devices/wimax/Makefile.am
index 3ed5955c08..def8bf62b7 100644
--- a/src/devices/wimax/Makefile.am
+++ b/src/devices/wimax/Makefile.am
@@ -18,6 +18,8 @@ AM_CPPFLAGS = \
 
 pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la
 
+SYMBOL_VIS_FILE=$(srcdir)/exports.ver
+
 libnm_device_plugin_wimax_la_SOURCES = \
 	nm-wimax-factory.c \
 	nm-device-wimax.c \
@@ -30,7 +32,10 @@ libnm_device_plugin_wimax_la_SOURCES = \
 	iwmxsdk.c \
 	iwmxsdk.h
 
-libnm_device_plugin_wimax_la_LDFLAGS = -module -avoid-version
+libnm_device_plugin_wimax_la_LDFLAGS = \
+	-module -avoid-version \
+	-Wl,--version-script=$(SYMBOL_VIS_FILE)
+
 libnm_device_plugin_wimax_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(IWMX_SDK_LIBS) \
@@ -47,3 +52,12 @@ BUILT_SOURCES = \
 	nm-device-wimax-glue.h
 
 CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = $(SYMBOL_VIS_FILE)
+
+if ENABLE_TESTS
+
+check-local:
+	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wimax.so $(SYMBOL_VIS_FILE)
+
+endif
+
diff --git a/src/devices/wimax/exports.ver b/src/devices/wimax/exports.ver
new file mode 100644
index 0000000000..d2c451244b
--- /dev/null
+++ b/src/devices/wimax/exports.ver
@@ -0,0 +1,7 @@
+{
+global:
+	nm_device_factory_create;
+	nm_device_factory_get_device_type;
+local:
+	*;
+};
diff --git a/src/devices/wimax/nm-device-wimax.c b/src/devices/wimax/nm-device-wimax.c
index bdf7d9d6e8..4024ba8463 100644
--- a/src/devices/wimax/nm-device-wimax.c
+++ b/src/devices/wimax/nm-device-wimax.c
@@ -123,46 +123,6 @@ nm_wimax_error_quark (void)
 
 /***********************************************************/
 
-guint32
-nm_device_wimax_get_center_frequency (NMDeviceWimax *self)
-{
-	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0);
-
-	return NM_DEVICE_WIMAX_GET_PRIVATE (self)->center_freq;
-}
-
-gint
-nm_device_wimax_get_rssi (NMDeviceWimax *self)
-{
-	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0);
-
-	return NM_DEVICE_WIMAX_GET_PRIVATE (self)->rssi;
-}
-
-gint
-nm_device_wimax_get_cinr (NMDeviceWimax *self)
-{
-	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0);
-
-	return NM_DEVICE_WIMAX_GET_PRIVATE (self)->cinr;
-}
-
-gint
-nm_device_wimax_get_tx_power (NMDeviceWimax *self)
-{
-	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0);
-
-	return NM_DEVICE_WIMAX_GET_PRIVATE (self)->tx_power;
-}
-
-const char *
-nm_device_wimax_get_bsid (NMDeviceWimax *self)
-{
-	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), NULL);
-
-	return NM_DEVICE_WIMAX_GET_PRIVATE (self)->bsid;
-}
-
 static gboolean
 impl_device_get_nsp_list (NMDeviceWimax *self, GPtrArray **nsps, GError **error)
 {
@@ -202,14 +162,6 @@ set_current_nsp (NMDeviceWimax *self, NMWimaxNsp *new_nsp)
 		g_object_unref (old_nsp);
 }
 
-NMWimaxNsp *
-nm_device_wimax_get_active_nsp (NMDeviceWimax *self)
-{
-	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), NULL);
-
-	return NM_DEVICE_WIMAX_GET_PRIVATE (self)->current_nsp;
-}
-
 static gboolean
 activation_timed_out (gpointer data)
 {
diff --git a/src/devices/wimax/nm-device-wimax.h b/src/devices/wimax/nm-device-wimax.h
index 938c8d06c9..8b252ee161 100644
--- a/src/devices/wimax/nm-device-wimax.h
+++ b/src/devices/wimax/nm-device-wimax.h
@@ -68,18 +68,6 @@ GType nm_device_wimax_get_type (void);
 
 NMDevice   *nm_device_wimax_new            (NMPlatformLink *platform_device);
 
-NMWimaxNsp *nm_device_wimax_get_active_nsp (NMDeviceWimax *self);
-
-guint       nm_device_wimax_get_center_frequency (NMDeviceWimax *self);
-
-gint        nm_device_wimax_get_rssi       (NMDeviceWimax *self);
-
-gint        nm_device_wimax_get_cinr       (NMDeviceWimax *self);
-
-gint        nm_device_wimax_get_tx_power   (NMDeviceWimax *self);
-
-const char *nm_device_wimax_get_bsid       (NMDeviceWimax *self);
-
 G_END_DECLS
 
 #endif	/* NM_DEVICE_WIMAX_H */