chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f77697
)
networkd: bus - switch to properly escaped object paths
author
Tom Gundersen
<teg@jklm.no>
Mon, 9 Feb 2015 11:00:33 +0000
(12:00 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 9 Feb 2015 11:20:10 +0000
(12:20 +0100)
src/network/networkd-link-bus.c
patch
|
blob
|
history
diff --git
a/src/network/networkd-link-bus.c
b/src/network/networkd-link-bus.c
index 7c4f47305b1686e4eba85ae4c258e18cf04c471c..370707c30749c3dd76e303b59e6ef0a9412331ee 100644
(file)
--- a/
src/network/networkd-link-bus.c
+++ b/
src/network/networkd-link-bus.c
@@
-38,12
+38,18
@@
const sd_bus_vtable link_vtable[] = {
};
static char *link_bus_path(Link *link) {
};
static char *link_bus_path(Link *link) {
+ _cleanup_free_ char *ifindex = NULL;
char *p;
char *p;
+ int r;
assert(link);
assert(link->ifindex > 0);
assert(link);
assert(link->ifindex > 0);
- if (asprintf(&p, "/org/freedesktop/network1/link/_%d", link->ifindex) < 0)
+ if (asprintf(&ifindex, "%d", link->ifindex) < 0)
+ return NULL;
+
+ r = sd_bus_path_encode("/org/freedesktop/network1/link", ifindex, &p);
+ if (r < 0)
return NULL;
return p;
return NULL;
return p;
@@
-80,6
+86,7
@@
int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
}
int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
}
int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
+ _cleanup_free_ char *identifier = NULL;
Manager *m = userdata;
Link *link;
int ifindex, r;
Manager *m = userdata;
Link *link;
int ifindex, r;
@@
-90,7
+97,11
@@
int link_object_find(sd_bus *bus, const char *path, const char *interface, void
assert(m);
assert(found);
assert(m);
assert(found);
- if (sscanf(path, "/org/freedesktop/network1/link/_%d", &ifindex) != 1)
+ r = sd_bus_path_decode(path, "/org/freedesktop/network1/link", &identifier);
+ if (r < 0)
+ return 0;
+
+ if (sscanf(identifier, "%d", &ifindex) != 1)
return 0;
r = link_get(m, ifindex, &link);
return 0;
r = link_get(m, ifindex, &link);