Commit graph

141 commits

Author SHA1 Message Date
Joseph C. Lehner
61e0d0176c Remove "Ignoring extra upload request" path 2024-11-29 16:37:53 +01:00
Joseph C. Lehner
273a16af16 Bail out after 5 unexpected NMRP packets 2024-11-25 08:49:18 +01:00
Joseph C. Lehner
a7310bf2dd Show message if firmware file has been (potentially) rejected by remote 2024-11-25 08:49:18 +01:00
Eric Shu
c85b503131 Use NMRP_ETH_TIMEOUT_S constant for Ethernet socket timeout 2024-11-23 19:20:52 -08:00
Eric Shu
25945b162d Define NMRP_ETH_TIMEOUT_S constant and use it in Ethernet connection timeout logic 2024-11-23 19:17:58 -08:00
Eric Shu
4a10c53b1a Increase time to wait for Ethernet connection 2024-11-10 11:39:12 -08:00
Joseph C. Lehner
904479bc1a Prettier output 2024-10-02 14:39:34 +02:00
Joseph C. Lehner
d6e3f15d55 Call nmrp_discard only when neccessary
Speeds up TFTP transfers on Windows
2024-09-30 12:35:42 +02:00
Joseph C. Lehner
20fb82ab3a Use TFTP spinner for NMRP too 2024-09-30 12:32:03 +02:00
Joseph C. Lehner
b55f42b764 Show warning when using Wi-Fi interfaces 2024-09-30 10:02:58 +02:00
Joseph C. Lehner
8681520963 Don't continue in blind mode if Ethernet cable is disconnected 2024-09-30 09:57:09 +02:00
Joseph C. Lehner
11a55e27a4 Print message when skipping ethernet connection detection 2024-09-29 11:38:44 +02:00
Joseph C. Lehner
a0406519d2 Set MAC env var to the address used for ARP 2024-07-11 12:28:25 +02:00
Joseph C. Lehner
4b5aae9cb4 Improve handling of -f and -c options
1. Abort, if the command specified by `-c` failed.
2. Wait for remote reponse if `-c` is specified without `-f` (assume
   `-c` is a command to upload the firmware file).
2024-07-10 19:17:06 +02:00
Joseph C. Lehner
346ada7022 Allow overriding MAC used by ARP 2024-07-05 18:18:43 +02:00
Joseph C. Lehner
50bb426cce Less confusing message for TFTP_UL_REQ w/o filename 2024-06-27 09:04:46 +02:00
Joseph C. Lehner
5138c9f09a Revert "Allow changing the region without uploading a firmware file"
This reverts commit 6838a3a546.
2024-01-11 12:23:56 +01:00
Joseph C. Lehner
6838a3a546 Allow changing the region without uploading a firmware file 2024-01-11 12:23:20 +01:00
Joseph C. Lehner
a0c1624125 Don't try to drain late NMRP packets in one go 2023-10-23 16:43:53 +02:00
Joseph C. Lehner
a04543808c Disable timeout when draining NMRP rx buffer 2023-10-18 17:42:51 +02:00
Joseph C. Lehner
4c2d25f2b8 Be more verbose 2023-10-18 17:30:55 +02:00
Joseph C. Lehner
0eb8d70971 Don't send keep alive requests 2023-07-28 09:39:25 +02:00
Joseph C. Lehner
7d3124fb4b Drain NMRP rx buffer before TFTP upload
More debug log spam
2023-07-26 11:43:41 +02:00
Joseph C. Lehner
2db67dedd4 Don't send keep-alive request after upload 2022-11-15 11:37:18 +01:00
Joseph C. Lehner
b564180a9d Reduce timeout for ADVERTISE packets 2022-10-08 13:44:27 +02:00
Joseph C. Lehner
5cfb5e105f Don't pad NMRP packets to 64 bytes 2022-06-17 13:13:49 +02:00
Joseph C. Lehner
b24e72c645 Skip carrier detection with Ctrl-C 2022-06-13 12:09:27 +02:00
Joseph C. Lehner
4fa516602c Show default values of some command-line options 2022-06-11 19:25:38 +02:00
Joseph C. Lehner
5d189c61b2 Don't continue in blind mode if remote does respond 2022-02-09 19:25:10 +01:00
Joseph C. Lehner
7aab07d4d9 WiFi -> Wi-Fi 2021-06-09 19:50:12 +02:00
Joseph C. Lehner
b70de725ca Don't wait for physical connection on WiFi interfaces 2021-06-06 13:32:05 +02:00
Joseph C. Lehner
afeff8eb52 Fix multiple format strings on Windows
It's a miracle this didn't blow up earlier!
2021-05-31 19:22:17 +02:00
Joseph C. Lehner
a2267b7351 Display size of uploaded firmware file 2021-05-31 17:58:55 +02:00
Joseph C. Lehner
dcedf37624 Physical -> Ethernet 2021-05-31 17:58:05 +02:00
David Keck
50171ba46b
fix minor typo 2020-12-13 22:54:56 -05:00
Joseph C. Lehner
12cefdf60f Add missing newline 2020-12-13 12:18:04 +01:00
Joseph C. Lehner
d6e2c0c4ac Implement carrier detection on BSD/macOS 2020-12-13 12:10:15 +01:00
Joseph C. Lehner
35fd6f41df Detect unplugged Ethernet cable on Windows 2020-08-18 13:01:37 +02:00
Joseph C. Lehner
25cda736e6 Increase NMRP timeout to 1s 2020-08-17 12:29:58 +02:00
Joseph C. Lehner
c0c951f4a8 Merge branch 'master' of github.com:jclehner/nmrpflash 2020-07-06 18:15:44 +02:00
Joseph C. Lehner
ec29ee610d Fuzzing related changes 2020-07-06 18:14:41 +02:00
Damyan Ivanov
6396c33402 avoid possible use of uninitialized intf_addr in nmrp_do()
Silences a warning by gcc:
 .
  nmrp.c:462:7: warning: ‘intf_addr’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  462 |   if (ethsock_ip_add(sock, intf_addr, ipmask.s_addr, &ip_undo) != 0) {
      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2020-04-19 06:02:22 +00:00
Joseph C. Lehner
e95526d06c Don't print messages on fake-packet receipt 2020-03-06 18:43:03 +01:00
Joseph C. Lehner
490da10d04 Exit after successful upload in blind mode 2020-03-02 11:29:54 +01:00
Joseph C. Lehner
aca33657c0 Clarify comment regarding default IP 2020-03-02 09:58:56 +01:00
Joseph C. Lehner
4c376a76f8 Fix mac handling in blind mode 2020-03-01 22:32:26 +01:00
Joseph C. Lehner
ccd4b0204b Blind mode improvements 2020-03-01 21:48:18 +01:00
Joseph C. Lehner
0ab6b37b9c Add blind mode (-B) 2020-03-01 20:08:37 +01:00
Joseph C. Lehner
f301e1727e Send ADVERTISE and CONFIG_ACK in one go 2020-02-29 23:33:47 +01:00
Joseph C. Lehner
021e449007 Show netmask as /%d 2019-09-07 10:55:12 +02:00