From 37b0cce64dc07c8c266bd2ef4613e0c9069e8aaa Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 14 May 2013 11:50:15 +0200 Subject: [PATCH 1/2] net: dhcp: Fix return value on ctrl-c the dhcp command will return with 0 when ctrl-c is pressed. Fix this to -EINTR instead. Signed-off-by: Sascha Hauer --- net/dhcp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/dhcp.c b/net/dhcp.c index 8233ec350..7324c9483 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -767,8 +767,10 @@ static int do_dhcp(int argc, char *argv[]) goto out1; while (dhcp_state != BOUND) { - if (ctrlc()) - break; + if (ctrlc()) { + ret = -EINTR; + goto out1; + } if (!retries) { ret = -ETIMEDOUT; goto out1; From 66691793b091356f4dc081ffe2e942dee7c1cc04 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 14 May 2013 11:51:22 +0200 Subject: [PATCH 2/2] 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 --- net/dhcp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/dhcp.c b/net/dhcp.c index 7324c9483..1261b2d73 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -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: