diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 15 | ||||
| -rw-r--r-- | net/Makefile | 4 | ||||
| -rw-r--r-- | net/dhcp.c | 32 | ||||
| -rw-r--r-- | net/dns.c | 11 | ||||
| -rw-r--r-- | net/ifup.c | 15 | ||||
| -rw-r--r-- | net/net.c | 2 | ||||
| -rw-r--r-- | net/nfs.c | 9 | ||||
| -rw-r--r-- | net/ping.c | 4 |
8 files changed, 35 insertions, 57 deletions
diff --git a/net/Kconfig b/net/Kconfig index 59b64175de..918d77653e 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -3,18 +3,10 @@ menuconfig NET if NET -config NET_DHCP - bool - prompt "dhcp support" - config NET_NFS bool prompt "nfs support" -config NET_PING - bool - prompt "ping support" - config NET_NETCONSOLE bool depends on !CONSOLE_NONE @@ -30,11 +22,4 @@ config NET_IFUP default y bool -config NET_CMD_IFUP - bool - prompt "ifup support" - help - This enables the 'ifup' command which is used to bring up network - interfaces based on config files under /env/network/<ethname> - endif diff --git a/net/Makefile b/net/Makefile index fabb17e4a8..907dc28b99 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,8 +1,8 @@ -obj-$(CONFIG_NET_DHCP) += dhcp.o obj-$(CONFIG_NET) += eth.o obj-$(CONFIG_NET) += net.o obj-$(CONFIG_NET_NFS) += nfs.o -obj-$(CONFIG_NET_PING) += ping.o +obj-$(CONFIG_CMD_DHCP) += dhcp.o +obj-$(CONFIG_CMD_PING) += ping.o obj-$(CONFIG_NET_RESOLV)+= dns.o obj-$(CONFIG_NET_NETCONSOLE) += netconsole.o obj-$(CONFIG_NET_IFUP) += ifup.o diff --git a/net/dhcp.c b/net/dhcp.c index e0c231fb42..070e3bc554 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -790,32 +790,20 @@ out: } BAREBOX_CMD_HELP_START(dhcp) -BAREBOX_CMD_HELP_USAGE("dhcp [OPTIONS]\n") -BAREBOX_CMD_HELP_SHORT("Invoke dhcp client to obtain ip/boot params.\n") -BAREBOX_CMD_HELP_OPT ("-H <hostname>", -"Hostname to send to the DHCP server\n") -BAREBOX_CMD_HELP_OPT ("-v <vendor_id>", -"DHCP Vendor ID (code 60) 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") -BAREBOX_CMD_HELP_OPT ("-c <client_id>", -"DHCP Client ID (code 61) 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") -BAREBOX_CMD_HELP_OPT ("-u <client_uuid>", -"DHCP Client UUID (code 97) 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") -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") -BAREBOX_CMD_HELP_OPT ("-r <retry>", "retry limit by default "__stringify(DHCP_DEFAULT_RETRY)"\n"); +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-H HOSTNAME", "hostname to send to the DHCP server") +BAREBOX_CMD_HELP_OPT ("-v ID\t", "DHCP Vendor ID (code 60) submitted in DHCP requests") +BAREBOX_CMD_HELP_OPT ("-c ID\t", "DHCP Client ID (code 61) submitted in DHCP requests") +BAREBOX_CMD_HELP_OPT ("-u UUID\t", "DHCP Client UUID (code 97) submitted in DHCP requests") +BAREBOX_CMD_HELP_OPT ("-U CLASS", "DHCP User class (code 77) submitted in DHCP requests") +BAREBOX_CMD_HELP_OPT ("-r RETRY", "retry limit (default "__stringify(DHCP_DEFAULT_RETRY)")"); BAREBOX_CMD_HELP_END BAREBOX_CMD_START(dhcp) .cmd = do_dhcp, - .usage = "invoke dhcp client to obtain ip/boot params", + BAREBOX_CMD_DESC("DHCP client to obtain IP or boot params") + BAREBOX_CMD_OPTS("[-HvcuUr]") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_HELP(cmd_dhcp_help) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END @@ -241,6 +241,7 @@ IPaddr_t resolv(char *host) return dns_ip; } +#ifdef CONFIG_CMD_HOST static int do_host(int argc, char *argv[]) { IPaddr_t ip; @@ -260,12 +261,10 @@ static int do_host(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_host_help[] = -"Usage: host <hostname>\n"; - BAREBOX_CMD_START(host) .cmd = do_host, - .usage = "resolve a hostname", - BAREBOX_CMD_HELP(cmd_host_help) + BAREBOX_CMD_DESC("resolve a hostname") + BAREBOX_CMD_OPTS("HOSTNAME") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_END - +#endif diff --git a/net/ifup.c b/net/ifup.c index f3b65f780f..2e59025035 100644 --- a/net/ifup.c +++ b/net/ifup.c @@ -173,14 +173,21 @@ static int do_ifup(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(ifup) -BAREBOX_CMD_HELP_USAGE("ifup [OPTIONS] <interface>\n") -BAREBOX_CMD_HELP_OPT ("-a", "bring up all interfaces\n") -BAREBOX_CMD_HELP_OPT ("-f", "Force. Configure even if ip already set\n") +BAREBOX_CMD_HELP_TEXT("Each INTF must have a script /env/network/INTF that set the variables") +BAREBOX_CMD_HELP_TEXT("ip (to 'static' or 'dynamic'), ipaddr, netmask, gateway, serverip and/or") +BAREBOX_CMD_HELP_TEXT("ethaddr. A script /env/network/INTF-discover can contains for discovering") +BAREBOX_CMD_HELP_TEXT("the ethernet device, e.g. 'usb'.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-a", "bring up all interfaces") +BAREBOX_CMD_HELP_OPT ("-f", "Force. Configure even if ip already set") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ifup) .cmd = do_ifup, - .usage = "Bring up network interfaces", + BAREBOX_CMD_DESC("bring a network interface up") + BAREBOX_CMD_OPTS("[-af] [INTF]") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_HELP(cmd_ifup_help) BAREBOX_CMD_END @@ -160,7 +160,7 @@ int string_to_ethaddr(const char *str, u8 enetaddr[6]) void ethaddr_to_string(const u8 enetaddr[6], char *str) { - sprintf(str, "%02X:%02X:%02X:%02X:%02X:%02X", + sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x", enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3], enetaddr[4], enetaddr[5]); } @@ -725,13 +725,10 @@ err_udp: return nfs_err == 0 ? 0 : 1; } -static const __maybe_unused char cmd_nfs_help[] = -"Usage: nfs <file> [localfile]\n" -"Load a file via network using nfs protocol.\n"; - BAREBOX_CMD_START(nfs) .cmd = do_nfs, - .usage = "boot image via network using nfs protocol", - BAREBOX_CMD_HELP(cmd_nfs_help) + BAREBOX_CMD_DESC("boot image over NFS") + BAREBOX_CMD_OPTS("FILE [LOCALFILE]") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_END diff --git a/net/ping.c b/net/ping.c index bc6cf2e95e..2349f4bed3 100644 --- a/net/ping.c +++ b/net/ping.c @@ -117,5 +117,7 @@ out: BAREBOX_CMD_START(ping) .cmd = do_ping, - .usage = "ping <destination>", + BAREBOX_CMD_DESC("send ICMP echo requests") + BAREBOX_CMD_OPTS("DESTINATION") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_END |