net: dhcp: Fix tftp servername handling
When the dhcp code discovered the tftp-server-name option it immediately tries to resolve the name. This can't succeed since the we are somewhere in the dhcp processing and the nameserver may not even be known. Fix this by resolving the name when dhcp is completed. While at it, do this in a way that net_set_serverip is only called when resolv() returns something useful. Otherwise we may end up overwriting a previously configured serverip which came from the bootp bp_siaddr field. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
37b0cce64d
commit
66691793b0
|
@ -527,9 +527,6 @@ static void dhcp_options_process(unsigned char *popt, struct bootp *bp)
|
|||
|
||||
popt += oplen + 2; /* Process next option */
|
||||
}
|
||||
|
||||
if (dhcp_tftpname[0] != 0)
|
||||
net_set_serverip(resolv(dhcp_tftpname));
|
||||
}
|
||||
|
||||
static int dhcp_message_type(unsigned char *popt)
|
||||
|
@ -787,6 +784,12 @@ static int do_dhcp(int argc, char *argv[])
|
|||
}
|
||||
}
|
||||
|
||||
if (dhcp_tftpname[0] != 0) {
|
||||
IPaddr_t tftpserver = resolv(dhcp_tftpname);
|
||||
if (tftpserver)
|
||||
net_set_serverip(tftpserver);
|
||||
}
|
||||
|
||||
out1:
|
||||
net_unregister(dhcp_con);
|
||||
out:
|
||||
|
|
Loading…
Reference in New Issue