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

Switch ports after the initial handshake if required

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-07 21:17:12 +01:00
parent 6da9b2b160
commit 8cab20c17e
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tftp.c
View file

@ -111,10 +111,16 @@ static inline void pkt_print(char *pkt, FILE *fp)
} }
} }
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) unsigned timeout)
{ {
ssize_t len; ssize_t len;
struct sockaddr_in src;
#ifndef NMRPFLASH_WINDOWS
socklen_t alen;
#else
int alen;
#endif
len = select_fd(sock, timeout); len = select_fd(sock, timeout);
if (len < 0) { if (len < 0) {
@ -123,12 +129,15 @@ static ssize_t tftp_recvfrom(int sock, char *pkt, struct sockaddr_in *src,
return 0; return 0;
} }
len = recvfrom(sock, pkt, TFTP_PKT_SIZE, 0, NULL, NULL); alen = sizeof(src);
len = recvfrom(sock, pkt, TFTP_PKT_SIZE, 0, (struct sockaddr*)&src, &alen);
if (len < 0) { if (len < 0) {
sock_perror("recvfrom"); sock_perror("recvfrom");
return -1; return -1;
} }
*port = ntohs(src.sin_port);
uint16_t opcode = pkt_num(pkt); uint16_t opcode = pkt_num(pkt);
if (opcode == ERR) { if (opcode == ERR) {
@ -201,7 +210,7 @@ inline void sock_perror(const char *msg)
int tftp_put(struct nmrpd_args *args) int tftp_put(struct nmrpd_args *args)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
uint16_t block; uint16_t block, port;
ssize_t len, last_len; ssize_t len, last_len;
int fd, sock, ret, timeout; int fd, sock, ret, timeout;
char rx[TFTP_PKT_SIZE], tx[TFTP_PKT_SIZE]; char rx[TFTP_PKT_SIZE], tx[TFTP_PKT_SIZE];
@ -269,7 +278,7 @@ int tftp_put(struct nmrpd_args *args)
fprintf(stderr, "!\n"); fprintf(stderr, "!\n");
} }
ret = tftp_recvfrom(sock, rx, &addr, args->rx_timeout); ret = tftp_recvfrom(sock, rx, &port, args->rx_timeout);
if (ret < 0) { if (ret < 0) {
goto cleanup; goto cleanup;
} else if (!ret) { } else if (!ret) {
@ -281,6 +290,13 @@ int tftp_put(struct nmrpd_args *args)
} else { } else {
timeout = 0; timeout = 0;
ret = 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); } while(1);