*
*/
-#define _BSD_SOURCE
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
+#include <ctype.h>
#include "nmrpd.h"
#define TFTP_PKT_SIZE 516
ERR = 5
};
-static const char *x_basename(const char *path)
+static const char *leafname(const char *path)
{
const char *slash, *bslash;
{
size_t len = 2;
- filename = x_basename(filename);
+ filename = leafname(filename);
if (!is_netascii(filename) || strlen(filename) > 500) {
- fprintf(stderr, "Overlong/illegal filename; using 'firmware.bin'.");
+ fprintf(stderr, "Overlong/illegal filename; using 'firmware.bin'.\n");
filename = "firmware.bin";
}
fprintf(fp, "%s", opcode_names[opcode - 1]);
if (opcode == ACK || opcode == DATA) {
fprintf(fp, "(%d)", pkt_num(pkt + 2));
- } else if (opcode == WRQ) {
+ } else if (opcode == WRQ || opcode == RRQ) {
fprintf(fp, "(%s, %s)", pkt + 2, pkt + 2 + strlen(pkt + 2) + 1);
}
}
}
-static ssize_t tftp_recvfrom(int sock, char *pkt, struct sockaddr_in *src)
+static ssize_t tftp_recvfrom(int sock, char *pkt, uint16_t* port,
+ unsigned timeout)
{
ssize_t len;
+ struct sockaddr_in src;
+#ifndef NMRPFLASH_WINDOWS
+ socklen_t alen;
+#else
+ int alen;
+#endif
- len = recvfrom(sock, pkt, TFTP_PKT_SIZE, 0, NULL, NULL);
+ len = select_fd(sock, timeout);
if (len < 0) {
- if (errno != EAGAIN) {
- perror("recvfrom");
- return -1;
- }
+ return -1;
+ } else if (!len) {
+ return 0;
+ }
- return -2;
+ alen = sizeof(src);
+ len = recvfrom(sock, pkt, TFTP_PKT_SIZE, 0, (struct sockaddr*)&src, &alen);
+ if (len < 0) {
+ sock_perror("recvfrom");
+ return -1;
}
+ *port = ntohs(src.sin_port);
+
uint16_t opcode = pkt_num(pkt);
if (opcode == ERR) {
fprintf(stderr, "Error (%d): %.511s\n", pkt_num(pkt + 2), pkt + 4);
return -1;
- } else if (!opcode || opcode > ERR) {
- /* The EX2700 I've tested this on sends a raw TFTP packet with no
- * opcode, and an error message starting at offset 0.
+ } else if (isprint(pkt[0])) {
+ /* In case of a firmware checksum error, the EX2700 I've tested this
+ * on sends a raw UDP packet containing just an error message starting
+ * at offset 0. The limit of 32 chars is arbitrary.
*/
fprintf(stderr, "Error: %.32s\n", pkt);
- return -3;
+ return -2;
+ } else if (!opcode || opcode > ERR) {
+ fprintf(stderr, "Received invalid packet: ");
+ pkt_print(pkt, stderr);
+ fprintf(stderr, ".\n");
+ return -1;
+ }
+
+ if (verbosity > 2) {
+ printf(">> ");
+ pkt_print(pkt, stdout);
+ printf("\n");
}
return len;
len = 4 + strlen(pkt + 4);
break;
default:
- fprintf(stderr, "Error: Invalid packet ");
+ fprintf(stderr, "Attempted to send invalid packet ");
pkt_print(pkt, stderr);
+ fprintf(stderr, "; this is a bug!\n");
return -1;
}
+ if (verbosity > 2) {
+ printf("<< ");
+ pkt_print(pkt, stdout);
+ printf("\n");
+ }
+
sent = sendto(sock, pkt, len, 0, (struct sockaddr*)dst, sizeof(*dst));
if (sent < 0) {
- perror("sendto");
+ sock_perror("sendto");
}
return sent;
}
-int sock_set_rx_timeout(int fd, unsigned msec)
+#ifdef NMRPFLASH_WINDOWS
+void sock_perror(const char *msg)
{
- struct timeval tv;
-
- if (msec) {
- tv.tv_usec = (msec % 1000) * 1000;
- tv.tv_sec = msec / 1000;
- if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char*)&tv, sizeof(tv)) < 0) {
- perror("setsockopt(SO_RCVTIMEO)");
- return 1;
- }
- }
-
- return 0;
+ win_perror2(msg, WSAGetLastError());
+}
+#else
+inline void sock_perror(const char *msg)
+{
+ perror(msg);
}
+#endif
int tftp_put(struct nmrpd_args *args)
{
struct sockaddr_in addr;
- uint16_t block;
- ssize_t len;
- int fd, sock, err, timeout, last_len;
+ uint16_t block, port;
+ ssize_t len, last_len;
+ int fd, sock, ret, timeout, errors, ackblock;
char rx[TFTP_PKT_SIZE], tx[TFTP_PKT_SIZE];
sock = -1;
+ ret = -1;
fd = open(args->filename, O_RDONLY);
if (fd < 0) {
perror("open");
- err = fd;
+ ret = fd;
goto cleanup;
}
sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (sock < 0) {
- perror("socket");
- err = sock;
- goto cleanup;
- }
-
- err = sock_set_rx_timeout(sock, args->rx_timeout);
- if (err) {
+ sock_perror("socket");
+ ret = sock;
goto cleanup;
}
addr.sin_family = AF_INET;
addr.sin_port = htons(args->port);
- pkt_mkwrq(tx, args->filename);
-
- len = tftp_sendto(sock, tx, 0, &addr);
- if (len < 0) {
- err = len;
- goto cleanup;
- }
-
- len = tftp_recvfrom(sock, rx, &addr);
- if (len < 0) {
- err = len;
- goto cleanup;
- }
-
- timeout = 0;
block = 0;
last_len = -1;
+ len = 0;
+ errors = 0;
+ /* Not really, but this way the loop sends our WRQ before receiving */
+ timeout = 1;
+
+ pkt_mkwrq(tx, args->filename);
do {
- if (timeout || (pkt_num(rx) == ACK && pkt_num(rx + 2) == block)) {
+ ackblock = pkt_num(rx) == ACK ? pkt_num(rx + 2) : -1;
+
+ if (timeout || ackblock == block) {
if (!timeout) {
++block;
pkt_mknum(tx, DATA);
len = read(fd, tx + 4, 512);
if (len < 0) {
perror("read");
- err = len;
+ ret = len;
goto cleanup;
} else if (!len) {
- if (last_len != 512) {
+ if (last_len != 512 && last_len != -1) {
break;
}
}
last_len = len;
}
- err = tftp_sendto(sock, tx, len, &addr);
- if (err < 0) {
+ ret = tftp_sendto(sock, tx, len, &addr);
+ if (ret < 0) {
+ goto cleanup;
+ }
+ } else if (pkt_num(rx) != ACK || ackblock > block) {
+ if (verbosity) {
+ fprintf(stderr, "Expected ACK(%d), got ", block);
+ pkt_print(rx, stderr);
+ fprintf(stderr, ".\n");
+ }
+
+ if (ackblock != -1 && ++errors > 5) {
+ fprintf(stderr, "Protocol error; bailing out.\n");
+ ret = -1;
goto cleanup;
}
- } else if (pkt_num(rx) != ACK) {
- fprintf(stderr, "Expected ACK(%d), got ", block);
- pkt_print(rx, stderr);
- fprintf(stderr, "!\n");
}
- err = tftp_recvfrom(sock, rx, &addr);
- if (err < 0) {
- if (err == -2) {
- if (++timeout < 5) {
- continue;
- }
- fprintf(stderr, "Timeout while waiting for ACK(%d)\n.", block);
+ ret = tftp_recvfrom(sock, rx, &port, args->rx_timeout);
+ if (ret < 0) {
+ goto cleanup;
+ } else if (!ret) {
+ if (++timeout < 5) {
+ continue;
+ } else if (block) {
+ fprintf(stderr, "Timeout while waiting for ACK(%d).\n", block);
+ } else {
+ fprintf(stderr, "Timeout while waiting for initial reply.\n");
}
+ ret = -1;
goto cleanup;
} else {
timeout = 0;
- err = 0;
+ ret = 0;
+
+ if (!block && port != args->port) {
+ if (verbosity > 1) {
+ printf("Switching to port %d\n", port);
+ }
+ addr.sin_port = htons(port);
+ }
}
} while(1);
- err = 0;
+ ret = 0;
cleanup:
if (fd >= 0) {
}
if (sock >= 0) {
- shutdown(sock, SHUT_RDWR);
#ifndef NMRPFLASH_WINDOWS
+ shutdown(sock, SHUT_RDWR);
close(sock);
#else
+ shutdown(sock, SD_BOTH);
closesocket(sock);
#endif
}
- return err;
+ return ret;
}
projects / oweals / nmrpflash.git / blobdiff