New upstream version 1.27.90 upstream/1.27.90

1 files changed, 93 insertions, 85 deletions

diff --git a/src/ppp/nm-ppp-manager-call.c b/src/ppp/nm-ppp-manager-call.c
index 11520ec9..34c3d06d 100644
--- a/src/ppp/nm-ppp-manager-call.c
+++ b/src/ppp/nm-ppp-manager-call.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 Red Hat, Inc.
  */
@@ -21,109 +21,117 @@
 static NMPPPOps *ppp_ops = NULL;
 
 NMPPPManager *
-nm_ppp_manager_create (const char *iface, GError **error)
+nm_ppp_manager_create(const char *iface, GError **error)
 {
-	NMPPPManager *ret;
-	GModule *plugin;
-	GError *error_local = NULL;
-	NMPPPOps *ops;
-	struct stat st;
-
-	if (G_UNLIKELY (!ppp_ops)) {
-		if (stat (PPP_PLUGIN_PATH, &st) != 0) {
-			g_set_error_literal (error,
-			                     NM_MANAGER_ERROR, NM_MANAGER_ERROR_MISSING_PLUGIN,
-			                     "the PPP plugin " PPP_PLUGIN_PATH " is not installed");
-			return NULL;
-		}
-
-		if (!nm_utils_validate_plugin (PPP_PLUGIN_PATH, &st, &error_local)) {
-			g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_MISSING_PLUGIN,
-			             "could not load the PPP plugin " PPP_PLUGIN_PATH ": %s",
-			             error_local->message);
-			g_clear_error (&error_local);
-			return NULL;
-		}
-
-		plugin = g_module_open (PPP_PLUGIN_PATH, G_MODULE_BIND_LOCAL);
-		if (!plugin) {
-			g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_MISSING_PLUGIN,
-			             "could not load the PPP plugin " PPP_PLUGIN_PATH ": %s",
-			             g_module_error ());
-			return NULL;
-		}
-
-		if (!g_module_symbol (plugin, "ppp_ops", (gpointer) &ops)) {
-			g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_MISSING_PLUGIN,
-			             "error loading the PPP plugin: %s", g_module_error ());
-			return NULL;
-		}
-
-		/* after loading glib types from the plugin, we cannot unload the library anymore.
-		 * Make it resident. */
-		g_module_make_resident (plugin);
-
-		nm_assert (ops);
-		nm_assert (ops->create);
-		nm_assert (ops->start);
-		nm_assert (ops->stop);
-		nm_assert (ops->stop_cancel);
-
-		ppp_ops = ops;
-
-		nm_log_info (LOGD_CORE | LOGD_PPP, "loaded PPP plugin " PPP_PLUGIN_PATH);
-	}
-
-	ret = ppp_ops->create (iface);
-	g_return_val_if_fail (ret, NULL);
-	return ret;
+    NMPPPManager *ret;
+    GModule *     plugin;
+    GError *      error_local = NULL;
+    NMPPPOps *    ops;
+    struct stat   st;
+
+    if (G_UNLIKELY(!ppp_ops)) {
+        if (stat(PPP_PLUGIN_PATH, &st) != 0) {
+            g_set_error_literal(error,
+                                NM_MANAGER_ERROR,
+                                NM_MANAGER_ERROR_MISSING_PLUGIN,
+                                "the PPP plugin " PPP_PLUGIN_PATH " is not installed");
+            return NULL;
+        }
+
+        if (!nm_utils_validate_plugin(PPP_PLUGIN_PATH, &st, &error_local)) {
+            g_set_error(error,
+                        NM_MANAGER_ERROR,
+                        NM_MANAGER_ERROR_MISSING_PLUGIN,
+                        "could not load the PPP plugin " PPP_PLUGIN_PATH ": %s",
+                        error_local->message);
+            g_clear_error(&error_local);
+            return NULL;
+        }
+
+        plugin = g_module_open(PPP_PLUGIN_PATH, G_MODULE_BIND_LOCAL);
+        if (!plugin) {
+            g_set_error(error,
+                        NM_MANAGER_ERROR,
+                        NM_MANAGER_ERROR_MISSING_PLUGIN,
+                        "could not load the PPP plugin " PPP_PLUGIN_PATH ": %s",
+                        g_module_error());
+            return NULL;
+        }
+
+        if (!g_module_symbol(plugin, "ppp_ops", (gpointer) &ops)) {
+            g_set_error(error,
+                        NM_MANAGER_ERROR,
+                        NM_MANAGER_ERROR_MISSING_PLUGIN,
+                        "error loading the PPP plugin: %s",
+                        g_module_error());
+            return NULL;
+        }
+
+        /* after loading glib types from the plugin, we cannot unload the library anymore.
+         * Make it resident. */
+        g_module_make_resident(plugin);
+
+        nm_assert(ops);
+        nm_assert(ops->create);
+        nm_assert(ops->start);
+        nm_assert(ops->stop);
+        nm_assert(ops->stop_cancel);
+
+        ppp_ops = ops;
+
+        nm_log_info(LOGD_CORE | LOGD_PPP, "loaded PPP plugin " PPP_PLUGIN_PATH);
+    }
+
+    ret = ppp_ops->create(iface);
+    g_return_val_if_fail(ret, NULL);
+    return ret;
 }
 
 void
