network: rename QDiscs to QDisc
This commit is contained in:
parent
8efb93f02d
commit
edc54f2f75
|
@ -2585,7 +2585,7 @@ static int link_drop_config(Link *link) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static int link_configure_qdiscs(Link *link) {
|
static int link_configure_qdiscs(Link *link) {
|
||||||
QDiscs *qdisc;
|
QDisc *qdisc;
|
||||||
Iterator i;
|
Iterator i;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
@ -2601,7 +2601,7 @@ static int link_configure_qdiscs(Link *link) {
|
||||||
if (link->qdisc_messages == 0)
|
if (link->qdisc_messages == 0)
|
||||||
link->qdiscs_configured = true;
|
link->qdiscs_configured = true;
|
||||||
else
|
else
|
||||||
log_link_debug(link, "Configuring QDiscs");
|
log_link_debug(link, "Configuring queuing discipline (qdisc)");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -154,7 +154,7 @@ int network_verify(Network *network) {
|
||||||
Prefix *prefix, *prefix_next;
|
Prefix *prefix, *prefix_next;
|
||||||
Route *route, *route_next;
|
Route *route, *route_next;
|
||||||
FdbEntry *fdb, *fdb_next;
|
FdbEntry *fdb, *fdb_next;
|
||||||
QDiscs *qdisc;
|
QDisc *qdisc;
|
||||||
Iterator i;
|
Iterator i;
|
||||||
|
|
||||||
assert(network);
|
assert(network);
|
||||||
|
|
|
@ -34,7 +34,7 @@ int network_emulator_new(NetworkEmulator **ret) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int network_emulator_fill_message(Link *link, QDiscs *qdisc, sd_netlink_message *req) {
|
int network_emulator_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
|
||||||
struct tc_netem_qopt opt = {
|
struct tc_netem_qopt opt = {
|
||||||
.limit = 1000,
|
.limit = 1000,
|
||||||
};
|
};
|
||||||
|
@ -84,7 +84,7 @@ int config_parse_tc_network_emulator_delay(
|
||||||
void *data,
|
void *data,
|
||||||
void *userdata) {
|
void *userdata) {
|
||||||
|
|
||||||
_cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
|
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
|
||||||
Network *network = data;
|
Network *network = data;
|
||||||
usec_t u;
|
usec_t u;
|
||||||
int r;
|
int r;
|
||||||
|
@ -139,7 +139,7 @@ int config_parse_tc_network_emulator_rate(
|
||||||
void *data,
|
void *data,
|
||||||
void *userdata) {
|
void *userdata) {
|
||||||
|
|
||||||
_cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
|
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
|
||||||
Network *network = data;
|
Network *network = data;
|
||||||
uint32_t rate;
|
uint32_t rate;
|
||||||
int r;
|
int r;
|
||||||
|
@ -189,7 +189,7 @@ int config_parse_tc_network_emulator_packet_limit(
|
||||||
void *data,
|
void *data,
|
||||||
void *userdata) {
|
void *userdata) {
|
||||||
|
|
||||||
_cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
|
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
|
||||||
Network *network = data;
|
Network *network = data;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include "networkd-link.h"
|
#include "networkd-link.h"
|
||||||
#include "time-util.h"
|
#include "time-util.h"
|
||||||
|
|
||||||
typedef struct QDiscs QDiscs;
|
typedef struct QDisc QDisc;
|
||||||
|
|
||||||
typedef struct NetworkEmulator {
|
typedef struct NetworkEmulator {
|
||||||
usec_t delay;
|
usec_t delay;
|
||||||
|
@ -20,7 +20,7 @@ typedef struct NetworkEmulator {
|
||||||
} NetworkEmulator;
|
} NetworkEmulator;
|
||||||
|
|
||||||
int network_emulator_new(NetworkEmulator **ret);
|
int network_emulator_new(NetworkEmulator **ret);
|
||||||
int network_emulator_fill_message(Link *link, QDiscs *qdisc, sd_netlink_message *req);
|
int network_emulator_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req);
|
||||||
|
|
||||||
CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_delay);
|
CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_delay);
|
||||||
CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_rate);
|
CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_rate);
|
||||||
|
|
|
@ -14,14 +14,14 @@
|
||||||
#include "string-util.h"
|
#include "string-util.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
static int qdisc_new(QDiscs **ret) {
|
static int qdisc_new(QDisc **ret) {
|
||||||
QDiscs *qdisc;
|
QDisc *qdisc;
|
||||||
|
|
||||||
qdisc = new(QDiscs, 1);
|
qdisc = new(QDisc, 1);
|
||||||
if (!qdisc)
|
if (!qdisc)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
*qdisc = (QDiscs) {
|
*qdisc = (QDisc) {
|
||||||
.family = AF_UNSPEC,
|
.family = AF_UNSPEC,
|
||||||
.parent = TC_H_ROOT,
|
.parent = TC_H_ROOT,
|
||||||
};
|
};
|
||||||
|
@ -31,9 +31,9 @@ static int qdisc_new(QDiscs **ret) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDiscs **ret) {
|
int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDisc **ret) {
|
||||||
_cleanup_(network_config_section_freep) NetworkConfigSection *n = NULL;
|
_cleanup_(network_config_section_freep) NetworkConfigSection *n = NULL;
|
||||||
_cleanup_(qdisc_freep) QDiscs *qdisc = NULL;
|
_cleanup_(qdisc_freep) QDisc *qdisc = NULL;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
assert(network);
|
assert(network);
|
||||||
|
@ -76,7 +76,7 @@ int qdisc_new_static(Network *network, const char *filename, unsigned section_li
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void qdisc_free(QDiscs *qdisc) {
|
void qdisc_free(QDisc *qdisc) {
|
||||||
if (!qdisc)
|
if (!qdisc)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ static int qdisc_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (link->route_messages == 0) {
|
if (link->route_messages == 0) {
|
||||||
log_link_debug(link, "QDiscs configured");
|
log_link_debug(link, "QDisc configured");
|
||||||
link->qdiscs_configured = true;
|
link->qdiscs_configured = true;
|
||||||
link_check_ready(link);
|
link_check_ready(link);
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,7 @@ static int qdisc_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int qdisc_configure(Link *link, QDiscs *qdisc) {
|
int qdisc_configure(Link *link, QDisc *qdisc) {
|
||||||
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
|
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
|
||||||
_cleanup_free_ char *tca_kind = NULL;
|
_cleanup_free_ char *tca_kind = NULL;
|
||||||
int r;
|
int r;
|
||||||
|
@ -178,7 +178,7 @@ int qdisc_configure(Link *link, QDiscs *qdisc) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int qdisc_section_verify(QDiscs *qdisc, bool *has_root, bool *has_clsact) {
|
int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact) {
|
||||||
assert(qdisc);
|
assert(qdisc);
|
||||||
assert(has_root);
|
assert(has_root);
|
||||||
assert(has_clsact);
|
assert(has_clsact);
|
||||||
|
@ -223,7 +223,7 @@ int config_parse_tc_qdiscs_parent(
|
||||||
void *data,
|
void *data,
|
||||||
void *userdata) {
|
void *userdata) {
|
||||||
|
|
||||||
_cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
|
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
|
||||||
Network *network = data;
|
Network *network = data;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "networkd-util.h"
|
#include "networkd-util.h"
|
||||||
#include "tbf.h"
|
#include "tbf.h"
|
||||||
|
|
||||||
typedef struct QDiscs {
|
typedef struct QDisc {
|
||||||
NetworkConfigSection *section;
|
NetworkConfigSection *section;
|
||||||
Network *network;
|
Network *network;
|
||||||
|
|
||||||
|
@ -25,15 +25,15 @@ typedef struct QDiscs {
|
||||||
|
|
||||||
NetworkEmulator ne;
|
NetworkEmulator ne;
|
||||||
TokenBufferFilter tbf;
|
TokenBufferFilter tbf;
|
||||||
} QDiscs;
|
} QDisc;
|
||||||
|
|
||||||
void qdisc_free(QDiscs *qdisc);
|
void qdisc_free(QDisc *qdisc);
|
||||||
int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDiscs **ret);
|
int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDisc **ret);
|
||||||
|
|
||||||
int qdisc_configure(Link *link, QDiscs *qdisc);
|
int qdisc_configure(Link *link, QDisc *qdisc);
|
||||||
|
|
||||||
int qdisc_section_verify(QDiscs *qdisc, bool *has_root, bool *has_clsact);
|
int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact);
|
||||||
|
|
||||||
DEFINE_NETWORK_SECTION_FUNCTIONS(QDiscs, qdisc_free);
|
DEFINE_NETWORK_SECTION_FUNCTIONS(QDisc, qdisc_free);
|
||||||
|
|
||||||
CONFIG_PARSER_PROTOTYPE(config_parse_tc_qdiscs_parent);
|
CONFIG_PARSER_PROTOTYPE(config_parse_tc_qdiscs_parent);
|
||||||
|
|
|
@ -74,7 +74,7 @@ int config_parse_tc_token_buffer_filter_size(
|
||||||
void *data,
|
void *data,
|
||||||
void *userdata) {
|
void *userdata) {
|
||||||
|
|
||||||
_cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
|
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
|
||||||
Network *network = data;
|
Network *network = data;
|
||||||
uint64_t k;
|
uint64_t k;
|
||||||
int r;
|
int r;
|
||||||
|
@ -129,7 +129,7 @@ int config_parse_tc_token_buffer_filter_latency(
|
||||||
void *data,
|
void *data,
|
||||||
void *userdata) {
|
void *userdata) {
|
||||||
|
|
||||||
_cleanup_(qdisc_free_or_set_invalidp) QDiscs *qdisc = NULL;
|
_cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
|
||||||
Network *network = data;
|
Network *network = data;
|
||||||
usec_t u;
|
usec_t u;
|
||||||
int r;
|
int r;
|
||||||
|
|
Loading…
Reference in a new issue