david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

No need to maintain a received byte count; we always fill in sequential 

order so we can just use buffer->fill.
This commit is contained in:
Michael Brown 2007-01-12 17:16:46 +00:00
parent 996b091b50
commit ad22cccc09
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/gpxe/ftp.h
View File

@ -57,8 +57,6 @@ struct ftp_request {
char status_text[4];
/** Passive-mode parameters, as text */
char passive_text[24]; /* "aaa,bbb,ccc,ddd,eee,fff" */
/** Amount of data received */
size_t data_rcvd;
/** TCP application for the control channel */
struct tcp_application tcp;

6
src/net/tcp/ftp.c
View File

@ -340,15 +340,12 @@ static void ftp_data_newdata ( struct tcp_application *app,
/* Fill data buffer */
if ( ( rc = fill_buffer ( ftp->buffer, data,
ftp->data_rcvd, len ) ) != 0 ){
ftp->buffer->fill, len ) ) != 0 ){
DBGC ( ftp, "FTP %p failed to fill data buffer: %s\n",
ftp, strerror ( rc ) );
ftp_done ( ftp, rc );
return;
}
/* Update received data total */
ftp->data_rcvd += len;
}
/** FTP data channel operations */
@ -377,7 +374,6 @@ struct async_operation * ftp_get ( struct ftp_request *ftp ) {
ftp->already_sent = 0;
ftp->recvbuf = ftp->status_text;
ftp->recvsize = sizeof ( ftp->status_text ) - 1;
ftp->data_rcvd = 0;
ftp->tcp.tcp_op = &ftp_tcp_operations;
ftp->tcp_data.tcp_op = &ftp_data_tcp_operations;
if ( ( rc = tcp_connect ( &ftp->tcp, &ftp->server, 0 ) ) != 0 )