projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-client: Improve HTML output.
[openvswitch]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index 88f8db112365cd5704aa264a5bedc7d3160ed436..c2e89eb838de330afc06f2c0b4c0f25b9ad1a1b6 100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-199,6
+199,9
@@
static void bridge_destroy(struct bridge *);
static struct bridge *bridge_lookup(const char *name);
static unixctl_cb_func bridge_unixctl_dump_flows;
static int bridge_run_one(struct bridge *);
static struct bridge *bridge_lookup(const char *name);
static unixctl_cb_func bridge_unixctl_dump_flows;
static int bridge_run_one(struct bridge *);
+static const struct ovsrec_controller *bridge_get_controller(
+ const struct ovsrec_open_vswitch *ovs_cfg,
+ const struct bridge *br);
static void bridge_reconfigure_one(const struct ovsrec_open_vswitch *,
struct bridge *);
static void bridge_reconfigure_controller(const struct ovsrec_open_vswitch *,
static void bridge_reconfigure_one(const struct ovsrec_open_vswitch *,
struct bridge *);
static void bridge_reconfigure_controller(const struct ovsrec_open_vswitch *,
@@
-449,8
+452,8
@@
reconfigure_iface(const struct ovsrec_interface *iface_cfg, struct iface *iface)
}
static bool
}
static bool
-check_iface_netdev(struct bridge *br UNUSED, struct iface *iface,
- void *aux UNUSED)
+check_iface_netdev(struct bridge *br
OVS_
UNUSED, struct iface *iface,
+ void *aux
OVS_
UNUSED)
{
if (!iface->netdev) {
int error = set_up_iface(iface->cfg, iface, true);
{
if (!iface->netdev) {
int error = set_up_iface(iface->cfg, iface, true);
@@
-465,7
+468,8
@@
check_iface_netdev(struct bridge *br UNUSED, struct iface *iface,
}
static bool
}
static bool
-check_iface_dp_ifidx(struct bridge *br, struct iface *iface, void *aux UNUSED)
+check_iface_dp_ifidx(struct bridge *br, struct iface *iface,
+ void *aux OVS_UNUSED)
{
if (iface->dp_ifidx >= 0) {
VLOG_DBG("%s has interface %s on port %d",
{
if (iface->dp_ifidx >= 0) {
VLOG_DBG("%s has interface %s on port %d",
@@
-480,8
+484,8
@@
check_iface_dp_ifidx(struct bridge *br, struct iface *iface, void *aux UNUSED)
}
static bool
}
static bool
-set_iface_properties(struct bridge *br UNUSED, struct iface *iface,
-
void *aux
UNUSED)
+set_iface_properties(struct bridge *br
OVS_
UNUSED, struct iface *iface,
+
void *aux OVS_
UNUSED)
{
/* Set policing attributes. */
netdev_set_policing(iface->netdev,
{
/* Set policing attributes. */
netdev_set_policing(iface->netdev,
@@
-755,7
+759,8
@@
bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
/* Set sFlow configuration on this bridge. */
if (br->cfg->sflow) {
/* Set sFlow configuration on this bridge. */
if (br->cfg->sflow) {
- struct ovsrec_sflow *sflow_cfg = br->cfg->sflow;
+ const struct ovsrec_sflow *sflow_cfg = br->cfg->sflow;
+ const struct ovsrec_controller *ctrl;
struct ofproto_sflow_options oso;
memset(&oso, 0, sizeof oso);
struct ofproto_sflow_options oso;
memset(&oso, 0, sizeof oso);
@@
-781,10
+786,8
@@
bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
oso.sub_id = sflow_bridge_number++;
oso.agent_device = sflow_cfg->agent;
oso.sub_id = sflow_bridge_number++;
oso.agent_device = sflow_cfg->agent;
-#if 0 /* xxx foo */
ctrl = bridge_get_controller(ovs_cfg, br);
oso.control_ip = ctrl ? ctrl->local_ip : NULL;
ctrl = bridge_get_controller(ovs_cfg, br);
oso.control_ip = ctrl ? ctrl->local_ip : NULL;
-#endif
ofproto_set_sflow(br->ofproto, &oso);
svec_destroy(&oso.targets);
ofproto_set_sflow(br->ofproto, &oso);
svec_destroy(&oso.targets);
@@
-1097,7
+1100,7
@@
bridge_get_local_iface(struct bridge *br)
/* Bridge unixctl user interface functions. */
static void
bridge_unixctl_fdb_show(struct unixctl_conn *conn,
/* Bridge unixctl user interface functions. */
static void
bridge_unixctl_fdb_show(struct unixctl_conn *conn,
- const char *args, void *aux UNUSED)
+ const char *args, void *aux
OVS_
UNUSED)
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct bridge *br;
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct bridge *br;
@@
-1155,7
+1158,7
@@
bridge_create(const struct ovsrec_bridge *br_cfg)
br->cfg = br_cfg;
br->ml = mac_learning_create();
br->sent_config_request = false;
br->cfg = br_cfg;
br->ml = mac_learning_create();
br->sent_config_request = false;
- eth_addr_random(br->default_ea);
+ eth_addr_
nicira_
random(br->default_ea);
port_array_init(&br->ifaces);
port_array_init(&br->ifaces);
@@
-1225,7
+1228,7
@@
bridge_get_datapathid(const char *name)
* stack, including those normally hidden. */
static void
bridge_unixctl_dump_flows(struct unixctl_conn *conn,
* stack, including those normally hidden. */
static void
bridge_unixctl_dump_flows(struct unixctl_conn *conn,
- const char *args, void *aux UNUSED)
+ const char *args, void *aux
OVS_
UNUSED)
{
struct bridge *br;
struct ds results;
{
struct bridge *br;
struct ds results;
@@
-1470,7
+1473,7
@@
bridge_reconfigure_controller(const struct ovsrec_open_vswitch *ovs_cfg,
local_iface = bridge_get_local_iface(br);
if (local_iface && c->local_ip && inet_aton(c->local_ip, &ip)) {
struct netdev *netdev = local_iface->netdev;
local_iface = bridge_get_local_iface(br);
if (local_iface && c->local_ip && inet_aton(c->local_ip, &ip)) {
struct netdev *netdev = local_iface->netdev;
- struct in_addr
ip,
mask, gateway;
+ struct in_addr mask, gateway;
if (!c->local_netmask || !inet_aton(c->local_netmask, &mask)) {
mask.s_addr = 0;
if (!c->local_netmask || !inet_aton(c->local_netmask, &mask)) {
mask.s_addr = 0;
@@
-1992,7
+1995,7
@@
compose_dsts(const struct bridge *br, const flow_t *flow, uint16_t vlan,
return dst - dsts;
}
return dst - dsts;
}
-static void UNUSED
+static void
OVS_
UNUSED
print_dsts(const struct dst *dsts, size_t n)
{
for (; n--; dsts++) {
print_dsts(const struct dst *dsts, size_t n)
{
for (; n--; dsts++) {
@@
-2707,7
+2710,7
@@
bond_send_learning_packets(struct port *port)
static void
bond_unixctl_list(struct unixctl_conn *conn,
static void
bond_unixctl_list(struct unixctl_conn *conn,
- const char *args
UNUSED, void *aux
UNUSED)
+ const char *args
OVS_UNUSED, void *aux OVS_
UNUSED)
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct bridge *br;
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct bridge *br;
@@
-2758,7
+2761,7
@@
bond_find(const char *name)
static void
bond_unixctl_show(struct unixctl_conn *conn,
static void
bond_unixctl_show(struct unixctl_conn *conn,
- const char *args, void *aux UNUSED)
+ const char *args, void *aux
OVS_
UNUSED)
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct port *port;
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct port *port;
@@
-2824,7
+2827,7
@@
bond_unixctl_show(struct unixctl_conn *conn,
static void
bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_,
static void
bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_,
- void *aux UNUSED)
+ void *aux
OVS_
UNUSED)
{
char *args = (char *) args_;
char *save_ptr = NULL;
{
char *args = (char *) args_;
char *save_ptr = NULL;
@@
-2881,7
+2884,7
@@
bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_,
static void
bond_unixctl_set_active_slave(struct unixctl_conn *conn, const char *args_,
static void
bond_unixctl_set_active_slave(struct unixctl_conn *conn, const char *args_,
- void *aux UNUSED)
+ void *aux
OVS_
UNUSED)
{
char *args = (char *) args_;
char *save_ptr = NULL;
{
char *args = (char *) args_;
char *save_ptr = NULL;
@@
-2962,21
+2965,21
@@
enable_slave(struct unixctl_conn *conn, const char *args_, bool enable)
static void
bond_unixctl_enable_slave(struct unixctl_conn *conn, const char *args,
static void
bond_unixctl_enable_slave(struct unixctl_conn *conn, const char *args,
- void *aux UNUSED)
+ void *aux
OVS_
UNUSED)
{
enable_slave(conn, args, true);
}
static void
bond_unixctl_disable_slave(struct unixctl_conn *conn, const char *args,
{
enable_slave(conn, args, true);
}
static void
bond_unixctl_disable_slave(struct unixctl_conn *conn, const char *args,
- void *aux UNUSED)
+ void *aux
OVS_
UNUSED)
{
enable_slave(conn, args, false);
}
static void
bond_unixctl_hash(struct unixctl_conn *conn, const char *args,
{
enable_slave(conn, args, false);
}
static void
bond_unixctl_hash(struct unixctl_conn *conn, const char *args,
- void *aux UNUSED)
+ void *aux
OVS_
UNUSED)
{
uint8_t mac[ETH_ADDR_LEN];
uint8_t hash;
{
uint8_t mac[ETH_ADDR_LEN];
uint8_t hash;
@@
-3081,7
+3084,7
@@
port_reconfigure(struct port *port, const struct ovsrec_port *cfg)
iface = shash_find_data(&old_ifaces, if_cfg->name);
if (!iface) {
iface = shash_find_data(&old_ifaces, if_cfg->name);
if (!iface) {
- iface
= iface
_create(port, if_cfg);
+ iface_create(port, if_cfg);
} else {
iface->cfg = if_cfg;
}
} else {
iface->cfg = if_cfg;
}
@@
-3678,7
+3681,7
@@
mirror_collect_vlans(struct mirror *m, const struct ovsrec_mirror *cfg,
size_t n_vlans;
size_t i;
size_t n_vlans;
size_t i;
- *vlans = xmalloc(sizeof *vlans * cfg->n_select_vlan);
+ *vlans = xmalloc(sizeof *
*
vlans * cfg->n_select_vlan);
n_vlans = 0;
for (i = 0; i < cfg->n_select_vlan; i++) {
int64_t vlan = cfg->select_vlan[i];
n_vlans = 0;
for (i = 0; i < cfg->n_select_vlan; i++) {
int64_t vlan = cfg->select_vlan[i];