Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 1 | From dadca2c91fa18a18445659b41f182b0793dce566 Mon Sep 17 00:00:00 2001 |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 2 | From: Tomas Pecka <peckato1@users.noreply.github.com> |
| 3 | Date: Thu, 7 Oct 2021 11:16:57 +0200 |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 4 | Subject: [PATCH 1/7] network: Serialize LLDP neighbor to JSON format |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 5 | |
| 6 | Add functions serializing LLDP neighbors to JSON (JsonVariant). |
| 7 | |
| 8 | The entry contains a chassis id, system name and port id of the remote |
| 9 | neighbor. Also it possibly contains an integer coding the enabled system |
| 10 | capabilities and port description. |
| 11 | --- |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 12 | src/libsystemd-network/lldp-neighbor.c | 22 ++++++++++++ |
| 13 | src/libsystemd-network/sd-lldp-rx.c | 46 +++++++++++++++++++++++++- |
| 14 | src/systemd/sd-lldp-rx.h | 4 +++ |
| 15 | 3 files changed, 71 insertions(+), 1 deletion(-) |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 16 | |
| 17 | diff --git a/src/libsystemd-network/lldp-neighbor.c b/src/libsystemd-network/lldp-neighbor.c |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 18 | index 6672409d75..5fb7669e09 100644 |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 19 | --- a/src/libsystemd-network/lldp-neighbor.c |
| 20 | +++ b/src/libsystemd-network/lldp-neighbor.c |
| 21 | @@ -5,6 +5,7 @@ |
| 22 | #include "ether-addr-util.h" |
| 23 | #include "hexdecoct.h" |
| 24 | #include "in-addr-util.h" |
| 25 | +#include "json.h" |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 26 | #include "lldp-neighbor.h" |
| 27 | #include "memory-util.h" |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 28 | #include "missing_network.h" |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 29 | @@ -794,3 +795,24 @@ int sd_lldp_neighbor_get_timestamp(sd_lldp_neighbor *n, clockid_t clock, uint64_ |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 30 | *ret = triple_timestamp_by_clock(&n->timestamp, clock); |
| 31 | return 0; |
| 32 | } |
| 33 | + |
| 34 | +_public_ int sd_lldp_neighbor_build_json(sd_lldp_neighbor *n, JsonVariant **ret) { |
| 35 | + const char *chassis_id = NULL, *port_id = NULL, *system_name = NULL, *port_description = NULL; |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 36 | + uint16_t cc = 0; |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 37 | + bool valid_cc; |
| 38 | + |
| 39 | + (void) sd_lldp_neighbor_get_chassis_id_as_string(n, &chassis_id); |
| 40 | + (void) sd_lldp_neighbor_get_port_id_as_string(n, &port_id); |
| 41 | + (void) sd_lldp_neighbor_get_system_name(n, &system_name); |
| 42 | + (void) sd_lldp_neighbor_get_port_description(n, &port_description); |
| 43 | + |
| 44 | + valid_cc = sd_lldp_neighbor_get_enabled_capabilities(n, &cc) >= 0; |
| 45 | + |
| 46 | + return json_build(ret, JSON_BUILD_OBJECT( |
| 47 | + JSON_BUILD_PAIR("neighbor", JSON_BUILD_OBJECT( |
| 48 | + JSON_BUILD_PAIR("chassisId", JSON_BUILD_STRING(chassis_id)), |
| 49 | + JSON_BUILD_PAIR("systemName", JSON_BUILD_STRING(system_name)), |
| 50 | + JSON_BUILD_PAIR_CONDITION(valid_cc, "enabledCapabilities", JSON_BUILD_UNSIGNED(cc)), |
| 51 | + JSON_BUILD_PAIR("portId", JSON_BUILD_STRING(port_id)), |
| 52 | + JSON_BUILD_PAIR_CONDITION(port_description, "portDescription", JSON_BUILD_STRING(port_description)))))); |
| 53 | +} |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 54 | diff --git a/src/libsystemd-network/sd-lldp-rx.c b/src/libsystemd-network/sd-lldp-rx.c |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 55 | index 0479cff5f5..ec1a0bae54 100644 |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 56 | --- a/src/libsystemd-network/sd-lldp-rx.c |
| 57 | +++ b/src/libsystemd-network/sd-lldp-rx.c |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 58 | @@ -10,6 +10,7 @@ |
| 59 | #include "ether-addr-util.h" |
| 60 | #include "event-util.h" |
| 61 | #include "fd-util.h" |
| 62 | +#include "json.h" |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 63 | #include "lldp-neighbor.h" |
| 64 | #include "lldp-network.h" |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 65 | #include "lldp-rx-internal.h" |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 66 | @@ -491,7 +492,50 @@ int sd_lldp_rx_get_neighbors(sd_lldp_rx *lldp_rx, sd_lldp_neighbor ***ret) { |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 67 | return k; |
| 68 | } |
| 69 | |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 70 | -int sd_lldp_rx_set_neighbors_max(sd_lldp_rx *lldp_rx, uint64_t m) { |
| 71 | +_public_ int sd_lldp_rx_get_neighbors_json(sd_lldp_rx *lldp, JsonVariant ***ret) { |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 72 | + int i, j, r, n = 0; |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 73 | + _cleanup_free_ sd_lldp_neighbor **l = NULL; |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 74 | + JsonVariant **v = NULL; |
| 75 | + |
| 76 | + assert_return(lldp, -EINVAL); |
| 77 | + assert_return(ret, -EINVAL); |
| 78 | + |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 79 | + r = sd_lldp_rx_get_neighbors(lldp, &l); |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 80 | + if (r < 0) |
| 81 | + return r; |
| 82 | + |
| 83 | + n = r; |
| 84 | + |
| 85 | + v = new0(JsonVariant*, n); |
| 86 | + if (!v) |
| 87 | + return -ENOMEM; |
| 88 | + |
| 89 | + for (i = 0; i < n; i++) { |
| 90 | + r = sd_lldp_neighbor_build_json(l[i], v + i); |
| 91 | + if (r < 0) |
| 92 | + goto clear; |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 93 | + else |
| 94 | + sd_lldp_neighbor_unref(l[i]); |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 95 | + } |
| 96 | + |
| 97 | + *ret = v; |
| 98 | + |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 99 | + for (i = 0; i < n; j++) |
| 100 | + |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 101 | + return n; |
| 102 | + |
| 103 | +clear: |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 104 | + for (j = i; j < n; j++) |
| 105 | + sd_lldp_neighbor_unref(l[j]); |
| 106 | + |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 107 | + for (j = 0; j < i; j++) |
| 108 | + json_variant_unrefp(v + j); |
| 109 | + |
| 110 | + free(v); |
| 111 | + return r; |
| 112 | +} |
| 113 | + |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 114 | +_public_ int sd_lldp_rx_set_neighbors_max(sd_lldp_rx *lldp_rx, uint64_t m) { |
| 115 | assert_return(lldp_rx, -EINVAL); |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 116 | assert_return(m > 0, -EINVAL); |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 117 | |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 118 | diff --git a/src/systemd/sd-lldp-rx.h b/src/systemd/sd-lldp-rx.h |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 119 | index 504d7f59c1..ec9b8edf76 100644 |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 120 | --- a/src/systemd/sd-lldp-rx.h |
| 121 | +++ b/src/systemd/sd-lldp-rx.h |
| 122 | @@ -32,6 +32,8 @@ _SD_BEGIN_DECLARATIONS; |
| 123 | typedef struct sd_lldp_rx sd_lldp_rx; |
| 124 | typedef struct sd_lldp_neighbor sd_lldp_neighbor; |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 125 | |
| 126 | +typedef struct JsonVariant JsonVariant; |
| 127 | + |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 128 | __extension__ typedef enum sd_lldp_rx_event_t { |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 129 | SD_LLDP_RX_EVENT_ADDED, |
| 130 | SD_LLDP_RX_EVENT_REMOVED, |
| 131 | @@ -67,10 +69,12 @@ int sd_lldp_rx_match_capabilities(sd_lldp_rx *lldp_rx, uint16_t mask); |
| 132 | int sd_lldp_rx_set_filter_address(sd_lldp_rx *lldp_rx, const struct ether_addr *address); |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 133 | |
Václav Kubernát | 8cd6156 | 2021-12-08 13:27:31 +0100 | [diff] [blame] | 134 | int sd_lldp_rx_get_neighbors(sd_lldp_rx *lldp_rx, sd_lldp_neighbor ***neighbors); |
| 135 | +int sd_lldp_rx_get_neighbors_json(sd_lldp_rx *lldp, JsonVariant ***neighbors); |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 136 | |
| 137 | int sd_lldp_neighbor_from_raw(sd_lldp_neighbor **ret, const void *raw, size_t raw_size); |
| 138 | sd_lldp_neighbor *sd_lldp_neighbor_ref(sd_lldp_neighbor *n); |
| 139 | sd_lldp_neighbor *sd_lldp_neighbor_unref(sd_lldp_neighbor *n); |
| 140 | +int sd_lldp_neighbor_build_json(sd_lldp_neighbor *n, JsonVariant **ret); |
| 141 | |
| 142 | /* Access to LLDP frame metadata */ |
| 143 | int sd_lldp_neighbor_get_source_address(sd_lldp_neighbor *n, struct ether_addr* address); |
| 144 | -- |
Tomáš Pecka | 6936b91 | 2023-06-12 11:30:36 +0200 | [diff] [blame] | 145 | 2.41.0 |
Tomáš Pecka | ae30176 | 2021-10-13 10:50:37 +0200 | [diff] [blame] | 146 | |