Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
eb9dee2b
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,发现更多精彩内容 >>
提交
eb9dee2b
编写于
6月 28, 2011
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
network: Don't ignore errors in dnsmasq config file creation
上级
9523b3c3
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
19 addition
and
18 deletion
+19
-18
src/network/bridge_driver.c
src/network/bridge_driver.c
+13
-10
src/util/dnsmasq.c
src/util/dnsmasq.c
+4
-6
src/util/dnsmasq.h
src/util/dnsmasq.h
+2
-2
未找到文件。
src/network/bridge_driver.c
浏览文件 @
eb9dee2b
...
...
@@ -446,7 +446,8 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx,
for
(
i
=
0
;
i
<
ipdef
->
nhosts
;
i
++
)
{
virNetworkDHCPHostDefPtr
host
=
&
(
ipdef
->
hosts
[
i
]);
if
((
host
->
mac
)
&&
VIR_SOCKET_HAS_ADDR
(
&
host
->
ip
))
dnsmasqAddDhcpHost
(
dctx
,
host
->
mac
,
&
host
->
ip
,
host
->
name
);
if
(
dnsmasqAddDhcpHost
(
dctx
,
host
->
mac
,
&
host
->
ip
,
host
->
name
)
<
0
)
return
-
1
;
}
if
(
dnsdef
)
{
...
...
@@ -454,7 +455,8 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx,
virNetworkDNSHostsDefPtr
host
=
&
(
dnsdef
->
hosts
[
i
]);
if
(
VIR_SOCKET_HAS_ADDR
(
&
host
->
ip
))
{
for
(
j
=
0
;
j
<
host
->
nnames
;
j
++
)
dnsmasqAddHost
(
dctx
,
&
host
->
ip
,
host
->
names
[
j
]);
if
(
dnsmasqAddHost
(
dctx
,
&
host
->
ip
,
host
->
names
[
j
])
<
0
)
return
-
1
;
}
}
}
...
...
@@ -604,14 +606,15 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
if
(
network
->
def
->
domain
)
virCommandAddArg
(
cmd
,
"--expand-hosts"
);
if
(
networkBuildDnsmasqHostsfile
(
dctx
,
ipdef
,
network
->
def
->
dns
)
>=
0
)
{
if
(
networkBuildDnsmasqHostsfile
(
dctx
,
ipdef
,
network
->
def
->
dns
)
<
0
)
goto
cleanup
;
if
(
dctx
->
hostsfile
->
nhosts
)
virCommandAddArgPair
(
cmd
,
"--dhcp-hostsfile"
,
dctx
->
hostsfile
->
path
);
if
(
dctx
->
addnhostsfile
->
nhosts
)
virCommandAddArgPair
(
cmd
,
"--addn-hosts"
,
dctx
->
addnhostsfile
->
path
);
}
if
(
ipdef
->
tftproot
)
{
virCommandAddArgList
(
cmd
,
"--enable-tftp"
,
...
...
src/util/dnsmasq.c
浏览文件 @
eb9dee2b
...
...
@@ -502,14 +502,13 @@ dnsmasqContextFree(dnsmasqContext *ctx)
*
* Add dhcp-host entry.
*/
void
int
dnsmasqAddDhcpHost
(
dnsmasqContext
*
ctx
,
const
char
*
mac
,
virSocketAddr
*
ip
,
const
char
*
name
)
{
if
(
ctx
->
hostsfile
)
hostsfileAdd
(
ctx
->
hostsfile
,
mac
,
ip
,
name
);
return
hostsfileAdd
(
ctx
->
hostsfile
,
mac
,
ip
,
name
);
}
/*
...
...
@@ -521,13 +520,12 @@ dnsmasqAddDhcpHost(dnsmasqContext *ctx,
* Add additional host entry.
*/
void
int
dnsmasqAddHost
(
dnsmasqContext
*
ctx
,
virSocketAddr
*
ip
,
const
char
*
name
)
{
if
(
ctx
->
addnhostsfile
)
addnhostsAdd
(
ctx
->
addnhostsfile
,
ip
,
name
);
return
addnhostsAdd
(
ctx
->
addnhostsfile
,
ip
,
name
);
}
/**
...
...
src/util/dnsmasq.h
浏览文件 @
eb9dee2b
...
...
@@ -68,11 +68,11 @@ typedef struct
dnsmasqContext
*
dnsmasqContextNew
(
const
char
*
network_name
,
const
char
*
config_dir
);
void
dnsmasqContextFree
(
dnsmasqContext
*
ctx
);
void
dnsmasqAddDhcpHost
(
dnsmasqContext
*
ctx
,
int
dnsmasqAddDhcpHost
(
dnsmasqContext
*
ctx
,
const
char
*
mac
,
virSocketAddr
*
ip
,
const
char
*
name
);
void
dnsmasqAddHost
(
dnsmasqContext
*
ctx
,
int
dnsmasqAddHost
(
dnsmasqContext
*
ctx
,
virSocketAddr
*
ip
,
const
char
*
name
);
int
dnsmasqSave
(
const
dnsmasqContext
*
ctx
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录