Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
systemd
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
steam
systemd
Commits
f08838da
Commit
f08838da
authored
Apr 12, 2013
by
Lennart Poettering
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bus: implement basic name registration with kdbus
parent
8c11aac1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
93 additions
and
37 deletions
+93
-37
src/libsystemd-bus/bus-control.c
src/libsystemd-bus/bus-control.c
+75
-35
src/libsystemd-bus/bus-kernel.c
src/libsystemd-bus/bus-kernel.c
+8
-1
src/libsystemd-bus/sd-bus.c
src/libsystemd-bus/sd-bus.c
+1
-1
src/libsystemd-bus/test-bus-kernel.c
src/libsystemd-bus/test-bus-kernel.c
+9
-0
No files found.
src/libsystemd-bus/bus-control.c
View file @
f08838da
...
...
@@ -54,26 +54,46 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
return
-
EINVAL
;
if
(
!
name
)
return
-
EINVAL
;
if
(
!
bus
->
bus_client
)
return
-
EINVAL
;
r
=
sd_bus_call_method
(
bus
,
"org.freedesktop.DBus"
,
"/"
,
"org.freedesktop.DBus"
,
"RequestName"
,
NULL
,
&
reply
,
"su"
,
name
,
flags
);
if
(
r
<
0
)
return
r
;
r
=
sd_bus_message_read
(
reply
,
"u"
,
&
ret
);
if
(
r
<
0
)
return
r
;
return
ret
;
if
(
bus
->
is_kernel
)
{
struct
kdbus_cmd_name
*
n
;
size_t
l
;
l
=
strlen
(
name
);
n
=
alloca
(
offsetof
(
struct
kdbus_cmd_name
,
name
)
+
l
+
1
);
n
->
size
=
offsetof
(
struct
kdbus_cmd_name
,
name
)
+
l
+
1
;
n
->
flags
=
flags
;
n
->
id
=
0
;
memcpy
(
n
->
name
,
name
,
l
+
1
);
r
=
ioctl
(
bus
->
input_fd
,
KDBUS_CMD_NAME_ACQUIRE
,
n
);
if
(
r
<
0
)
return
-
errno
;
return
n
->
flags
;
}
else
{
r
=
sd_bus_call_method
(
bus
,
"org.freedesktop.DBus"
,
"/"
,
"org.freedesktop.DBus"
,
"RequestName"
,
NULL
,
&
reply
,
"su"
,
name
,
flags
);
if
(
r
<
0
)
return
r
;
r
=
sd_bus_message_read
(
reply
,
"u"
,
&
ret
);
if
(
r
<
0
)
return
r
;
return
ret
;
}
}
int
sd_bus_release_name
(
sd_bus
*
bus
,
const
char
*
name
)
{
...
...
@@ -85,23 +105,43 @@ int sd_bus_release_name(sd_bus *bus, const char *name) {
return
-
EINVAL
;
if
(
!
name
)
return
-
EINVAL
;
if
(
!
bus
->
bus_client
)
return
-
EINVAL
;
r
=
sd_bus_call_method
(
bus
,
"org.freedesktop.DBus"
,
"/"
,
"org.freedesktop.DBus"
,
"ReleaseName"
,
NULL
,
&
reply
,
"s"
,
name
);
if
(
r
<
0
)
return
r
;
r
=
sd_bus_message_read
(
reply
,
"u"
,
&
ret
);
if
(
r
<
0
)
return
r
;
if
(
bus
->
is_kernel
)
{
struct
kdbus_cmd_name
*
n
;
size_t
l
;
l
=
strlen
(
name
);
n
=
alloca
(
offsetof
(
struct
kdbus_cmd_name
,
name
)
+
l
+
1
);
n
->
size
=
offsetof
(
struct
kdbus_cmd_name
,
name
)
+
l
+
1
;
n
->
flags
=
0
;
n
->
id
=
0
;
memcpy
(
n
->
name
,
name
,
l
+
1
);
r
=
ioctl
(
bus
->
input_fd
,
KDBUS_CMD_NAME_RELEASE
,
n
);
if
(
r
<
0
)
return
-
errno
;
return
n
->
flags
;
}
else
{
r
=
sd_bus_call_method
(
bus
,
"org.freedesktop.DBus"
,
"/"
,
"org.freedesktop.DBus"
,
"ReleaseName"
,
NULL
,
&
reply
,
"s"
,
name
);
if
(
r
<
0
)
return
r
;
r
=
sd_bus_message_read
(
reply
,
"u"
,
&
ret
);
if
(
r
<
0
)
return
r
;
}
return
ret
;
}
...
...
src/libsystemd-bus/bus-kernel.c
View file @
f08838da
...
...
@@ -158,6 +158,9 @@ int bus_kernel_take_fd(sd_bus *b) {
assert
(
b
);
if
(
b
->
is_server
)
return
-
EINVAL
;
r
=
ioctl
(
b
->
input_fd
,
KDBUS_CMD_HELLO
,
&
hello
);
if
(
r
<
0
)
return
-
errno
;
...
...
@@ -166,6 +169,7 @@ int bus_kernel_take_fd(sd_bus *b) {
return
-
ENOMEM
;
b
->
is_kernel
=
true
;
b
->
bus_client
=
true
;
r
=
bus_start_running
(
b
);
if
(
r
<
0
)
...
...
@@ -180,6 +184,9 @@ int bus_kernel_connect(sd_bus *b) {
assert
(
b
->
output_fd
<
0
);
assert
(
b
->
kernel
);
if
(
b
->
is_server
)
return
-
EINVAL
;
b
->
input_fd
=
open
(
b
->
kernel
,
O_RDWR
|
O_NOCTTY
|
O_CLOEXEC
);
if
(
b
->
input_fd
<
0
)
return
-
errno
;
...
...
@@ -339,7 +346,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
int
bus_kernel_read_message
(
sd_bus
*
bus
,
sd_bus_message
**
m
)
{
struct
kdbus_msg
*
k
;
size_t
sz
=
1
28
;
size_t
sz
=
1
024
;
int
r
;
assert
(
bus
);
...
...
src/libsystemd-bus/sd-bus.c
View file @
f08838da
...
...
@@ -280,7 +280,7 @@ static int bus_send_hello(sd_bus *bus) {
int
bus_start_running
(
sd_bus
*
bus
)
{
assert
(
bus
);
if
(
bus
->
bus_client
)
{
if
(
bus
->
bus_client
&&
!
bus
->
is_kernel
)
{
bus
->
state
=
BUS_HELLO
;
return
1
;
}
...
...
src/libsystemd-bus/test-bus-kernel.c
View file @
f08838da
...
...
@@ -85,6 +85,15 @@ int main(int argc, char *argv[]) {
assert_se
(
r
>=
0
);
assert_se
(
streq
(
the_string
,
"I am a string"
));
r
=
sd_bus_request_name
(
a
,
"net.0pointer.foobar"
,
0
);
assert_se
(
r
>=
0
);
r
=
sd_bus_release_name
(
a
,
"net.0pointer.foobar"
);
assert_se
(
r
>=
0
);
r
=
sd_bus_release_name
(
a
,
"net.0pointer.foobar"
);
assert_se
(
r
<
0
);
sd_bus_unref
(
a
);
sd_bus_unref
(
b
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment