fastd/fastd
1
0
Fork 0
mirror of https://github.com/neocturne/fastd.git synced 2025-05-23 07:35:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

status: add wrap_string_or_null() helper

Browse source
This commit is contained in:
Matthias Schiffer 2022-05-03 20:19:54 +02:00
parent fc4e527762
commit 09cc37f894
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/status.c
View file

@ -86,6 +86,10 @@ static json_object *dump_stats(const fastd_stats_t *stats) {
return statistics; return statistics;
} }
/** Returns a string as a json_object *, allows NULL to be passed */
static json_object *wrap_string_or_null(const char *str) {
return str ? json_object_new_string(str) : NULL;
}
/** Dumps a peer's status as a JSON object */ /** Dumps a peer's status as a JSON object */
static json_object *dump_peer(const fastd_peer_t *peer) { static json_object *dump_peer(const fastd_peer_t *peer) {
@ -95,7 +99,7 @@ static json_object *dump_peer(const fastd_peer_t *peer) {
char addr_buf[1 + INET6_ADDRSTRLEN + 2 + IFNAMSIZ + 1 + 5 + 1]; char addr_buf[1 + INET6_ADDRSTRLEN + 2 + IFNAMSIZ + 1 + 5 + 1];
fastd_snprint_peer_address(addr_buf, sizeof(addr_buf), &peer->address, NULL, false, false); fastd_snprint_peer_address(addr_buf, sizeof(addr_buf), &peer->address, NULL, false, false);
json_object_object_add(ret, "name", peer->name ? json_object_new_string(peer->name) : NULL); json_object_object_add(ret, "name", wrap_string_or_null(peer->name));
json_object_object_add(ret, "address", json_object_new_string(addr_buf)); json_object_object_add(ret, "address", json_object_new_string(addr_buf));
if (!ctx.iface) if (!ctx.iface)