X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=common%2Fcmd_net.c;h=a6878491998afaa299f77ad06306bff83e028939;hb=5fe1377cc46199fe71c47be4b1aa81440ae96f9f;hp=01f5f91c821248a75594ff804d106334ecb3695e;hpb=b0fce99bfc116c2ddb4506268d6e4a0a7054478d;p=oweals%2Fu-boot.git diff --git a/common/cmd_net.c b/common/cmd_net.c index 01f5f91c82..a687849199 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -28,22 +28,19 @@ #include #include -#if (CONFIG_COMMANDS & CFG_CMD_NET) - - extern int do_bootm (cmd_tbl_t *, int, int, char *[]); -static int netboot_common (int, cmd_tbl_t *, int , char *[]); +static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]); int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { return netboot_common (BOOTP, cmdtp, argc, argv); } -cmd_tbl_t U_BOOT_CMD(BOOTP) = MK_CMD_ENTRY( - "bootp", 3, 1, do_bootp, - "bootp - boot image via network using BootP/TFTP protocol\n", - "[loadAddress] [bootfilename]\n" +U_BOOT_CMD( + bootp, 3, 1, do_bootp, + "boot image via network using BOOTP/TFTP protocol", + "[loadAddress] [[hostIPaddr:]bootfilename]\n" ); int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) @@ -51,10 +48,10 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return netboot_common (TFTP, cmdtp, argc, argv); } -cmd_tbl_t U_BOOT_CMD(TFTPB) = MK_CMD_ENTRY( - "tftpboot", 3, 1, do_tftpb, - "tftpboot- boot image via network using TFTP protocol\n", - "[loadAddress] [bootfilename]\n" +U_BOOT_CMD( + tftpboot, 3, 1, do_tftpb, + "boot image via network using TFTP protocol", + "[loadAddress] [[hostIPaddr:]bootfilename]\n" ); int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) @@ -62,70 +59,105 @@ int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return netboot_common (RARP, cmdtp, argc, argv); } -cmd_tbl_t U_BOOT_CMD(RARPB) = MK_CMD_ENTRY( - "rarpboot", 3, 1, do_rarpb, - "rarpboot- boot image via network using RARP/TFTP protocol\n", - "[loadAddress] [bootfilename]\n" +U_BOOT_CMD( + rarpboot, 3, 1, do_rarpb, + "boot image via network using RARP/TFTP protocol", + "[loadAddress] [[hostIPaddr:]bootfilename]\n" ); -#if (CONFIG_COMMANDS & CFG_CMD_DHCP) +#if defined(CONFIG_CMD_DHCP) int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { return netboot_common(DHCP, cmdtp, argc, argv); } -cmd_tbl_t U_BOOT_CMD(DHCP) = MK_CMD_ENTRY( - "dhcp", 3, 1, do_dhcp, - "dhcp - invoke DHCP client to obtain IP/boot params\n", - "\n" +U_BOOT_CMD( + dhcp, 3, 1, do_dhcp, + "boot image via network using DHCP/TFTP protocol", + "[loadAddress] [[hostIPaddr:]bootfilename]\n" ); -#endif /* CFG_CMD_DHCP */ +#endif -static void netboot_update_env(void) +#if defined(CONFIG_CMD_NFS) +int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - char tmp[16] ; + return netboot_common(NFS, cmdtp, argc, argv); +} - if (NetOurGatewayIP) { - ip_to_string (NetOurGatewayIP, tmp); - setenv("gatewayip", tmp); - } +U_BOOT_CMD( + nfs, 3, 1, do_nfs, + "boot image via network using NFS protocol", + "[loadAddress] [[hostIPaddr:]bootfilename]\n" +); +#endif - if (NetOurSubnetMask) { - ip_to_string (NetOurSubnetMask, tmp); - setenv("netmask", tmp); - } +static void netboot_update_env (void) +{ + char tmp[22]; - if (NetOurHostName[0]) - setenv("hostname", NetOurHostName); + if (NetOurGatewayIP) { + ip_to_string (NetOurGatewayIP, tmp); + setenv ("gatewayip", tmp); + } - if (NetOurRootPath[0]) - setenv("rootpath", NetOurRootPath); + if (NetOurSubnetMask) { + ip_to_string (NetOurSubnetMask, tmp); + setenv ("netmask", tmp); + } - if (NetOurIP) { - ip_to_string (NetOurIP, tmp); - setenv("ipaddr", tmp); - } + if (NetOurHostName[0]) + setenv ("hostname", NetOurHostName); - if (NetServerIP) { - ip_to_string (NetServerIP, tmp); - setenv("serverip", tmp); - } + if (NetOurRootPath[0]) + setenv ("rootpath", NetOurRootPath); - if (NetOurDNSIP) { - ip_to_string (NetOurDNSIP, tmp); - setenv("dnsip", tmp); - } + if (NetOurIP) { + ip_to_string (NetOurIP, tmp); + setenv ("ipaddr", tmp); + } - if (NetOurNISDomain[0]) - setenv("domain", NetOurNISDomain); + if (NetServerIP) { + ip_to_string (NetServerIP, tmp); + setenv ("serverip", tmp); + } + if (NetOurDNSIP) { + ip_to_string (NetOurDNSIP, tmp); + setenv ("dnsip", tmp); + } +#if defined(CONFIG_BOOTP_DNS2) + if (NetOurDNS2IP) { + ip_to_string (NetOurDNS2IP, tmp); + setenv ("dnsip2", tmp); + } +#endif + if (NetOurNISDomain[0]) + setenv ("domain", NetOurNISDomain); + +#if defined(CONFIG_CMD_SNTP) \ + && defined(CONFIG_BOOTP_TIMEOFFSET) + if (NetTimeOffset) { + sprintf (tmp, "%d", NetTimeOffset); + setenv ("timeoffset", tmp); + } +#endif +#if defined(CONFIG_CMD_SNTP) \ + && defined(CONFIG_BOOTP_NTPSERVER) + if (NetNtpServerIP) { + ip_to_string (NetNtpServerIP, tmp); + setenv ("ntpserverip", tmp); + } +#endif } + static int -netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) +netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) { char *s; + char *end; int rcode = 0; int size; + ulong addr; /* pre-set load_addr */ if ((s = getenv("loadaddr")) != NULL) { @@ -136,15 +168,17 @@ netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) case 1: break; - case 2: /* only one arg - accept two forms: - * just load address, or just boot file name. - * The latter form must be written "filename" here. + case 2: /* + * Only one arg - accept two forms: + * Just load address, or just boot file name. The latter + * form must be written in a format which can not be + * mis-interpreted as a valid number. */ - if (argv[1][0] == '"') { /* just boot filename */ - copy_filename (BootFile, argv[1], sizeof(BootFile)); - } else { /* load address */ - load_addr = simple_strtoul(argv[1], NULL, 16); - } + addr = simple_strtoul(argv[1], &end, 16); + if (end == (argv[1] + strlen(argv[1]))) + load_addr = addr; + else + copy_filename(BootFile, argv[1], sizeof(BootFile)); break; case 3: load_addr = simple_strtoul(argv[1], NULL, 16); @@ -152,19 +186,26 @@ netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) break; - default: printf ("Usage:\n%s\n", cmdtp->usage); + default: cmd_usage(cmdtp); + show_boot_progress (-80); return 1; } - if ((size = NetLoop(proto)) < 0) + show_boot_progress (80); + if ((size = NetLoop(proto)) < 0) { + show_boot_progress (-81); return 1; + } + show_boot_progress (81); /* NetLoop ok, update environment */ netboot_update_env(); /* done if no file was loaded (no errors though) */ - if (size == 0) + if (size == 0) { + show_boot_progress (-82); return 0; + } /* flush cache */ flush_cache(load_addr, size); @@ -177,19 +218,32 @@ netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) printf ("Automatic boot of image at addr 0x%08lX ...\n", load_addr); + show_boot_progress (82); rcode = do_bootm (cmdtp, 0, 1, local_args); } #ifdef CONFIG_AUTOSCRIPT if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) { - printf("Running autoscript at addr 0x%08lX ...\n", load_addr); - rcode = autoscript (load_addr); + printf ("Running autoscript at addr 0x%08lX", load_addr); + + s = getenv ("autoscript_uname"); + if (s) + printf (":%s ...\n", s); + else + puts (" ...\n"); + + show_boot_progress (83); + rcode = autoscript (load_addr, s); } #endif + if (rcode < 0) + show_boot_progress (-83); + else + show_boot_progress (84); return rcode; } -#if (CONFIG_COMMANDS & CFG_CMD_PING) +#if defined(CONFIG_CMD_PING) int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) @@ -197,7 +251,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) NetPingIP = string_to_ip(argv[1]); if (NetPingIP == 0) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return -1; } @@ -210,6 +264,91 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } -#endif /* CFG_CMD_PING */ -#endif /* CFG_CMD_NET */ +U_BOOT_CMD( + ping, 2, 1, do_ping, + "send ICMP ECHO_REQUEST to network host", + "pingAddress\n" +); +#endif + +#if defined(CONFIG_CMD_CDP) + +static void cdp_update_env(void) +{ + char tmp[16]; + + if (CDPApplianceVLAN != htons(-1)) { + printf("CDP offered appliance VLAN %d\n", ntohs(CDPApplianceVLAN)); + VLAN_to_string(CDPApplianceVLAN, tmp); + setenv("vlan", tmp); + NetOurVLAN = CDPApplianceVLAN; + } + + if (CDPNativeVLAN != htons(-1)) { + printf("CDP offered native VLAN %d\n", ntohs(CDPNativeVLAN)); + VLAN_to_string(CDPNativeVLAN, tmp); + setenv("nvlan", tmp); + NetOurNativeVLAN = CDPNativeVLAN; + } + +} + +int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int r; + + r = NetLoop(CDP); + if (r < 0) { + printf("cdp failed; perhaps not a CISCO switch?\n"); + return 1; + } + + cdp_update_env(); + + return 0; +} + +U_BOOT_CMD( + cdp, 1, 1, do_cdp, + "Perform CDP network configuration", +); +#endif + +#if defined(CONFIG_CMD_SNTP) +int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + char *toff; + + if (argc < 2) { + NetNtpServerIP = getenv_IPaddr ("ntpserverip"); + if (NetNtpServerIP == 0) { + printf ("ntpserverip not set\n"); + return (1); + } + } else { + NetNtpServerIP = string_to_ip(argv[1]); + if (NetNtpServerIP == 0) { + printf ("Bad NTP server IP address\n"); + return (1); + } + } + + toff = getenv ("timeoffset"); + if (toff == NULL) NetTimeOffset = 0; + else NetTimeOffset = simple_strtol (toff, NULL, 10); + + if (NetLoop(SNTP) < 0) { + printf("SNTP failed: host %s not responding\n", argv[1]); + return 1; + } + + return 0; +} + +U_BOOT_CMD( + sntp, 2, 1, do_sntp, + "synchronize RTC via network", + "[NTP server IP]\n" +); +#endif