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]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index
e7dd597
..
aa4ab31
100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-2823,7
+2823,8
@@
bridge_configure_local_iface_netdev(struct bridge *br,
/* If there's no local interface or no IP address, give up. */
local_iface = iface_from_ofp_port(br, OFPP_LOCAL);
/* If there's no local interface or no IP address, give up. */
local_iface = iface_from_ofp_port(br, OFPP_LOCAL);
- if (!local_iface || !c->local_ip || !inet_aton(c->local_ip, &ip)) {
+ if (!local_iface || !c->local_ip
+ || !inet_pton(AF_INET, c->local_ip, &ip)) {
return;
}
return;
}
@@
-2833,7
+2834,7
@@
bridge_configure_local_iface_netdev(struct bridge *br,
/* Configure the IP address and netmask. */
if (!c->local_netmask
/* Configure the IP address and netmask. */
if (!c->local_netmask
- || !inet_
aton(
c->local_netmask, &mask)
+ || !inet_
pton(AF_INET,
c->local_netmask, &mask)
|| !mask.s_addr) {
mask.s_addr = guess_netmask(ip.s_addr);
}
|| !mask.s_addr) {
mask.s_addr = guess_netmask(ip.s_addr);
}
@@
-2844,7
+2845,7
@@
bridge_configure_local_iface_netdev(struct bridge *br,
/* Configure the default gateway. */
if (c->local_gateway
/* Configure the default gateway. */
if (c->local_gateway
- && inet_
aton(
c->local_gateway, &gateway)
+ && inet_
pton(AF_INET,
c->local_gateway, &gateway)
&& gateway.s_addr) {
if (!netdev_add_router(netdev, gateway)) {
VLOG_INFO("bridge %s: configured gateway "IP_FMT,
&& gateway.s_addr) {
if (!netdev_add_router(netdev, gateway)) {
VLOG_INFO("bridge %s: configured gateway "IP_FMT,