Oh my.
return TRUE;
}
-static void
+static gboolean
make_wired_connection_setting (NMConnection *connection,
const char *conn_name,
GError **error)
(guint32) mtu, NULL);
}
- if (read_mac_address (conn_name, &mac, error)) {
- if (mac) {
- g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS,
- mac, NULL);
- }
- } else {
+ if (!read_mac_address (conn_name, &mac, error)) {
g_object_unref (s_wired);
- s_wired = NULL;
+ return FALSE;
}
- if (s_wired)
- nm_connection_add_setting (connection, NM_SETTING (s_wired));
+
+ if (mac)
+ g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL);
+ nm_connection_add_setting (connection, NM_SETTING (s_wired));
+
+ return TRUE;
}
/* add NM_SETTING_IP_CONFIG_DHCP_HOSTNAME,
* NM_SETTING_IP_CONFIG_DHCP_CLIENT_ID in future*/
-static void
+static gboolean
make_ip4_setting (NMConnection *connection,
const char *conn_name,
GError **error)
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Unknown config for %s", conn_name);
g_object_unref (ip4_setting);
- return;
+ return FALSE;
}
if (strstr (method, "dhcp"))
g_object_set (ip4_setting,
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
NM_SETTING_IP_CONFIG_NEVER_DEFAULT, FALSE, NULL);
nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
- return;
+ return TRUE;
} else if (strstr (method, "shared")) {
g_object_set (ip4_setting,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_SHARED,
NM_SETTING_IP_CONFIG_NEVER_DEFAULT, FALSE, NULL);
nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
- return;
+ return TRUE;
} else {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Unknown config for %s", conn_name);
g_object_unref (ip4_setting);
- return;
+ return FALSE;
}
nm_log_info (LOGD_SETTINGS, "Using %s method for %s", method, conn_name);
}else {
"Ifnet plugin: can't aquire ip configuration for %s",
conn_name);
g_object_unref (ip4_setting);
- return;
+ return FALSE;
}
/************** add all ip settings to the connection**********/
while (iblock) {
/* Finally add setting to connection */
nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
+
+ return TRUE;
}
-static void
+static gboolean
make_ip6_setting (NMConnection *connection,
const char *conn_name,
GError **error)
done:
nm_connection_add_setting (connection, NM_SETTING (s_ip6));
- return;
+ return TRUE;
error:
g_object_unref (s_ip6);
nm_log_warn (LOGD_SETTINGS, " Ignore IPv6 for %s", conn_name);
- return;
+ return FALSE;
}
static NMSetting *
wsec =
NM_SETTING_WIRELESS_SECURITY (nm_setting_wireless_security_new ());
- value = wpa_get_value (ssid, "key_mgmt");
- if (!value || strcmp (value, "IEEE8021X"))
- goto error; /* Not LEAP */
-
- value = wpa_get_value (ssid, "eap");
- if (!value || strcasecmp (value, "LEAP"))
- goto error; /* Not LEAP */
-
value = wpa_get_value (ssid, "password");
if (value && strlen (value))
g_object_set (wsec, NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD,
if (value)
adhoc = strcmp (value, "1") == 0 ? TRUE : FALSE;
- value = wpa_get_value (ssid, "key_mgmt");
- /* Not WPA or Dynamic WEP */
- if (!value)
- goto error;
- if (strcmp (value, "WPA-PSK") && strcmp (value, "WPA-EAP"))
- goto error;
/* Pairwise and Group ciphers */
fill_wpa_ciphers (ssid, wsec, FALSE, adhoc);
fill_wpa_ciphers (ssid, wsec, TRUE, adhoc);
}
+ value = wpa_get_value (ssid, "key_mgmt");
if (!strcmp (value, "WPA-PSK")) {
char *psk = parse_wpa_psk (wpa_get_value (ssid, "psk"), error);
g_return_val_if_fail (conn_name != NULL
&& strcmp (ifnet_get_data (conn_name, "type"),
"ppp") != 0, NULL);
- if (!wpa_get_value (conn_name, "ssid"))
- return NULL;
nm_log_info (LOGD_SETTINGS, "updating wireless security settings (%s).", conn_name);
ssid = conn_name;
if (value)
adhoc = strcmp (value, "1") == 0 ? TRUE : FALSE;
- if (!adhoc) {
- wsec = make_leap_setting (ssid, error);
- if (error && *error)
- goto error;
- }
- if (!wsec) {
+ value = wpa_get_value (ssid, "key_mgmt");
+ if (!adhoc && g_strcmp0 (value, "IEEE8021X") == 0) {
+ value = wpa_get_value (ssid, "eap");
+ if (value && strcasecmp (value, "LEAP") == 0) {
+ wsec = make_leap_setting (ssid, error);
+ if (wsec == NULL)
+ goto error;
+ }
+ } else if (g_strcmp0 (value, "WPA-PSK") == 0 || g_strcmp0 (value, "WPA-EAP") == 0) {
wsec = make_wpa_setting (ssid, basepath, s_8021x, error);
- if (error && *error)
+ if (wsec == NULL)
goto error;
}
if (!wsec) {
wsec = make_wep_setting (ssid, error);
- if (error && *error)
+ if (wsec == NULL)
goto error;
}
}
/* Currently only support username and password */
-static void
+static gboolean
make_pppoe_connection_setting (NMConnection *connection,
const char *conn_name,
GError **error)
if (!value) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"ppp requires at lease a username");
- return;
+ return FALSE;
}
g_object_set (s_pppoe, NM_SETTING_PPPOE_USERNAME, value, NULL);
/* PPP setting */
s_ppp = (NMSettingPpp *) nm_setting_ppp_new ();
nm_connection_add_setting (connection, NM_SETTING (s_ppp));
+
+ return TRUE;
}
NMConnection *
if (!strcmp (NM_SETTING_WIRED_SETTING_NAME, type)
|| !strcmp (NM_SETTING_PPPOE_SETTING_NAME, type)) {
/* wired setting */
- make_wired_connection_setting (connection, conn_name, error);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
+ if (!make_wired_connection_setting (connection, conn_name, error))
goto error;
- }
+
/* pppoe setting */
- if (!strcmp (NM_SETTING_PPPOE_SETTING_NAME, type))
- make_pppoe_connection_setting (connection, conn_name,
- error);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- goto error;
+ if (!strcmp (NM_SETTING_PPPOE_SETTING_NAME, type)) {
+ if (!make_pppoe_connection_setting (connection, conn_name, error))
+ goto error;
}
} else if (!strcmp (NM_SETTING_WIRELESS_SETTING_NAME, type)) {
/* wireless setting */
goto error;
nm_connection_add_setting (connection, wireless_setting);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- goto error;
- }
-
/* wireless security setting */
- wsec = make_wireless_security_setting (conn_name, basepath, &s_8021x, error);
- if (wsec) {
+ if (wpa_get_value (conn_name, "ssid")) {
+ wsec = make_wireless_security_setting (conn_name, basepath, &s_8021x, error);
+ if (!wsec)
+ goto error;
nm_connection_add_setting (connection, NM_SETTING (wsec));
if (s_8021x)
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
}
-
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- goto error;
- }
-
} else
goto error;
/* IPv4 setting */
- make_ip4_setting (connection, conn_name, error);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
+ if (!make_ip4_setting (connection, conn_name, error))
goto error;
- }
/* IPv6 setting */
- make_ip6_setting (connection, conn_name, error);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
+ if (!make_ip6_setting (connection, conn_name, error))
goto error;
- }
- success = nm_connection_verify (connection, error);
- if (error && *error)
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- else
+ if (nm_connection_verify (connection, error)) {
nm_log_info (LOGD_SETTINGS, "Connection verified %s:%d", conn_name, success);
- if (!success)
+ } else {
goto error;
- return connection;
+ }
+ return connection;
error:
g_object_unref (connection);
return NULL;
return success;
}
-static gboolean
-write_route6_file (NMSettingIPConfig *s_ip6, const char *conn_name, GError **error)
+static void
+write_route6_file (NMSettingIPConfig *s_ip6, const char *conn_name)
{
NMIPRoute *route;
const char *next_hop;
GString *routes_string;
const char *old_routes;
- g_return_val_if_fail (s_ip6 != NULL, FALSE);
+ g_return_if_fail (s_ip6 != NULL);
num = nm_setting_ip_config_get_num_routes (s_ip6);
- if (num == 0) {
- return TRUE;
- }
+ if (num == 0)
+ return;
old_routes = ifnet_get_data (conn_name, "routes");
routes_string = g_string_new (old_routes);
if (num > 0)
ifnet_set_data (conn_name, "routes", routes_string->str);
g_string_free (routes_string, TRUE);
-
- return TRUE;
}
static gboolean
g_string_free (searches, TRUE);
}
- write_route6_file (s_ip6, conn_name, error);
- if (error && *error)
- return FALSE;
+ write_route6_file (s_ip6, conn_name);
return TRUE;
}
ifnet_flush_to_file (const char *config_file, gchar **out_backup)
{
GIOChannel *channel;
- GError **error = NULL;
+ GError *error = NULL;
gpointer key, value, name, network;
GHashTableIter iter, iter_network;
GList *list_iter;
g_io_channel_write_chars (channel,
"#Generated by NetworkManager\n"
"###### Global Configuration ######\n",
- -1, &bytes_written, error);
+ -1, &bytes_written, &error);
+ if (error)
+ goto done;
+
/* Writing global data */
while (g_hash_table_iter_next (&iter, &key, &value)) {
out_line =
g_strdup_printf ("%s=\"%s\"\n", (gchar *) key, (gchar *) value);
g_io_channel_write_chars (channel, out_line, -1,
- &bytes_written, error);
- if (bytes_written == 0 || (error && *error))
- break;
+ &bytes_written, &error);
+ if (bytes_written == 0 || error)
+ goto done;
g_free (out_line);
}
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- goto done;
- }
/* Writing connection data */
g_io_channel_write_chars (channel,
"\n###### Connection Configuration ######\n",
- -1, &bytes_written, error);
+ -1, &bytes_written, &error);
+ if (error)
+ goto done;
+
g_hash_table_iter_init (&iter, conn_table);
while (g_hash_table_iter_next (&iter, &name, &network)) {
g_hash_table_iter_init (&iter_network, (GHashTable *) network);
g_io_channel_write_chars (channel,
"#----------------------------------\n",
- -1, &bytes_written, error);
+ -1, &bytes_written, &error);
+ if (error)
+ goto done;
while (g_hash_table_iter_next (&iter_network, &key, &value)) {
if (!g_str_has_prefix ((gchar *) key, "name")
("%s_%s=\"%s\"\n",
(gchar *) key,
(gchar *) name, (gchar *) value);
- g_io_channel_write_chars
- (channel, out_line, -1,
- &bytes_written, error);
- if (bytes_written == 0 || (error && *error))
- break;
+ g_io_channel_write_chars (channel, out_line, -1, &bytes_written, &error);
+ if (bytes_written == 0 || error)
+ goto done;
g_free (out_line);
}
}
}
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- goto done;
- }
/* Writing reserved functions */
if (functions_list) {
g_io_channel_write_chars (channel,
"\n###### Reserved Functions ######\n",
- -1, &bytes_written, error);
+ -1, &bytes_written, &error);
+ if (error)
+ goto done;
+
/* Writing functions */
for (list_iter = functions_list; list_iter;
list_iter = g_list_next (list_iter)) {
out_line =
g_strdup_printf ("%s\n", (gchar *) list_iter->data);
g_io_channel_write_chars (channel, out_line, -1,
- &bytes_written, error);
- if (bytes_written == 0 || (error && *error))
- break;
+ &bytes_written, &error);
+ if (bytes_written == 0 || error)
+ goto done;
g_free (out_line);
}
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- goto done;
- }
}
- g_io_channel_flush (channel, error);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
+ g_io_channel_flush (channel, &error);
+ if (error)
goto done;
- }
result = TRUE;
net_parser_data_changed = FALSE;
done:
+ if (error) {
+ nm_log_warn (LOGD_SETTINGS, "Error writing the configuration file: %s", error->message);
+ g_error_free (error);
+ }
+
if (result && out_backup)
*out_backup = backup;
else
{
GFile *source, *backup;
gchar* backup_path;
- GError **error = NULL;
+ GError *error = NULL;
source = g_file_new_for_path (target);
+
+ if (!g_file_query_exists (source, NULL)) {
+ g_object_unref (source);
+ return NULL;
+ }
+
backup_path = g_strdup_printf ("%s.bak", target);
backup = g_file_new_for_path (backup_path);
- g_file_copy (source, backup, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Backup failed: %s", (*error)->message);
+ if (!g_file_copy (source, backup, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error)) {
+ nm_log_warn (LOGD_SETTINGS, "Backup failed: %s", error->message);
g_free (backup_path);
backup_path = NULL;
+ g_error_free (error);
}
+ g_object_unref (source);
+ g_object_unref (backup);
+
return backup_path;
}
else {
tmp = ifnet_update_connection_from_config_block (conn_name, NULL, &error);
if (!tmp) {
+ nm_log_warn (LOGD_SETTINGS, "Could not read connection '%s': %s",
+ conn_name, error->message);
g_error_free (error);
return NULL;
}
object = (GObject *) g_object_new (NM_TYPE_IFNET_CONNECTION, NULL);
g_assert (object);
NM_IFNET_CONNECTION_GET_PRIVATE (object)->conn_name = g_strdup (conn_name);
- nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (object),
- tmp,
- update_unsaved,
- NULL,
- NULL);
+ if (!nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (object),
+ tmp,
+ update_unsaved,
+ NULL,
+ NULL)) {
+ g_object_unref (object);
+ return NULL;
+ }
g_object_unref (tmp);
return NM_IFNET_CONNECTION (object);
static void
kill_backup (char **path)
{
- if (path) {
+ if (*path) {
unlink (*path);
g_free (*path);
*path = NULL;
GError *error = NULL;
NMConnection *connection;
- g_test_expect_message ("NetworkManager", G_LOG_LEVEL_MESSAGE,
- "*Unknown config for eth8*");
connection = ifnet_update_connection_from_config_block ("eth8", NULL, &error);
- g_test_assert_expected_messages ();
+ g_assert_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION);
g_assert (connection == NULL && error != NULL);
}
wpa_flush_to_file (const char *config_file)
{
GIOChannel *channel;
- GError **error = NULL;
+ GError *error = NULL;
gpointer key, value, ssid, security;
GHashTableIter iter, iter_security;
gchar *out_line;
g_io_channel_write_chars (channel,
"#Generated by NetworkManager\n"
"###### Global Configuration ######\n",
- -1, &bytes_written, error);
+ -1, &bytes_written, &error);
+ if (error)
+ goto done;
/* Writing global information */
while (g_hash_table_iter_next (&iter, &key, &value)) {
out_line =
g_strdup_printf ("%s=%s\n", (gchar *) key, (gchar *) value);
g_io_channel_write_chars (channel, out_line, -1, &bytes_written,
- error);
- if (bytes_written == 0 || (error && *error))
+ &error);
+ if (bytes_written == 0 || error)
break;
g_free (out_line);
}
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
+ if (error)
goto done;
- }
g_io_channel_write_chars (channel,
"\n###### Security Configuration ######\n",
- -1, &bytes_written, error);
+ -1, &bytes_written, &error);
+ if (error)
+ goto done;
g_hash_table_iter_init (&iter, wsec_table);
/* Writing security */
g_hash_table_iter_init (&iter_security,
(GHashTable *) security);
g_io_channel_write_chars (channel, "network={\n", -1,
- &bytes_written, error);
+ &bytes_written, &error);
+ if (error)
+ goto done;
while (g_hash_table_iter_next (&iter_security, &key, &value)) {
out_line =
g_strdup_printf (need_quote ((gchar *) key) ?
"\t%s=\"%s\"\n" : "\t%s=%s\n",
(gchar *) key, (gchar *) value);
g_io_channel_write_chars (channel, out_line, -1,
- &bytes_written, error);
- if (bytes_written == 0 || (error && *error))
- break;
+ &bytes_written, &error);
+ if (bytes_written == 0 || error)
+ goto done;
g_free (out_line);
}
- g_io_channel_write_chars (channel,
- "}\n\n", -1, &bytes_written, error);
+ g_io_channel_write_chars (channel, "}\n\n", -1, &bytes_written, &error);
}
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
+ g_io_channel_flush (channel, &error);
+ if (error)
goto done;
- }
- g_io_channel_flush (channel, error);
- if (error && *error) {
- nm_log_warn (LOGD_SETTINGS, "Found error: %s", (*error)->message);
- goto done;
- }
wpa_parser_data_changed = FALSE;
result = TRUE;
done:
+ if (error) {
+ nm_log_warn (LOGD_SETTINGS, "Error writing WPA configuration: %s", error->message);
+ g_error_free (error);
+ }
g_io_channel_shutdown (channel, FALSE, NULL);
g_io_channel_unref (channel);
return result;
projects / NetworkManager.git / commitdiff