OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

slirp: Handle more than 65535 blocks in TFTP transfers

Browse Source 
RFC 1350 does not mention block count roll-over. However, a lot of TFTP servers
implement it to be able to transmit big files, so do it also.

Current block size is 512 bytes, so TFTP files were limited to 32 MB.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Hervé Poussineau 2012-09-13 12:39:36 +02:00 committed by Jan Kiszka
parent 78be056628
commit 4aa401f39e
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slirp/tftp.c
View File

@ -97,7 +97,7 @@ static int tftp_session_find(Slirp *slirp, struct tftp_t *tp)
return -1; return -1;
} }
static int tftp_read_data(struct tftp_session *spt, uint16_t block_nr, static int tftp_read_data(struct tftp_session *spt, uint32_t block_nr,
uint8_t *buf, int len) uint8_t *buf, int len)
{ {
int bytes_read = 0; int bytes_read = 0;
@ -197,8 +197,7 @@ out:
tftp_session_terminate(spt); tftp_session_terminate(spt);
} }
static int tftp_send_data(struct tftp_session *spt, static int tftp_send_next_block(struct tftp_session *spt,
uint16_t block_nr,
struct tftp_t *recv_tp) struct tftp_t *recv_tp)
{ {
struct sockaddr_in saddr, daddr; struct sockaddr_in saddr, daddr;
@ -206,10 +205,6 @@ static int tftp_send_data(struct tftp_session *spt,
struct tftp_t *tp; struct tftp_t *tp;
int nobytes; int nobytes;
if (block_nr < 1) {
return -1;
}
m = m_get(spt->slirp); m = m_get(spt->slirp);
if (!m) { if (!m) {
@ -223,7 +218,7 @@ static int tftp_send_data(struct tftp_session *spt,
m->m_data += sizeof(struct udpiphdr); m->m_data += sizeof(struct udpiphdr);
tp->tp_op = htons(TFTP_DATA); tp->tp_op = htons(TFTP_DATA);
tp->x.tp_data.tp_block_nr = htons(block_nr); tp->x.tp_data.tp_block_nr = htons((spt->block_nr + 1) & 0xffff);
saddr.sin_addr = recv_tp->ip.ip_dst; saddr.sin_addr = recv_tp->ip.ip_dst;
saddr.sin_port = recv_tp->udp.uh_dport; saddr.sin_port = recv_tp->udp.uh_dport;
@ -231,7 +226,7 @@ static int tftp_send_data(struct tftp_session *spt,
daddr.sin_addr = spt->client_ip; daddr.sin_addr = spt->client_ip;
daddr.sin_port = spt->client_port; daddr.sin_port = spt->client_port;
nobytes = tftp_read_data(spt, block_nr - 1, tp->x.tp_data.tp_buf, 512); nobytes = tftp_read_data(spt, spt->block_nr, tp->x.tp_data.tp_buf, 512);
if (nobytes < 0) { if (nobytes < 0) {
m_free(m); m_free(m);
@ -255,6 +250,7 @@ static int tftp_send_data(struct tftp_session *spt,
tftp_session_terminate(spt); tftp_session_terminate(spt);
} }
spt->block_nr++;
return 0; return 0;
} }
@ -373,7 +369,8 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp_t *tp, int pktlen)
} }
} }
tftp_send_data(spt, 1, tp); spt->block_nr = 0;
tftp_send_next_block(spt, tp);
} }
static void tftp_handle_ack(Slirp *slirp, struct tftp_t *tp, int pktlen) static void tftp_handle_ack(Slirp *slirp, struct tftp_t *tp, int pktlen)
@ -386,8 +383,7 @@ static void tftp_handle_ack(Slirp *slirp, struct tftp_t *tp, int pktlen)
return; return;
} }
if (tftp_send_data(&slirp->tftp_sessions[s], if (tftp_send_next_block(&slirp->tftp_sessions[s],
ntohs(tp->x.tp_data.tp_block_nr) + 1,
tp) < 0) { tp) < 0) {
return; return;
} }

1
slirp/tftp.h
View File

@ -37,6 +37,7 @@ struct tftp_session {
struct in_addr client_ip; struct in_addr client_ip;
uint16_t client_port; uint16_t client_port;
uint32_t block_nr;
int timestamp; int timestamp;
}; };