pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set env vars when using -c

Browse source
This commit is contained in:
Joseph C. Lehner 2016-11-13 11:15:45 +01:00
parent 679ab536f5
commit 91318c2c5f
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -110,7 +110,7 @@ it will actually use `eth0:42`. To override this, manually specify an alias (e.g
This error message could also indicate a bug in the TFTP code; try using an external tftp This error message could also indicate a bug in the TFTP code; try using an external tftp
client (busybox in this example), by specifying the `-c` flag instead of the `-f` flag: client (busybox in this example), by specifying the `-c` flag instead of the `-f` flag:
`# nmrpflash -i eth0 -c "busybox tftp -p -l EX2700-V1.0.1.8.img @IP@"` `# nmrpflash -i eth0 -c "busybox tftp -p -l EX2700-V1.0.1.8.img \$IP"`
###### "Timeout while waiting for CLOSE_REQ." ###### "Timeout while waiting for CLOSE_REQ."

3
main.c
View file

@ -67,6 +67,9 @@ void usage(FILE *fp)
#else #else
"C:\\> nmrpflash.exe -i net0 -f firmware.bin\n" "C:\\> nmrpflash.exe -i net0 -f firmware.bin\n"
#endif #endif
"\n"
"When using -c, the environment variables IP, NETMASK and MAC are\n"
"set to the device IP address, subnet mask and MAC address.\n"
"\n" "\n"
"nmrpflash %s, Copyright (C) 2016 Joseph C. Lehner\n" "nmrpflash %s, Copyright (C) 2016 Joseph C. Lehner\n"
"nmrpflash is free software, licensed under the GNU GPLv3.\n" "nmrpflash is free software, licensed under the GNU GPLv3.\n"

11
nmrp.c
View file

@ -43,6 +43,10 @@
#define PACKED __attribute__((__packed__)) #define PACKED __attribute__((__packed__))
#endif #endif
#ifdef NMRPFLASH_WINDOWS
#define setenv(name, value, overwrite) SetEnvironmentVariable(name, value)
#endif
enum nmrp_code { enum nmrp_code {
NMRP_C_NONE = 0, NMRP_C_NONE = 0,
NMRP_C_ADVERTISE = 1, NMRP_C_ADVERTISE = 1,
@ -631,10 +635,11 @@ int nmrp_do(struct nmrpd_args *args)
status = 0; status = 0;
if (args->tftpcmd) { if (args->tftpcmd) {
printf("Executing '%s' ... ", args->tftpcmd); printf("Executing '%s' ... \n", args->tftpcmd);
fflush(stdout); setenv("IP", inet_ntoa(ipconf.addr), 1);
setenv("MAC", mac_to_str(rx.eh.ether_shost), 1);
setenv("NETMASK", inet_ntoa(ipconf.mask), 1);
status = system(args->tftpcmd); status = system(args->tftpcmd);
printf("\n");
} }
if (!status && args->file_local) { if (!status && args->file_local) {