chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: rename "connection name" to "description" for the sd-bus API too
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd/sd-bus/bus-kernel.c
b/src/libsystemd/sd-bus/bus-kernel.c
index 032761474234cfecee05408d66c0d20413148751..11039b8e13bb6b6b433fd3f089944d85241d7870 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-kernel.c
+++ b/
src/libsystemd/sd-bus/bus-kernel.c
@@
-31,6
+31,7
@@
#include "util.h"
#include "strv.h"
#include "util.h"
#include "strv.h"
+#include "memfd-util.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-internal.h"
#include "bus-message.h"
@@
-587,7
+588,7
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
destination = d->str;
break;
destination = d->str;
break;
- case KDBUS_ITEM_NAME:
+ case KDBUS_ITEM_
OWNED_
NAME:
if (!service_name_is_valid(d->name.name))
return -EBADMSG;
if (!service_name_is_valid(d->name.name))
return -EBADMSG;
@@
-596,9
+597,9
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
goto fail;
break;
goto fail;
break;
- case KDBUS_ITEM_CONN_
NAME
:
- m->creds.
conn_name
= d->str;
- m->creds.mask |= SD_BUS_CREDS_
CONNECTION_NAME
& bus->creds_mask;
+ case KDBUS_ITEM_CONN_
DESCRIPTION
:
+ m->creds.
description
= d->str;
+ m->creds.mask |= SD_BUS_CREDS_
DESCRIPTION
& bus->creds_mask;
break;
case KDBUS_ITEM_FDS:
break;
case KDBUS_ITEM_FDS:
@@
-665,8
+666,8
@@
int bus_kernel_take_fd(sd_bus *b) {
b->use_memfd = 1;
b->use_memfd = 1;
- if (b->
connection_name
) {
- g = bus_label_escape(b->
connection_name
);
+ if (b->
description
) {
+ g = bus_label_escape(b->
description
);
if (!g)
return -ENOMEM;
if (!g)
return -ENOMEM;
@@
-699,8
+700,8
@@
int bus_kernel_take_fd(sd_bus *b) {
name = g;
}
name = g;
}
- b->
connection_name
= bus_label_unescape(name);
- if (!b->
connection_name
)
+ b->
description
= bus_label_unescape(name);
+ if (!b->
description
)
return -ENOMEM;
}
return -ENOMEM;
}
@@
-726,7
+727,7
@@
int bus_kernel_take_fd(sd_bus *b) {
item = hello->items;
item->size = offsetof(struct kdbus_item, str) + m + 1;
item = hello->items;
item->size = offsetof(struct kdbus_item, str) + m + 1;
- item->type = KDBUS_ITEM_CONN_
NAME
;
+ item->type = KDBUS_ITEM_CONN_
DESCRIPTION
;
memcpy(item->str, name, m + 1);
item = KDBUS_ITEM_NEXT(item);
memcpy(item->str, name, m + 1);
item = KDBUS_ITEM_NEXT(item);
@@
-1118,20
+1119,13
@@
int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *mapped, size_t *al
assert_se(pthread_mutex_lock(&bus->memfd_cache_mutex) >= 0);
if (bus->n_memfd_cache <= 0) {
assert_se(pthread_mutex_lock(&bus->memfd_cache_mutex) >= 0);
if (bus->n_memfd_cache <= 0) {
- _cleanup_free_ char *g = NULL;
int r;
assert_se(pthread_mutex_unlock(&bus->memfd_cache_mutex) >= 0);
int r;
assert_se(pthread_mutex_unlock(&bus->memfd_cache_mutex) >= 0);
- assert(bus->connection_name);
-
- g = bus_label_escape(bus->connection_name);
- if (!g)
- return -ENOMEM;
-
- r = memfd_create(g, MFD_ALLOW_SEALING);
+ r = memfd_new(bus->description);
if (r < 0)
if (r < 0)
- return
-errno
;
+ return
r
;
*address = NULL;
*mapped = 0;
*address = NULL;
*mapped = 0;
@@
-1188,7
+1182,7
@@
void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t mapped, si
/* If overly long, let's return a bit to the OS */
if (mapped > max_mapped) {
/* If overly long, let's return a bit to the OS */
if (mapped > max_mapped) {
- assert_se(
ftruncat
e(fd, max_mapped) >= 0);
+ assert_se(
memfd_set_siz
e(fd, max_mapped) >= 0);
assert_se(munmap((uint8_t*) address + max_mapped, PAGE_ALIGN(mapped - max_mapped)) >= 0);
c->mapped = c->allocated = max_mapped;
} else {
assert_se(munmap((uint8_t*) address + max_mapped, PAGE_ALIGN(mapped - max_mapped)) >= 0);
c->mapped = c->allocated = max_mapped;
} else {
@@
-1261,8
+1255,8
@@
int kdbus_translate_attach_flags(uint64_t mask, uint64_t *kdbus_mask) {
if (mask & SD_BUS_CREDS_WELL_KNOWN_NAMES)
m |= KDBUS_ATTACH_NAMES;
if (mask & SD_BUS_CREDS_WELL_KNOWN_NAMES)
m |= KDBUS_ATTACH_NAMES;
- if (mask & SD_BUS_CREDS_
CONNECTION_NAME
)
- m |= KDBUS_ATTACH_CONN_
NAME
;
+ if (mask & SD_BUS_CREDS_
DESCRIPTION
)
+ m |= KDBUS_ATTACH_CONN_
DESCRIPTION
;
*kdbus_mask = m;
return 0;
*kdbus_mask = m;
return 0;