@@ -2,20 +2,15 @@
#include <netapps.h>
PRIM(NET_X2d_LOAD)
- int slen = TOS.n; POP;
- char *arg = TOS.a;
- char *argvs[8];
- int i, p;
- argvs[0] = arg;
- i = 1;
- for (p = 0; p < slen; p++) {
- if (arg[p] == ' ') {
- arg[p] = 0;
- argvs[i] = &arg[p + 1];
- i++;
- }
- }
- TOS.n = netboot(i, argvs);
+ int alen = TOS.n; POP;
+ char *arg = TOS.a; POP;
+ int blocksize = TOS.n; POP;
+ int hugeload = TOS.n; POP;
+ void *replybuf = TOS.a; POP;
+ long maxlen = TOS.n; POP;
+ void *loadaddr = TOS.a;
+ TOS.n = netload(loadaddr, maxlen, replybuf, hugeload, blocksize,
+ arg, alen);
MIRP
PRIM(NET_X2d_PING)
@@ -18,7 +18,8 @@
struct filename_ip;
-extern int netboot(int argc, char *argv[]);
+extern int netload(char *buffer, int len, char *ret_buffer, int huge_load,
+ int block_size, char *args_fs, int alen);
extern int netsave(int argc, char *argv[]);
extern int ping(char *args_fs, int alen);
extern int dhcp(char *ret_buffer, struct filename_ip *fn_ip,
@@ -386,14 +386,11 @@ static void seed_rng(uint8_t mac[])
srand(seed);
}
-int
-netboot(int argc, char *argv[])
+int netload(char *buffer, int len, char *ret_buffer, int huge_load,
+ int block_size, char *args_fs, int alen)
{
char buf[256];
int rc;
- int len = strtol(argv[2], 0, 16);
- char *buffer = (char *) strtol(argv[1], 0, 16);
- char *ret_buffer = (char *) strtol(argv[3], 0, 16);
filename_ip_t fn_ip;
int fd_device;
tftp_err_t tftp_err;
@@ -403,8 +400,6 @@ netboot(int argc, char *argv[])
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00 };
- int huge_load = strtol(argv[4], 0, 10);
- int32_t block_size = strtol(argv[5], 0, 10);
uint8_t own_mac[6];
puts("\n Initializing NIC");
@@ -458,8 +453,16 @@ netboot(int argc, char *argv[])
seed_rng(own_mac);
- if (argc > 6) {
- parse_args(argv[6], &obp_tftp_args);
+ if (alen > 0) {
+ char args[256];
+ if (alen > sizeof(args) - 1) {
+ puts("ERROR: Parameter string is too long.");
+ return -7;
+ }
+ /* Convert forth string into NUL-terminated C-string */
+ strncpy(args, args_fs, alen);
+ args[alen] = 0;
+ parse_args(args, &obp_tftp_args);
if(obp_tftp_args.bootp_retries - rc < DEFAULT_BOOT_RETRIES)
obp_tftp_args.bootp_retries = DEFAULT_BOOT_RETRIES;
else
@@ -33,20 +33,13 @@ INSTANCE VARIABLE ciregs-buffer
my-parent ihandle>phandle node>path encode-string
s" bootpath" set-chosen
- \ Generate arg string for snk like
- \ "netboot load-addr length filename"
- (u.) s" netboot " 2swap $cat s" 60000000 " $cat
+ 60000000 ( addr maxlen )
\ Allocate 1720 bytes to store the BOOTP-REPLY packet
- 6B8 alloc-mem dup >r (u.) $cat
- huge-tftp-load @ IF s" 1 " ELSE s" 0 " THEN $cat
- \ Add desired TFTP-Blocksize as additional argument
- s" 1432 " $cat
+ 6B8 alloc-mem dup >r ( addr maxlen replybuf )
+ huge-tftp-load @ d# 1428 ( addr maxlen replybuf hugetftp blocksize )
\ Add OBP-TFTP Bootstring argument, e.g. "10.128.0.1,bootrom.bin,10.128.40.1"
- my-args $cat
- \ Zero-terminate string
- s" " $cat 2dup + 1 - 0 swap c!
-
+ my-args
net-load dup 0< IF drop 0 THEN
\ Restore to old client interface register
There is no need anymore to pass most of the arguments as strings, we can use integers and pointers now instead. While we're at it, change the maximum TFTP packet block size in obp-tftp.fs from 1432 to 1428, since this is the correct value (with 1432, there might be problems with networking over VLANs). The code in tftp.c forces this value to 1428 anyway (see the MAX_BLOCKSIZE constant there), so this change is just cosmetical, and should not change the behavior of the TFTP loading process. Signed-off-by: Thomas Huth <thuth@redhat.com> --- lib/libnet/libnet.code | 23 +++++++++-------------- lib/libnet/netapps.h | 3 ++- lib/libnet/netload.c | 21 ++++++++++++--------- slof/fs/packages/obp-tftp.fs | 15 ++++----------- 4 files changed, 27 insertions(+), 35 deletions(-)