Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
c97cfce2
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c97cfce2
编写于
3月 25, 2014
作者:
J
Ján Tomko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Indent top-level labels by one space in src/network/
上级
1577e2d4
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
66 addition
and
66 deletion
+66
-66
src/network/bridge_driver.c
src/network/bridge_driver.c
+46
-46
src/network/bridge_driver_linux.c
src/network/bridge_driver_linux.c
+20
-20
未找到文件。
src/network/bridge_driver.c
浏览文件 @
c97cfce2
...
@@ -188,7 +188,7 @@ networkRunHook(virNetworkObjPtr network,
...
@@ -188,7 +188,7 @@ networkRunHook(virNetworkObjPtr network,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virBufferFreeAndReset
(
&
buf
);
virBufferFreeAndReset
(
&
buf
);
VIR_FREE
(
xml
);
VIR_FREE
(
xml
);
VIR_FREE
(
net_xml
);
VIR_FREE
(
net_xml
);
...
@@ -293,7 +293,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver,
...
@@ -293,7 +293,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
leasefile
);
VIR_FREE
(
leasefile
);
VIR_FREE
(
configfile
);
VIR_FREE
(
configfile
);
VIR_FREE
(
radvdconfigfile
);
VIR_FREE
(
radvdconfigfile
);
...
@@ -534,12 +534,12 @@ networkStateInitialize(bool privileged,
...
@@ -534,12 +534,12 @@ networkStateInitialize(bool privileged,
#endif
#endif
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
configdir
);
VIR_FREE
(
configdir
);
VIR_FREE
(
rundir
);
VIR_FREE
(
rundir
);
return
ret
;
return
ret
;
error:
error:
if
(
driverState
)
if
(
driverState
)
networkDriverUnlock
(
driverState
);
networkDriverUnlock
(
driverState
);
networkStateCleanup
();
networkStateCleanup
();
...
@@ -680,7 +680,7 @@ networkKillDaemon(pid_t pid, const char *daemonName, const char *networkName)
...
@@ -680,7 +680,7 @@ networkKillDaemon(pid_t pid, const char *daemonName, const char *networkName)
VIR_WARN
(
"Timed out waiting after SIG%s to %s process %d "
VIR_WARN
(
"Timed out waiting after SIG%s to %s process %d "
"(network '%s')"
,
"(network '%s')"
,
signame
,
daemonName
,
pid
,
networkName
);
signame
,
daemonName
,
pid
,
networkName
);
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -1084,7 +1084,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
...
@@ -1084,7 +1084,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virBufferFreeAndReset
(
&
configbuf
);
virBufferFreeAndReset
(
&
configbuf
);
VIR_FREE
(
record
);
VIR_FREE
(
record
);
VIR_FREE
(
recordPort
);
VIR_FREE
(
recordPort
);
...
@@ -1128,7 +1128,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network,
...
@@ -1128,7 +1128,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network,
virCommandAddArgFormat
(
cmd
,
"--conf-file=%s"
,
configfile
);
virCommandAddArgFormat
(
cmd
,
"--conf-file=%s"
,
configfile
);
*
cmdout
=
cmd
;
*
cmdout
=
cmd
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
configfile
);
VIR_FREE
(
configfile
);
VIR_FREE
(
configstr
);
VIR_FREE
(
configstr
);
return
ret
;
return
ret
;
...
@@ -1208,7 +1208,7 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver,
...
@@ -1208,7 +1208,7 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver,
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
pidfile
);
VIR_FREE
(
pidfile
);
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
dnsmasqContextFree
(
dctx
);
dnsmasqContextFree
(
dctx
);
...
@@ -1278,7 +1278,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
...
@@ -1278,7 +1278,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
goto
cleanup
;
goto
cleanup
;
ret
=
kill
(
network
->
dnsmasqPid
,
SIGHUP
);
ret
=
kill
(
network
->
dnsmasqPid
,
SIGHUP
);
cleanup:
cleanup:
dnsmasqContextFree
(
dctx
);
dnsmasqContextFree
(
dctx
);
return
ret
;
return
ret
;
}
}
...
@@ -1390,7 +1390,7 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr)
...
@@ -1390,7 +1390,7 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr)
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virBufferFreeAndReset
(
&
configbuf
);
virBufferFreeAndReset
(
&
configbuf
);
return
ret
;
return
ret
;
}
}
...
@@ -1428,7 +1428,7 @@ networkRadvdConfWrite(virNetworkObjPtr network, char **configFile)
...
@@ -1428,7 +1428,7 @@ networkRadvdConfWrite(virNetworkObjPtr network, char **configFile)
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
configStr
);
VIR_FREE
(
configStr
);
VIR_FREE
(
myConfigFile
);
VIR_FREE
(
myConfigFile
);
return
ret
;
return
ret
;
...
@@ -1512,7 +1512,7 @@ networkStartRadvd(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED,
...
@@ -1512,7 +1512,7 @@ networkStartRadvd(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED,
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
VIR_FREE
(
configfile
);
VIR_FREE
(
configfile
);
VIR_FREE
(
radvdpidbase
);
VIR_FREE
(
radvdpidbase
);
...
@@ -1729,7 +1729,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr network)
...
@@ -1729,7 +1729,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr network)
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
field
);
VIR_FREE
(
field
);
return
ret
;
return
ret
;
}
}
...
@@ -2117,7 +2117,7 @@ networkStartNetwork(virNetworkDriverStatePtr driver,
...
@@ -2117,7 +2117,7 @@ networkStartNetwork(virNetworkDriverStatePtr driver,
VIR_INFO
(
"Network '%s' started up"
,
network
->
def
->
name
);
VIR_INFO
(
"Network '%s' started up"
,
network
->
def
->
name
);
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
virNetworkObjUnsetDefTransient
(
network
);
virNetworkObjUnsetDefTransient
(
network
);
virErrorPtr
save_err
=
virSaveLastError
();
virErrorPtr
save_err
=
virSaveLastError
();
...
@@ -2197,7 +2197,7 @@ static virNetworkPtr networkLookupByUUID(virConnectPtr conn,
...
@@ -2197,7 +2197,7 @@ static virNetworkPtr networkLookupByUUID(virConnectPtr conn,
ret
=
virGetNetwork
(
conn
,
network
->
def
->
name
,
network
->
def
->
uuid
);
ret
=
virGetNetwork
(
conn
,
network
->
def
->
name
,
network
->
def
->
uuid
);
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
ret
;
return
ret
;
...
@@ -2224,7 +2224,7 @@ static virNetworkPtr networkLookupByName(virConnectPtr conn,
...
@@ -2224,7 +2224,7 @@ static virNetworkPtr networkLookupByName(virConnectPtr conn,
ret
=
virGetNetwork
(
conn
,
network
->
def
->
name
,
network
->
def
->
uuid
);
ret
=
virGetNetwork
(
conn
,
network
->
def
->
name
,
network
->
def
->
uuid
);
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
ret
;
return
ret
;
...
@@ -2379,7 +2379,7 @@ networkConnectListAllNetworks(virConnectPtr conn,
...
@@ -2379,7 +2379,7 @@ networkConnectListAllNetworks(virConnectPtr conn,
flags
);
flags
);
networkDriverUnlock
(
driver
);
networkDriverUnlock
(
driver
);
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -2402,7 +2402,7 @@ networkConnectNetworkEventRegisterAny(virConnectPtr conn,
...
@@ -2402,7 +2402,7 @@ networkConnectNetworkEventRegisterAny(virConnectPtr conn,
opaque
,
freecb
,
&
ret
)
<
0
)
opaque
,
freecb
,
&
ret
)
<
0
)
ret
=
-
1
;
ret
=
-
1
;
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -2423,7 +2423,7 @@ networkConnectNetworkEventDeregisterAny(virConnectPtr conn,
...
@@ -2423,7 +2423,7 @@ networkConnectNetworkEventDeregisterAny(virConnectPtr conn,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -2440,7 +2440,7 @@ static int networkIsActive(virNetworkPtr net)
...
@@ -2440,7 +2440,7 @@ static int networkIsActive(virNetworkPtr net)
ret
=
virNetworkObjIsActive
(
obj
);
ret
=
virNetworkObjIsActive
(
obj
);
cleanup:
cleanup:
if
(
obj
)
if
(
obj
)
virNetworkObjUnlock
(
obj
);
virNetworkObjUnlock
(
obj
);
return
ret
;
return
ret
;
...
@@ -2459,7 +2459,7 @@ static int networkIsPersistent(virNetworkPtr net)
...
@@ -2459,7 +2459,7 @@ static int networkIsPersistent(virNetworkPtr net)
ret
=
obj
->
persistent
;
ret
=
obj
->
persistent
;
cleanup:
cleanup:
if
(
obj
)
if
(
obj
)
virNetworkObjUnlock
(
obj
);
virNetworkObjUnlock
(
obj
);
return
ret
;
return
ret
;
...
@@ -2673,7 +2673,7 @@ static virNetworkPtr networkCreateXML(virConnectPtr conn, const char *xml)
...
@@ -2673,7 +2673,7 @@ static virNetworkPtr networkCreateXML(virConnectPtr conn, const char *xml)
VIR_INFO
(
"Creating network '%s'"
,
network
->
def
->
name
);
VIR_INFO
(
"Creating network '%s'"
,
network
->
def
->
name
);
ret
=
virGetNetwork
(
conn
,
network
->
def
->
name
,
network
->
def
->
uuid
);
ret
=
virGetNetwork
(
conn
,
network
->
def
->
name
,
network
->
def
->
uuid
);
cleanup:
cleanup:
virNetworkDefFree
(
def
);
virNetworkDefFree
(
def
);
if
(
event
)
if
(
event
)
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
...
@@ -2737,7 +2737,7 @@ static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml)
...
@@ -2737,7 +2737,7 @@ static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml)
VIR_INFO
(
"Defining network '%s'"
,
def
->
name
);
VIR_INFO
(
"Defining network '%s'"
,
def
->
name
);
ret
=
virGetNetwork
(
conn
,
def
->
name
,
def
->
uuid
);
ret
=
virGetNetwork
(
conn
,
def
->
name
,
def
->
uuid
);
cleanup:
cleanup:
if
(
event
)
if
(
event
)
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
if
(
freeDef
)
if
(
freeDef
)
...
@@ -2799,7 +2799,7 @@ networkUndefine(virNetworkPtr net)
...
@@ -2799,7 +2799,7 @@ networkUndefine(virNetworkPtr net)
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
event
)
if
(
event
)
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
if
(
network
)
if
(
network
)
...
@@ -2974,7 +2974,7 @@ networkUpdate(virNetworkPtr net,
...
@@ -2974,7 +2974,7 @@ networkUpdate(virNetworkPtr net,
}
}
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
networkDriverUnlock
(
driver
);
networkDriverUnlock
(
driver
);
...
@@ -3007,7 +3007,7 @@ static int networkCreate(virNetworkPtr net)
...
@@ -3007,7 +3007,7 @@ static int networkCreate(virNetworkPtr net)
VIR_NETWORK_EVENT_STARTED
,
VIR_NETWORK_EVENT_STARTED
,
0
);
0
);
cleanup:
cleanup:
if
(
event
)
if
(
event
)
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
if
(
network
)
if
(
network
)
...
@@ -3058,7 +3058,7 @@ static int networkDestroy(virNetworkPtr net)
...
@@ -3058,7 +3058,7 @@ static int networkDestroy(virNetworkPtr net)
network
=
NULL
;
network
=
NULL
;
}
}
cleanup:
cleanup:
if
(
event
)
if
(
event
)
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
virObjectEventStateQueue
(
driver
->
networkEventState
,
event
);
if
(
network
)
if
(
network
)
...
@@ -3089,7 +3089,7 @@ static char *networkGetXMLDesc(virNetworkPtr net,
...
@@ -3089,7 +3089,7 @@ static char *networkGetXMLDesc(virNetworkPtr net,
ret
=
virNetworkDefFormat
(
def
,
flags
);
ret
=
virNetworkDefFormat
(
def
,
flags
);
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
ret
;
return
ret
;
...
@@ -3114,7 +3114,7 @@ static char *networkGetBridgeName(virNetworkPtr net) {
...
@@ -3114,7 +3114,7 @@ static char *networkGetBridgeName(virNetworkPtr net) {
ignore_value
(
VIR_STRDUP
(
bridge
,
network
->
def
->
bridge
));
ignore_value
(
VIR_STRDUP
(
bridge
,
network
->
def
->
bridge
));
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
bridge
;
return
bridge
;
...
@@ -3135,7 +3135,7 @@ static int networkGetAutostart(virNetworkPtr net,
...
@@ -3135,7 +3135,7 @@ static int networkGetAutostart(virNetworkPtr net,
*
autostart
=
network
->
autostart
;
*
autostart
=
network
->
autostart
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
ret
;
return
ret
;
...
@@ -3202,7 +3202,7 @@ static int networkSetAutostart(virNetworkPtr net,
...
@@ -3202,7 +3202,7 @@ static int networkSetAutostart(virNetworkPtr net,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
configFile
);
VIR_FREE
(
configFile
);
VIR_FREE
(
autostartLink
);
VIR_FREE
(
autostartLink
);
if
(
network
)
if
(
network
)
...
@@ -3326,7 +3326,7 @@ networkCreateInterfacePool(virNetworkDefPtr netdef)
...
@@ -3326,7 +3326,7 @@ networkCreateInterfacePool(virNetworkDefPtr netdef)
}
}
ret
=
0
;
ret
=
0
;
finish:
finish:
for
(
i
=
0
;
i
<
num_virt_fns
;
i
++
)
{
for
(
i
=
0
;
i
<
num_virt_fns
;
i
++
)
{
VIR_FREE
(
vfname
[
i
]);
VIR_FREE
(
vfname
[
i
]);
VIR_FREE
(
virt_fns
[
i
]);
VIR_FREE
(
virt_fns
[
i
]);
...
@@ -3651,7 +3651,7 @@ networkAllocateActualDevice(virDomainDefPtr dom,
...
@@ -3651,7 +3651,7 @@ networkAllocateActualDevice(virDomainDefPtr dom,
if
(
virNetDevVPortProfileCheckComplete
(
virtport
,
true
)
<
0
)
if
(
virNetDevVPortProfileCheckComplete
(
virtport
,
true
)
<
0
)
goto
error
;
goto
error
;
validate:
validate:
/* make sure that everything now specified for the device is
/* make sure that everything now specified for the device is
* actually supported on this type of network. NB: network,
* actually supported on this type of network. NB: network,
* netdev, and iface->data.network.actual may all be NULL.
* netdev, and iface->data.network.actual may all be NULL.
...
@@ -3716,12 +3716,12 @@ validate:
...
@@ -3716,12 +3716,12 @@ validate:
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
ret
;
return
ret
;
error:
error:
if
(
iface
->
type
==
VIR_DOMAIN_NET_TYPE_NETWORK
)
{
if
(
iface
->
type
==
VIR_DOMAIN_NET_TYPE_NETWORK
)
{
virDomainActualNetDefFree
(
iface
->
data
.
network
.
actual
);
virDomainActualNetDefFree
(
iface
->
data
.
network
.
actual
);
iface
->
data
.
network
.
actual
=
NULL
;
iface
->
data
.
network
.
actual
=
NULL
;
...
@@ -3894,7 +3894,7 @@ networkNotifyActualDevice(virDomainDefPtr dom,
...
@@ -3894,7 +3894,7 @@ networkNotifyActualDevice(virDomainDefPtr dom,
dev
->
connections
);
dev
->
connections
);
}
}
success:
success:
netdef
->
connections
++
;
netdef
->
connections
++
;
VIR_DEBUG
(
"Using network %s, %d connections"
,
VIR_DEBUG
(
"Using network %s, %d connections"
,
netdef
->
name
,
netdef
->
connections
);
netdef
->
name
,
netdef
->
connections
);
...
@@ -3910,12 +3910,12 @@ success:
...
@@ -3910,12 +3910,12 @@ success:
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
ret
;
return
ret
;
error:
error:
goto
cleanup
;
goto
cleanup
;
}
}
...
@@ -4050,7 +4050,7 @@ networkReleaseActualDevice(virDomainDefPtr dom,
...
@@ -4050,7 +4050,7 @@ networkReleaseActualDevice(virDomainDefPtr dom,
dev
->
connections
);
dev
->
connections
);
}
}
success:
success:
if
(
iface
->
data
.
network
.
actual
)
{
if
(
iface
->
data
.
network
.
actual
)
{
netdef
->
connections
--
;
netdef
->
connections
--
;
VIR_DEBUG
(
"Releasing network %s, %d connections"
,
VIR_DEBUG
(
"Releasing network %s, %d connections"
,
...
@@ -4061,7 +4061,7 @@ success:
...
@@ -4061,7 +4061,7 @@ success:
VIR_HOOK_SUBOP_BEGIN
);
VIR_HOOK_SUBOP_BEGIN
);
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
if
(
iface
->
type
==
VIR_DOMAIN_NET_TYPE_NETWORK
)
{
if
(
iface
->
type
==
VIR_DOMAIN_NET_TYPE_NETWORK
)
{
...
@@ -4070,7 +4070,7 @@ cleanup:
...
@@ -4070,7 +4070,7 @@ cleanup:
}
}
return
ret
;
return
ret
;
error:
error:
goto
cleanup
;
goto
cleanup
;
}
}
...
@@ -4165,12 +4165,12 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
...
@@ -4165,12 +4165,12 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
network
)
if
(
network
)
virNetworkObjUnlock
(
network
);
virNetworkObjUnlock
(
network
);
return
ret
;
return
ret
;
error:
error:
goto
cleanup
;
goto
cleanup
;
}
}
...
@@ -4243,7 +4243,7 @@ networkCheckBandwidth(virNetworkObjPtr net,
...
@@ -4243,7 +4243,7 @@ networkCheckBandwidth(virNetworkObjPtr net,
*
new_rate
=
tmp_new_rate
;
*
new_rate
=
tmp_new_rate
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -4338,7 +4338,7 @@ networkPlugBandwidth(virNetworkObjPtr net,
...
@@ -4338,7 +4338,7 @@ networkPlugBandwidth(virNetworkObjPtr net,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -4389,7 +4389,7 @@ networkUnplugBandwidth(virNetworkObjPtr net,
...
@@ -4389,7 +4389,7 @@ networkUnplugBandwidth(virNetworkObjPtr net,
iface
->
data
.
network
.
actual
->
class_id
=
0
;
iface
->
data
.
network
.
actual
->
class_id
=
0
;
}
}
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
...
src/network/bridge_driver_linux.c
浏览文件 @
c97cfce2
...
@@ -125,7 +125,7 @@ int networkCheckRouteCollision(virNetworkObjPtr network)
...
@@ -125,7 +125,7 @@ int networkCheckRouteCollision(virNetworkObjPtr network)
}
}
}
}
out:
out:
VIR_FREE
(
buf
);
VIR_FREE
(
buf
);
return
ret
;
return
ret
;
}
}
...
@@ -410,12 +410,12 @@ networkAddRoutingFirewallRules(virNetworkObjPtr network,
...
@@ -410,12 +410,12 @@ networkAddRoutingFirewallRules(virNetworkObjPtr network,
return
0
;
return
0
;
routeerr2:
routeerr2:
iptablesRemoveForwardAllowOut
(
&
ipdef
->
address
,
iptablesRemoveForwardAllowOut
(
&
ipdef
->
address
,
prefix
,
prefix
,
network
->
def
->
bridge
,
network
->
def
->
bridge
,
forwardIf
);
forwardIf
);
routeerr1:
routeerr1:
return
-
1
;
return
-
1
;
}
}
...
@@ -507,17 +507,17 @@ networkAddGeneralIp6tablesRules(virNetworkObjPtr network)
...
@@ -507,17 +507,17 @@ networkAddGeneralIp6tablesRules(virNetworkObjPtr network)
return
0
;
return
0
;
/* unwind in reverse order from the point of failure */
/* unwind in reverse order from the point of failure */
err6:
err6:
iptablesRemoveUdpInput
(
AF_INET6
,
network
->
def
->
bridge
,
53
);
iptablesRemoveUdpInput
(
AF_INET6
,
network
->
def
->
bridge
,
53
);
err5:
err5:
iptablesRemoveTcpInput
(
AF_INET6
,
network
->
def
->
bridge
,
53
);
iptablesRemoveTcpInput
(
AF_INET6
,
network
->
def
->
bridge
,
53
);
err4:
err4:
iptablesRemoveForwardAllowCross
(
AF_INET6
,
network
->
def
->
bridge
);
iptablesRemoveForwardAllowCross
(
AF_INET6
,
network
->
def
->
bridge
);
err3:
err3:
iptablesRemoveForwardRejectIn
(
AF_INET6
,
network
->
def
->
bridge
);
iptablesRemoveForwardRejectIn
(
AF_INET6
,
network
->
def
->
bridge
);
err2:
err2:
iptablesRemoveForwardRejectOut
(
AF_INET6
,
network
->
def
->
bridge
);
iptablesRemoveForwardRejectOut
(
AF_INET6
,
network
->
def
->
bridge
);
err1:
err1:
return
-
1
;
return
-
1
;
}
}
...
@@ -650,27 +650,27 @@ networkAddGeneralFirewallRules(virNetworkObjPtr network)
...
@@ -650,27 +650,27 @@ networkAddGeneralFirewallRules(virNetworkObjPtr network)
return
0
;
return
0
;
/* unwind in reverse order from the point of failure */
/* unwind in reverse order from the point of failure */
err10:
err10:
iptablesRemoveForwardAllowCross
(
AF_INET
,
network
->
def
->
bridge
);
iptablesRemoveForwardAllowCross
(
AF_INET
,
network
->
def
->
bridge
);
err9:
err9:
iptablesRemoveForwardRejectIn
(
AF_INET
,
network
->
def
->
bridge
);
iptablesRemoveForwardRejectIn
(
AF_INET
,
network
->
def
->
bridge
);
err8:
err8:
iptablesRemoveForwardRejectOut
(
AF_INET
,
network
->
def
->
bridge
);
iptablesRemoveForwardRejectOut
(
AF_INET
,
network
->
def
->
bridge
);
err7:
err7:
if
(
ipv4def
&&
ipv4def
->
tftproot
)
{
if
(
ipv4def
&&
ipv4def
->
tftproot
)
{
iptablesRemoveUdpInput
(
AF_INET
,
network
->
def
->
bridge
,
69
);
iptablesRemoveUdpInput
(
AF_INET
,
network
->
def
->
bridge
,
69
);
}
}
err6:
err6:
iptablesRemoveUdpInput
(
AF_INET
,
network
->
def
->
bridge
,
53
);
iptablesRemoveUdpInput
(
AF_INET
,
network
->
def
->
bridge
,
53
);
err5:
err5:
iptablesRemoveTcpInput
(
AF_INET
,
network
->
def
->
bridge
,
53
);
iptablesRemoveTcpInput
(
AF_INET
,
network
->
def
->
bridge
,
53
);
err4:
err4:
iptablesRemoveUdpOutput
(
AF_INET
,
network
->
def
->
bridge
,
68
);
iptablesRemoveUdpOutput
(
AF_INET
,
network
->
def
->
bridge
,
68
);
err3:
err3:
iptablesRemoveUdpInput
(
AF_INET
,
network
->
def
->
bridge
,
67
);
iptablesRemoveUdpInput
(
AF_INET
,
network
->
def
->
bridge
,
67
);
err2:
err2:
iptablesRemoveTcpInput
(
AF_INET
,
network
->
def
->
bridge
,
67
);
iptablesRemoveTcpInput
(
AF_INET
,
network
->
def
->
bridge
,
67
);
err1:
err1:
return
-
1
;
return
-
1
;
}
}
...
@@ -763,7 +763,7 @@ int networkAddFirewallRules(virNetworkObjPtr network)
...
@@ -763,7 +763,7 @@ int networkAddFirewallRules(virNetworkObjPtr network)
}
}
return
0
;
return
0
;
err:
err:
/* store the previous error message before attempting removal of rules */
/* store the previous error message before attempting removal of rules */
orig_error
=
virSaveLastError
();
orig_error
=
virSaveLastError
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录