git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
ofproto
/
in-band.c
diff --git
a/ofproto/in-band.c
b/ofproto/in-band.c
index
0e4754c
..
1a08fcc
100644
(file)
--- a/
ofproto/in-band.c
+++ b/
ofproto/in-band.c
@@
-120,7
+120,7
@@
refresh_remote(struct in_band *ib, struct in_band_remote *r)
&next_hop_inaddr, &next_hop_dev);
if (retval) {
VLOG_WARN("cannot find route for controller ("IP_FMT"): %s",
&next_hop_inaddr, &next_hop_dev);
if (retval) {
VLOG_WARN("cannot find route for controller ("IP_FMT"): %s",
- IP_ARGS(
&r->remote_addr.sin
_addr), strerror(retval));
+ IP_ARGS(
r->remote_addr.sin_addr.s
_addr), strerror(retval));
return 1;
}
if (!next_hop_inaddr.s_addr) {
return 1;
}
if (!next_hop_inaddr.s_addr) {
@@
-137,7
+137,7
@@
refresh_remote(struct in_band *ib, struct in_band_remote *r)
if (retval) {
VLOG_WARN_RL(&rl, "cannot open netdev %s (next hop "
"to controller "IP_FMT"): %s",
if (retval) {
VLOG_WARN_RL(&rl, "cannot open netdev %s (next hop "
"to controller "IP_FMT"): %s",
- next_hop_dev, IP_ARGS(
&r->remote_addr.sin
_addr),
+ next_hop_dev, IP_ARGS(
r->remote_addr.sin_addr.s
_addr),
strerror(retval));
free(next_hop_dev);
return 1;
strerror(retval));
free(next_hop_dev);
return 1;
@@
-150,7
+150,7
@@
refresh_remote(struct in_band *ib, struct in_band_remote *r)
r->remote_mac);
if (retval) {
VLOG_DBG_RL(&rl, "cannot look up remote MAC address ("IP_FMT"): %s",
r->remote_mac);
if (retval) {
VLOG_DBG_RL(&rl, "cannot look up remote MAC address ("IP_FMT"): %s",
- IP_ARGS(
&
next_hop_inaddr.s_addr), strerror(retval));
+ IP_ARGS(next_hop_inaddr.s_addr), strerror(retval));
}
/* If we don't have a MAC address, then refresh quickly, since we probably
}
/* If we don't have a MAC address, then refresh quickly, since we probably
@@
-256,7
+256,7
@@
in_band_msg_in_hook(struct in_band *in_band, const struct flow *flow,
/* Returns true if the rule that would match 'flow' with 'actions' is
* allowed to be set up in the datapath. */
bool
/* Returns true if the rule that would match 'flow' with 'actions' is
* allowed to be set up in the datapath. */
bool
-in_band_rule_check(const struct flow *flow,
+in_band_rule_check(const struct flow *flow,
uint32_t local_odp_port,
const struct nlattr *actions, size_t actions_len)
{
/* Don't allow flows that would prevent DHCP replies from being seen
const struct nlattr *actions, size_t actions_len)
{
/* Don't allow flows that would prevent DHCP replies from being seen
@@
-270,7
+270,7
@@
in_band_rule_check(const struct flow *flow,
NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) {
if (nl_attr_type(a) == OVS_ACTION_ATTR_OUTPUT
NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) {
if (nl_attr_type(a) == OVS_ACTION_ATTR_OUTPUT
- && nl_attr_get_u32(a) ==
OVSP_LOCAL
) {
+ && nl_attr_get_u32(a) ==
local_odp_port
) {
return true;
}
}
return true;
}
}
@@
-464,7
+464,7
@@
in_band_create(struct ofproto *ofproto, const char *local_name,
int error;
*in_bandp = NULL;
int error;
*in_bandp = NULL;
- error = netdev_open(local_name, "
system
", &local_netdev);
+ error = netdev_open(local_name, "
internal
", &local_netdev);
if (error) {
VLOG_ERR("failed to initialize in-band control: cannot open "
"datapath local port %s (%s)", local_name, strerror(error));
if (error) {
VLOG_ERR("failed to initialize in-band control: cannot open "
"datapath local port %s (%s)", local_name, strerror(error));