-nm_ppp_manager_set_route_parameters (NMPPPManager *self,
-                                     guint32 ip4_route_table,
-                                     guint32 ip4_route_metric,
-                                     guint32 ip6_route_table,
-                                     guint32 ip6_route_metric)
+nm_ppp_manager_set_route_parameters(NMPPPManager *self,
+                                    guint32       ip4_route_table,
+                                    guint32       ip4_route_metric,
+                                    guint32       ip6_route_table,
+                                    guint32       ip6_route_metric)
 {
-	g_return_if_fail (ppp_ops);
+    g_return_if_fail(ppp_ops);
 
-	ppp_ops->set_route_parameters (self,
-	                               ip4_route_table,
-	                               ip4_route_metric,
-	                               ip6_route_table,
-	                               ip6_route_metric);
+    ppp_ops->set_route_parameters(self,
+                                  ip4_route_table,
+                                  ip4_route_metric,
+                                  ip6_route_table,
+                                  ip6_route_metric);
 }
 
 gboolean
-nm_ppp_manager_start (NMPPPManager *self,
-                      NMActRequest *req,
-                      const char *ppp_name,
-                      guint32 timeout_secs,
-                      guint baud_override,
-                      GError **err)
+nm_ppp_manager_start(NMPPPManager *self,
+                     NMActRequest *req,
+                     const char *  ppp_name,
+                     guint32       timeout_secs,
+                     guint         baud_override,
+                     GError **     err)
 {
-	g_return_val_if_fail (ppp_ops, FALSE);
+    g_return_val_if_fail(ppp_ops, FALSE);
 
-	return ppp_ops->start (self, req, ppp_name, timeout_secs, baud_override, err);
+    return ppp_ops->start(self, req, ppp_name, timeout_secs, baud_override, err);
 }
 
 NMPPPManagerStopHandle *
-nm_ppp_manager_stop (NMPPPManager *self,
-                     GCancellable *cancellable,
-                     NMPPPManagerStopCallback callback,
-                     gpointer user_data)
+nm_ppp_manager_stop(NMPPPManager *           self,
+                    GCancellable *           cancellable,
+                    NMPPPManagerStopCallback callback,
+                    gpointer                 user_data)
 {
-	g_return_val_if_fail (ppp_ops, NULL);
+    g_return_val_if_fail(ppp_ops, NULL);
 
-	return ppp_ops->stop (self, cancellable, callback, user_data);
+    return ppp_ops->stop(self, cancellable, callback, user_data);
 }
 
 void
-nm_ppp_manager_stop_cancel (NMPPPManagerStopHandle *handle)
+nm_ppp_manager_stop_cancel(NMPPPManagerStopHandle *handle)
 {
-	g_return_if_fail (ppp_ops);
-	g_return_if_fail (handle);
+    g_return_if_fail(ppp_ops);
+    g_return_if_fail(handle);
 
-	ppp_ops->stop_cancel (handle);
+    ppp_ops->stop_cancel(handle);
 }