From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 05/11] dhcp: add retries limit support
Date: Fri, 7 Sep 2012 14:13:31 +0200 [thread overview]
Message-ID: <1347020017-12110-5-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1347020017-12110-1-git-send-email-plagnioj@jcrosoft.com>
via -r opt, global.dhcp.retries or dhcp_retries
set the priority order;
This will allow to do not stay infinite loop if no dhcp availlable
for boot sequence as example
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
net/dhcp.c | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/net/dhcp.c b/net/dhcp.c
index 02dc529..a5fcb14 100644
--- a/net/dhcp.c
+++ b/net/dhcp.c
@@ -700,13 +700,26 @@ static int dhcp_global_init(void)
}
late_initcall(dhcp_global_init);
+static void dhcp_getenv_int(const char *name, int *i)
+{
+ const char* str = getenv(name);
+
+ if (!str)
+ return;
+
+ *i = simple_strtoul(str, NULL, 10);
+}
+
static int do_dhcp(int argc, char *argv[])
{
int ret, opt;
+ int retries = -1;
dhcp_reset_env();
- while((opt = getopt(argc, argv, "H:v:c:u:U:")) > 0) {
+ dhcp_getenv_int("global.dhcp.retries", &retries);
+
+ while((opt = getopt(argc, argv, "H:v:c:u:U:r:")) > 0) {
switch(opt) {
case 'H':
dhcp_set_param_data(DHCP_HOSTNAME, optarg);
@@ -723,9 +736,17 @@ static int do_dhcp(int argc, char *argv[])
case 'U':
dhcp_set_param_data(DHCP_USER_CLASS, optarg);
break;
+ case 'r':
+ retries = simple_strtoul(optarg, NULL, 10);
+ break;
}
}
+ if (!retries) {
+ printf("retries is set to zero, set it to -1\n");
+ retries = -1;
+ }
+
dhcp_con = net_udp_new(0xffffffff, PORT_BOOTPS, dhcp_handler, NULL);
if (IS_ERR(dhcp_con)) {
ret = PTR_ERR(dhcp_con);
@@ -746,11 +767,17 @@ static int do_dhcp(int argc, char *argv[])
while (dhcp_state != BOUND) {
if (ctrlc())
break;
+ if (!retries) {
+ ret = ETIMEDOUT;
+ goto out1;
+ }
net_poll();
if (is_timeout(dhcp_start, 3 * SECOND)) {
dhcp_start = get_time_ns();
printf("T ");
ret = bootp_request();
+ /* no need to check if retries > 0 as we check if != 0 */
+ retries--;
if (ret)
goto out1;
}
@@ -785,7 +812,8 @@ BAREBOX_CMD_HELP_OPT ("-u <client_uuid>",
BAREBOX_CMD_HELP_OPT ("-U <user_class>",
"DHCP User class (code 77) submitted in DHCP requests. It can\n"
"be used in the DHCP server's configuration to select options\n"
-"(e.g. bootfile or server) which are valid for barebox clients only.\n");
+"(e.g. bootfile or server) which are valid for barebox clients only.\n")
+BAREBOX_CMD_HELP_OPT ("-r <retry>", "retry limi\n");
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(dhcp)
@@ -804,3 +832,4 @@ BAREBOX_MAGICVAR_NAMED(global_dhcp_client_id, global.dhcp.client_id, "cliend id
BAREBOX_MAGICVAR_NAMED(global_dhcp_user_class, global.dhcp.user_class, "user class to send to the DHCP server");
BAREBOX_MAGICVAR_NAMED(global_dhcp_tftp_server_name, global.dhcp.tftp_server_name, "TFTP server Name returned from DHCP request");
BAREBOX_MAGICVAR_NAMED(global_dhcp_oftree_file, global.dhcp.oftree_file, "OF tree returned from DHCP request (option 224)");
+BAREBOX_MAGICVAR_NAMED(global_dhcp_retries, global.dhcp.retries, "retry limit");
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-09-07 12:13 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 12:07 [PATCH 00/11 v2] defaultenv-2: add bootp support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 01/11] defaultenv: enable glovalvar support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 02/11] defaultenv: switch hostname to global.hostname Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 03/11] dhcp: switch to global var support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 04/11] dhcp: add copy_only_if_valid support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-09-07 12:13 ` [PATCH 06/11] defaultenv-2: eth0 add default global.dhcp.vendor_id Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 07/11] defaultenv-2/ip: add dhcp-barebox support Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 14:04 ` Sascha Hauer
2012-09-08 14:23 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 08/11] defaultenv-2: add ifdown support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 09/11] defaultenv-2: boot/net add bootp support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 18:21 ` Sascha Hauer
2012-09-08 5:40 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 6:17 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 13:47 ` Sascha Hauer
2012-09-08 14:42 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 14:48 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 15:10 ` Sascha Hauer
2012-09-08 17:13 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 14:51 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 15:27 ` Sascha Hauer
2012-09-08 17:12 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 17:22 ` Sascha Hauer
2012-09-08 17:35 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 18:11 ` Sascha Hauer
2012-09-08 13:56 ` Sascha Hauer
2012-09-08 14:37 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 15:09 ` Sascha Hauer
2012-09-08 17:14 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 18:12 ` Sascha Hauer
2012-09-07 12:13 ` [PATCH 10/11] defaultenv-2: add net boot support with kernel and oftree via nfs Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 12:13 ` [PATCH 11/11] defaultenv-2: add symbolic link support to boot/nfs Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 13:49 ` Sascha Hauer
2012-09-08 14:47 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 17:09 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347020017-12110-5-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox