<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:微软雅黑;
panose-1:2 11 5 3 2 2 4 2 2 4;}
@font-face
{font-family:"\@微软雅黑";
panose-1:2 11 5 3 2 2 4 2 2 4;}
@font-face
{font-family:"\@宋体";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
text-align:justify;
text-justify:inter-ideograph;
font-size:10.5pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:windowtext;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="ZH-CN" link="#0563C1" vlink="#954F72" style="text-justify-trim:punctuation">
<div class="WordSection1">
<p class="MsoNormal"><span lang="EN-US">---<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">src/dhcp-common.c | 3 +++<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">src/rfc3315.c | 3 +++<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">2 files changed, 6 insertions(+)<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">diff --git a/src/dhcp-common.c b/src/dhcp-common.c<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">index b004e40..6f829f3 100644<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">--- a/src/dhcp-common.c<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+++ b/src/dhcp-common.c<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">@@ -394,7 +394,10 @@ static struct dhcp_config *find_config_match(struct dhcp_config *configs,<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> <o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> if (!hwaddr)<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+ {<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+ my_syslog(MS_DHCP | LOG_INFO, "client hwaddr is NULL");<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> return NULL;<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+ }<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> /* use match with fewest wildcard octets */<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> for (candidate = NULL, count = 0, config = configs; config; config = config->next)<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">diff --git a/src/rfc3315.c b/src/rfc3315.c<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">index bc09887..ccfc149 100644<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">--- a/src/rfc3315.c<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+++ b/src/rfc3315.c<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">@@ -636,7 +636,10 @@ static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbu<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> solicit_tags = tagif;<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> <o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> if (ignore)<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+ {<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+ my_syslog(MS_DHCP | LOG_INFO, "Found config is set to ignore");<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> return 0;<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">+ }<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> <o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> /* reset USED bits in leases */<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"> lease6_reset();<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">-- <o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">2.27.0<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal" align="left" style="text-align:left"><b><span style="font-size:11.0pt;font-family:"微软雅黑",sans-serif">发件人<span lang="EN-US">:</span></span></b><span lang="EN-US" style="font-size:11.0pt;font-family:"微软雅黑",sans-serif"> renmingshuai
<br>
</span><b><span style="font-size:11.0pt;font-family:"微软雅黑",sans-serif">发送时间<span lang="EN-US">:</span></span></b><span lang="EN-US" style="font-size:11.0pt;font-family:"微软雅黑",sans-serif"> 2023</span><span style="font-size:11.0pt;font-family:"微软雅黑",sans-serif">年<span lang="EN-US">4</span>月<span lang="EN-US">17</span>日<span lang="EN-US">
19:57<br>
</span><b>收件人<span lang="EN-US">:</span></b><span lang="EN-US"> 'dnsmasq-discuss@lists.thekelleys.org.uk' <dnsmasq-discuss@lists.thekelleys.org.uk><br>
</span><b>抄送<span lang="EN-US">:</span></b><span lang="EN-US"> Yanan (Euler) <yanan@huawei.com>; liaichun <liaichun@huawei.com><br>
</span><b>主题<span lang="EN-US">:</span></b><span lang="EN-US"> Add more dhcp log about finding dhcp-config failed<o:p></o:p></span></span></p>
</div>
</div>
<p class="MsoNormal" align="left" style="text-align:left"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">Hi !<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">When dnsmasq attempts to search for the configured DHCPv6 address based on the MAC address, it will send NS packets to obtain the client MAC address. If dnsmasq fails to obtain the MAC address because any net reason,
it cannot find the configured DHCPv6 address. As a result, the client cannot obtain the MAC address as expected. Adding some dhcp logs about finding dhcp-config failure will help users to find the cause more quickly.<o:p></o:p></span></p>
</div>
</body>
</html>