Compare commits
7 Commits
8d0726fcd7
...
f12d19b304
Author | SHA1 | Date |
---|---|---|
Haochen Tong | f12d19b304 | |
Mike Kazantsev | 0e4daba173 | |
Daan De Meyer | aaf6c75061 | |
Frantisek Sumsal | 197298ff9f | |
Yu Watanabe | 9790ca75fc | |
Susant Sahani | e810df37e4 | |
Susant Sahani | 8394952777 |
4
NEWS
4
NEWS
|
@ -501,8 +501,8 @@ CHANGES WITH 244:
|
|||
configuration time using the -Dservice-watchdog= setting. If set to
|
||||
empty, the watchdogs will be disabled.
|
||||
|
||||
* systemd-resolved validates IP addresses in certificates now when GnuTLS
|
||||
is being used.
|
||||
* systemd-resolved validates IP addresses in certificates now when GnuTLS
|
||||
is being used.
|
||||
|
||||
* libcryptsetup >= 2.0.1 is now required.
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
|
||||
<refnamediv>
|
||||
<refname>sd_bus_get_fd</refname>
|
||||
<refname>sd_bus_set_fd</refname>
|
||||
<refname>sd_bus_get_events</refname>
|
||||
<refname>sd_bus_get_timeout</refname>
|
||||
|
||||
|
@ -37,6 +38,13 @@
|
|||
<paramdef>sd_bus *<parameter>bus</parameter></paramdef>
|
||||
</funcprototype>
|
||||
|
||||
<funcprototype>
|
||||
<funcdef>int <function>sd_bus_set_fd</function></funcdef>
|
||||
<paramdef>sd_bus *<parameter>bus</parameter></paramdef>
|
||||
<paramdef>int <parameter>input_fd</parameter></paramdef>
|
||||
<paramdef>int <parameter>output_fd</parameter></paramdef>
|
||||
</funcprototype>
|
||||
|
||||
<funcprototype>
|
||||
<funcdef>int <function>sd_bus_get_events</function></funcdef>
|
||||
<paramdef>sd_bus *<parameter>bus</parameter></paramdef>
|
||||
|
@ -57,8 +65,13 @@
|
|||
object. This descriptor can be used with <citerefentry
|
||||
project='man-pages'><refentrytitle>poll</refentrytitle><manvolnum>3</manvolnum></citerefentry> or a similar
|
||||
function to wait for I/O events on the specified bus connection object. If the bus object was configured with the
|
||||
<citerefentry><refentrytitle>sd_bus_set_fd</refentrytitle><manvolnum>3</manvolnum></citerefentry> function, then
|
||||
the <parameter>input_fd</parameter> file descriptor used in that call is returned.</para>
|
||||
<function>sd_bus_set_fd()</function> function, then the <parameter>input_fd</parameter> file descriptor used in
|
||||
that call is returned.</para>
|
||||
|
||||
<para><function>sd_bus_set_fd()</function> sets the file descriptors used to communicate from a message bus
|
||||
object. Both <parameter>input_fd</parameter> and <parameter>output_fd</parameter> must be valid file descriptors.
|
||||
The same file descriptor may be used as both the input and the output file descriptor. This function must be called
|
||||
before the bus is started.</para>
|
||||
|
||||
<para><function>sd_bus_get_events()</function> returns the I/O events to wait for, suitable for passing to
|
||||
<function>poll()</function> or a similar call. Returns a combination of <constant>POLLIN</constant>,
|
||||
|
@ -96,14 +109,17 @@
|
|||
<refsect1>
|
||||
<title>Return Value</title>
|
||||
|
||||
<para><function>sd_bus_get_fd()</function> returns the file descriptor used for communication, or a negative
|
||||
<varname>errno</varname>-style error code on error.</para>
|
||||
<para>On success, <function>sd_bus_get_fd()</function> returns the file descriptor used for communication. On failure,
|
||||
it returns a negative errno-style error code.</para>
|
||||
|
||||
<para><function>sd_bus_get_events()</function> returns the I/O event mask to use for I/O event watching, or a
|
||||
negative <varname>errno</varname>-style error code on error.</para>
|
||||
<para>On success, <function>sd_bus_set_fd()</function> returns a non-negative integer. On failure, it returns a
|
||||
negative errno-style error code.</para>
|
||||
|
||||
<para><function>sd_bus_get_timeout()</function> returns zero or positive on success, or a negative
|
||||
<varname>errno</varname>-style error code on error.</para>
|
||||
<para>On success, <function>sd_bus_get_events()</function> returns the I/O event mask to use for I/O event watching.
|
||||
On failure, it returns a negative errno-style error code.</para>
|
||||
|
||||
<para>On success, <function>sd_bus_get_timeout()</function> returns a non-negative integer. On failure, it returns a
|
||||
negative errno-style error code.</para>
|
||||
|
||||
<refsect2>
|
||||
<title>Errors</title>
|
||||
|
@ -137,6 +153,19 @@
|
|||
<function>sd_bus_set_fd()</function>, which <function>sd_bus_get_fd()</function> cannot
|
||||
return.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><constant>-EBADF</constant></term>
|
||||
|
||||
<listitem><para>An invalid file descriptor was passed to <function>sd_bus_set_fd()</function>.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><constant>-ENOPKG</constant></term>
|
||||
|
||||
<listitem><para>The bus cannot be resolved.</para></listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
</refsect2>
|
||||
</refsect1>
|
||||
|
@ -149,7 +178,6 @@
|
|||
<para>
|
||||
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_set_fd</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_process</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_attach_event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>sd_bus_wait</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
|
||||
|
|
|
@ -36,7 +36,7 @@ static int parse_argv(
|
|||
for (i = 0; i < argc; i++) {
|
||||
const char *v;
|
||||
|
||||
if ((v = startswith(argv[1], "suspend="))) {
|
||||
if ((v = startswith(argv[i], "suspend="))) {
|
||||
int k;
|
||||
|
||||
k = parse_boolean(v);
|
||||
|
|
|
@ -543,9 +543,7 @@ static const NLType rtnl_link_types[] = {
|
|||
[IFLA_IFNAME] = { .type = NETLINK_TYPE_STRING, .size = IFNAMSIZ - 1 },
|
||||
[IFLA_MTU] = { .type = NETLINK_TYPE_U32 },
|
||||
[IFLA_LINK] = { .type = NETLINK_TYPE_U32 },
|
||||
/*
|
||||
[IFLA_QDISC],
|
||||
*/
|
||||
[IFLA_QDISC] = { .type = NETLINK_TYPE_STRING },
|
||||
[IFLA_STATS] = { .size = sizeof(struct rtnl_link_stats) },
|
||||
/*
|
||||
[IFLA_COST],
|
||||
|
|
|
@ -125,6 +125,7 @@ typedef struct LinkInfo {
|
|||
uint32_t max_mtu;
|
||||
uint32_t tx_queues;
|
||||
uint32_t rx_queues;
|
||||
char *qdisc;
|
||||
char **alternative_names;
|
||||
|
||||
union {
|
||||
|
@ -179,6 +180,7 @@ static const LinkInfo* link_info_array_free(LinkInfo *array) {
|
|||
for (unsigned i = 0; array && array[i].needs_freeing; i++) {
|
||||
sd_device_unref(array[i].sd_device);
|
||||
free(array[i].ssid);
|
||||
free(array[i].qdisc);
|
||||
strv_free(array[i].alternative_names);
|
||||
}
|
||||
|
||||
|
@ -249,7 +251,7 @@ static int decode_netdev(sd_netlink_message *m, LinkInfo *info) {
|
|||
|
||||
static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns, bool matched_patterns[]) {
|
||||
_cleanup_strv_free_ char **altnames = NULL;
|
||||
const char *name;
|
||||
const char *name, *qdisc;
|
||||
int ifindex, r;
|
||||
uint16_t type;
|
||||
|
||||
|
@ -333,6 +335,13 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns, b
|
|||
else if (sd_netlink_message_read(m, IFLA_STATS, sizeof info->stats, &info->stats) >= 0)
|
||||
info->has_stats = true;
|
||||
|
||||
r = sd_netlink_message_read_string(m, IFLA_QDISC, &qdisc);
|
||||
if (r >= 0) {
|
||||
info->qdisc = strdup(qdisc);
|
||||
if (!info->qdisc)
|
||||
return log_oom();
|
||||
}
|
||||
|
||||
/* fill kind info */
|
||||
(void) decode_netdev(m, info);
|
||||
|
||||
|
@ -1336,6 +1345,15 @@ static int link_status_one(
|
|||
return table_log_add_error(r);
|
||||
}
|
||||
|
||||
if (info->qdisc) {
|
||||
r = table_add_many(table,
|
||||
TABLE_EMPTY,
|
||||
TABLE_STRING, "QDisc:",
|
||||
TABLE_STRING, info->qdisc);
|
||||
if (r < 0)
|
||||
return table_log_add_error(r);
|
||||
}
|
||||
|
||||
if (streq_ptr(info->netdev_kind, "bridge")) {
|
||||
r = table_add_many(table,
|
||||
TABLE_EMPTY,
|
||||
|
|
|
@ -6,6 +6,7 @@ systemd-analyze log-level debug
|
|||
systemd-analyze log-target console
|
||||
|
||||
systemctl start issue_14566_test
|
||||
sleep 1
|
||||
systemctl status issue_14566_test
|
||||
|
||||
leaked_pid=$(cat /leakedtestpid)
|
||||
|
|
Loading…
Reference in New Issue