[network-manager-applet] Revert "editor/team: work around broken strict matching of optional keys in old jansson"
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] Revert "editor/team: work around broken strict matching of optional keys in old jansson"
- Date: Wed, 28 Jun 2017 16:37:17 +0000 (UTC)
commit 90d328a392a538675a8c538d7fa1b10dc4f229c0
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Wed Jun 28 15:37:55 2017 +0200
Revert "editor/team: work around broken strict matching of optional keys in old jansson"
This reverts commit 893b69b127a0d1cad5bfa24b258657e56b012496.
src/connection-editor/page-team-port.c | 79 +--------------------
src/connection-editor/page-team.c | 124 +-------------------------------
2 files changed, 2 insertions(+), 201 deletions(-)
---
diff --git a/src/connection-editor/page-team-port.c b/src/connection-editor/page-team-port.c
index e9d0c01..c2b4440 100644
--- a/src/connection-editor/page-team-port.c
+++ b/src/connection-editor/page-team-port.c
@@ -308,63 +308,6 @@ link_watcher_changed (GtkComboBox *combo, gpointer user_data)
#if WITH_JANSSON
-#if JANSSON_VERSION_HEX >= 0x020700
-static inline gboolean
-check_unknown_keys (json_t *json, GError **error)
-{
- return TRUE;
-}
-#else
-static inline gboolean
-check_unknown_keys (json_t *json, GError **error)
-{
- const char *key1, *key2;
- json_t *value1, *value2;
-
- if (!json_is_object (json))
- return TRUE;
-
- json_object_foreach(json, key1, value1) {
- if (!json_is_object (value1))
- continue;
-
- if ( strcmp (key1, "queue_id") == 0
- || strcmp (key1, "prio") == 0
- || strcmp (key1, "sticky") == 0
- || strcmp (key1, "lacp_prio") == 0
- || strcmp (key1, "lacp_key") == 0) {
- continue;
- } else if (strcmp (key1, "link_watch") == 0) {
- json_object_foreach(value1, key2, value2) {
- if ( strcmp (key2, "name") == 0
- || strcmp (key2, "delay_up") == 0
- || strcmp (key2, "delay_down") == 0
- || strcmp (key2, "interval") == 0
- || strcmp (key2, "init_wait") == 0
- || strcmp (key2, "missed_max") == 0
- || strcmp (key2, "source_host") == 0
- || strcmp (key2, "target_host") == 0
- || strcmp (key2, "validate_active") == 0
- || strcmp (key2, "validate_inactive") == 0
- || strcmp (key2, "send_always") == 0) {
- continue;
- } else {
- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
- "Unrecognized key: %s.%s", key1, key2);
- return FALSE;
- }
- }
- } else {
- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
- "Unrecognized key: %s", key1);
- return FALSE;
- }
- }
-
- return TRUE;
-}
-#endif
-
static gboolean
json_to_dialog (CEPageTeamPort *self)
{
@@ -413,17 +356,10 @@ json_to_dialog (CEPageTeamPort *self)
success = FALSE;
}
- if (!check_unknown_keys (json, &error)) {
- g_message ("Failed to unpack JSON: %s", error->message);
- g_clear_error (&error);
- success = FALSE;
- }
-
/* For simplicity, we proceed with json==NULL. The attempt to
* unpack will produce an error which we'll ignore. */
g_free (json_config);
ret = json_unpack_ex (json, &json_error, 0,
-#if JANSSON_VERSION_HEX >= 0x020700
"{"
" s?:i,"
" s?:i,"
@@ -432,19 +368,6 @@ json_to_dialog (CEPageTeamPort *self)
" s?:i,"
" s?:{s?:s, s?:i, s?:i, s?:i, s?:i, s?:i, s?:s, s?:s, s?:b, s?:b, s?:b !}"
"!}",
-#else
- /* Old jansson versions (before 2.7's 7a0b9af66) break when "?" is used
- * in conjunction with "!". The above call to check_unknown_keys() ensures
- * we'll not be left with unpacked values. */
- "{"
- " s?:i,"
- " s?:i,"
- " s?:b,"
- " s?:i,"
- " s?:i,"
- " s?:{s?:s, s?:i, s?:i, s?:i, s?:i, s?:i, s?:s, s?:s, s?:b, s?:b, s?:b}"
- "}",
-#endif
"queue_id", &queue_id,
"prio", &port_prio,
"sticky", &port_sticky,
@@ -464,7 +387,7 @@ json_to_dialog (CEPageTeamPort *self)
"send_always", &link_watch_send_always);
if (success == TRUE && ret == -1) {
- g_message ("Failed to unpack JSON: %s on line %d", json_error.text, json_error.line);
+ g_message ("Failed to parse JSON: %s on line %d", json_error.text, json_error.line);
success = FALSE;
}
diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
index cef8607..2dc7f26 100644
--- a/src/connection-editor/page-team.c
+++ b/src/connection-editor/page-team.c
@@ -498,109 +498,6 @@ link_watcher_changed (GtkComboBox *combo, gpointer user_data)
#if WITH_JANSSON
-#if JANSSON_VERSION_HEX >= 0x020700
-static inline gboolean
-check_unknown_keys (json_t *json, GError **error)
-{
- return TRUE;
-}
-#else
-static inline gboolean
-check_unknown_keys (json_t *json, GError **error)
-{
- const char *key1, *key2, *key3;
- json_t *value1, *value2, *value3;
-
- if (!json_is_object (json))
- return TRUE;
-
- json_object_foreach(json, key1, value1) {
- if (!json_is_object (value1))
- continue;
-
- if (strcmp (key1, "hwaddr") == 0)
- continue;
- else if (strcmp (key1, "notify_peers") == 0) {
- json_object_foreach(value1, key2, value2) {
- if ( strcmp (key2, "interval") == 0
- || strcmp (key2, "count") == 0) {
- continue;
- } else {
- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
- "Unrecognized key: %s.%s", key1, key2);
- return FALSE;
- }
- }
- } else if (strcmp (key1, "mcast_rejoin") == 0) {
- json_object_foreach(value1, key2, value2) {
- if ( strcmp (key2, "count") == 0
- || strcmp (key2, "interval") == 0) {
- continue;
- } else {
- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
- "Unrecognized key: %s.%s", key1, key2);
- return FALSE;
- }
- }
- } else if (strcmp (key1, "runner") == 0) {
- json_object_foreach(value1, key2, value2) {
- if ( strcmp (key2, "name") == 0
- || strcmp (key2, "hwaddr_policy") == 0
- || strcmp (key2, "tx_hash") == 0
- || strcmp (key2, "active") == 0
- || strcmp (key2, "fast_rate") == 0
- || strcmp (key2, "sys_prio") == 0
- || strcmp (key2, "min_ports") == 0
- || strcmp (key2, "agg_select_policy") == 0) {
- continue;
- } else if (strcmp (key2, "tx_balancer") == 0) {
- json_object_foreach(value2, key3, value3) {
- if ( strcmp (key3, "name") == 0
- || strcmp (key3, "balancing_interval") == 0) {
- continue;
- } else {
- g_set_error (error, NMA_ERROR,
NMA_ERROR_GENERIC,
- "Unrecognized key: %s.%s.%s",
key1, key2, key3);
- return FALSE;
- }
- }
- } else {
- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
- "Unrecognized key: %s.%s", key1, key2);
- return FALSE;
- }
- }
- } else if (strcmp (key1, "link_watch") == 0) {
- json_object_foreach(value1, key2, value2) {
- if ( strcmp (key2, "name") == 0
- || strcmp (key2, "delay_up") == 0
- || strcmp (key2, "delay_down") == 0
- || strcmp (key2, "interval") == 0
- || strcmp (key2, "init_wait") == 0
- || strcmp (key2, "missed_max") == 0
- || strcmp (key2, "source_host") == 0
- || strcmp (key2, "target_host") == 0
- || strcmp (key2, "validate_active") == 0
- || strcmp (key2, "validate_inactive") == 0
- || strcmp (key2, "send_always") == 0) {
- continue;
- } else {
- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
- "Unrecognized key: %s.%s", key1, key2);
- return FALSE;
- }
- }
- } else {
- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
- "Unrecognized key: %s", key1);
- return FALSE;
- }
- }
-
- return TRUE;
-}
-#endif
-
static gboolean
json_to_dialog (CEPageTeam *self)
{
@@ -660,17 +557,10 @@ json_to_dialog (CEPageTeam *self)
success = FALSE;
}
- if (!check_unknown_keys (json, &error)) {
- g_message ("Failed to unpack JSON: %s", error->message);
- g_clear_error (&error);
- success = FALSE;
- }
-
/* For simplicity, we proceed with json==NULL. The attempt to
* unpack will produce an error which we'll ignore. */
g_free (json_config);
ret = json_unpack_ex (json, &json_error, 0,
-#if JANSSON_VERSION_HEX >= 0x020700
"{"
" s?:s,"
" s?:{s?:i, s?:i !},"
@@ -678,18 +568,6 @@ json_to_dialog (CEPageTeam *self)
" s?:{s?:s, s?:s, s?:o, s?:{s?:s, s?:i !}, s?:b, s?:b, s?:i, s?:i, s?:s !},"
" s?:{s?:s, s?:i, s?:i, s?:i, s?:i, s?:i, s?:s, s?:s, s?:b, s?:b, s?:b !}"
"!}",
-#else
- /* Old jansson versions (before 2.7's 7a0b9af66) break when "?" is used
- * in conjunction with "!". The above call to check_unknown_keys() ensures
- * we'll not be left with unpacked values. */
- "{"
- " s?:s,"
- " s?:{s?:i, s?:i},"
- " s?:{s?:i, s?:i},"
- " s?:{s?:s, s?:s, s?:o, s?:{s?:s, s?:i !}, s?:b, s?:b, s?:i, s?:i, s?:s},"
- " s?:{s?:s, s?:i, s?:i, s?:i, s?:i, s?:i, s?:s, s?:s, s?:b, s?:b, s?:b}"
- "}",
-#endif
"hwaddr", &hwaddr,
"notify_peers",
"interval", ¬ify_peers_interval,
@@ -723,7 +601,7 @@ json_to_dialog (CEPageTeam *self)
"send_always", &link_watch_send_always);
if (success == TRUE && ret == -1) {
- g_message ("Failed to unpack JSON: %s on line %d", json_error.text, json_error.line);
+ g_message ("Failed to parse JSON: %s on line %d", json_error.text, json_error.line);
success = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
