SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31490 from yuwata/network-varlink-cleanups

Browse Source 
network/varlink: several trivial cleanups
This commit is contained in:
Yu Watanabe
2024-02-26 15:12:12 +09:00
committed by GitHub
parent 46877eb149 eaa260cd74
commit 815fce2c35
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-manager-varlink.c
+1 -1
View File
@@ -47,7 +47,7 @@ static int vl_method_get_namespace_id(Varlink *link, JsonVariant *parameters, Va
r = netns_get_nsid(/* netnsfd= */ -EBADF, &nsid);
if (r < 0)
log_warning_errno(r, "Failed to query network nsid, ignoring: %m");
log_full_errno(r == -ENODATA ? LOG_DEBUG : LOG_WARNING, r, "Failed to query network nsid, ignoring: %m");
return varlink_replyb(link,
JSON_BUILD_OBJECT(
src/shared/varlink-io.systemd.Network.c
+12 -10
View File
@@ -2,17 +2,19 @@
#include "varlink-io.systemd.Network.h"
static VARLINK_DEFINE_METHOD(GetStates,
VARLINK_DEFINE_OUTPUT(AddressState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(IPv4AddressState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(IPv6AddressState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(CarrierState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(OnlineState, VARLINK_STRING, VARLINK_NULLABLE),
VARLINK_DEFINE_OUTPUT(OperationalState, VARLINK_STRING, 0));
static VARLINK_DEFINE_METHOD(
GetStates,
VARLINK_DEFINE_OUTPUT(AddressState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(IPv4AddressState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(IPv6AddressState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(CarrierState, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(OnlineState, VARLINK_STRING, VARLINK_NULLABLE),
VARLINK_DEFINE_OUTPUT(OperationalState, VARLINK_STRING, 0));
static VARLINK_DEFINE_METHOD(GetNamespaceId,
VARLINK_DEFINE_OUTPUT(NamespaceId, VARLINK_INT, 0),
VARLINK_DEFINE_OUTPUT(NamespaceNSID, VARLINK_INT, VARLINK_NULLABLE));
static VARLINK_DEFINE_METHOD(
GetNamespaceId,
VARLINK_DEFINE_OUTPUT(NamespaceId, VARLINK_INT, 0),
VARLINK_DEFINE_OUTPUT(NamespaceNSID, VARLINK_INT, VARLINK_NULLABLE));
VARLINK_DEFINE_INTERFACE(
io_systemd_Network,