morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

networkd: expose the nsid in the GetNamespaceId() varlink call

Browse Source 
Let's return both ids in the GetNamespaceID(), since they are pretty
much the same concept.
This commit is contained in:
Lennart Poettering
2024-01-12 11:47:45 +01:00
parent 535252dc26
commit 91b34c7641
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/networkd-manager-varlink.c
View File

@@ -25,23 +25,35 @@ static int vl_method_get_states(Varlink *link, JsonVariant *parameters, VarlinkM
}
static int vl_method_get_namespace_id(Varlink *link, JsonVariant *parameters, VarlinkMethodFlags flags, void *userdata) {
uint64_t id;
uint64_t inode = 0;
uint32_t nsid = UINT32_MAX;
int r;
assert(link);
if (json_variant_elements(parameters) > 0)
return varlink_error_invalid_parameter(link, parameters);
/* Network namespaces have two identifiers: the inode number (which all namespace types have), and
* the "nsid" (aka the "cookie"), which only network namespaces know as a concept, and which is not
* assigned by default, but once it is, is fixed. Let's return both, to avoid any confusion which one
* this is. */
struct stat st;
if (stat("/proc/self/ns/net", &st) < 0) {
if (stat("/proc/self/ns/net", &st) < 0)
log_warning_errno(errno, "Failed to stat network namespace, ignoring: %m");
id = 0;
} else
id = st.st_ino;
else
inode = st.st_ino;
r = netns_get_nsid(/* netnsfd= */ -EBADF, &nsid);
if (r < 0)
log_warning_errno(r, "Failed to query network nsid, ignoring: %m");
return varlink_replyb(link,
JSON_BUILD_OBJECT(
JSON_BUILD_PAIR_UNSIGNED("NamespaceId", id)));
JSON_BUILD_PAIR_UNSIGNED("NamespaceId", inode),
JSON_BUILD_PAIR_CONDITION(nsid == UINT32_MAX, "NamespaceNSID", JSON_BUILD_NULL),
JSON_BUILD_PAIR_CONDITION(nsid != UINT32_MAX, "NamespaceNSID", JSON_BUILD_UNSIGNED(nsid))));
}
int manager_connect_varlink(Manager *m) {

3
src/shared/varlink-io.systemd.Network.c
View File

@@ -11,7 +11,8 @@ static VARLINK_DEFINE_METHOD(GetStates,
VARLINK_DEFINE_OUTPUT(OperationalState, VARLINK_STRING, 0));
static VARLINK_DEFINE_METHOD(GetNamespaceId,
VARLINK_DEFINE_OUTPUT(NamespaceId, VARLINK_INT, 0));
VARLINK_DEFINE_OUTPUT(NamespaceId, VARLINK_INT, 0),
VARLINK_DEFINE_OUTPUT(NamespaceNSID, VARLINK_INT, VARLINK_NULLABLE));
VARLINK_DEFINE_INTERFACE(
io_systemd_Network,