discover: Don't depend on tftp failure for type detection

Rather than always trying both TFTP client types, do a runtime detection
on first invocation. This can be fixed at build-time with
--with-tftp=TYPE.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

2 files changed, 15 insertions, 0 deletions

diff --git a/lib/system/system.c b/lib/system/system.c
index 6e80b24..c9fe979 100644
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -30,6 +30,12 @@ const struct pb_system_apps pb_system_apps = {
 	.udhcpc		= HOST_PROG_UDHCPC,
 };
 
+#ifndef TFTP_TYPE
+#define TFTP_TYPE TFTP_TYPE_UNKNOWN
+#endif
+
+enum tftp_type tftp_type = TFTP_TYPE;
+
 int pb_mkdir_recursive(const char *dir)
 {
 	struct stat statbuf;
diff --git a/lib/system/system.h b/lib/system/system.h
index 271c435..ab25101 100644
--- a/lib/system/system.h
+++ b/lib/system/system.h
@@ -17,6 +17,15 @@ struct pb_system_apps {
 
 extern const struct pb_system_apps pb_system_apps;
 
+enum tftp_type {
+	TFTP_TYPE_BUSYBOX,
+	TFTP_TYPE_HPA,
+	TFTP_TYPE_UNKNOWN,
+	TFTP_TYPE_BROKEN,
+};
+
+extern enum tftp_type tftp_type;
+
 int pb_run_cmd(const char *const *cmd_argv, int wait, int dry_run);
 int pb_mkdir_recursive(const char *dir);
 int pb_rmdir_recursive(const char *base, const char *dir);