sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-28 18:42:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

[xfer] Generalise metadata "whence" field to "flags" field

Browse Source 
iPXE has never supported SEEK_END; the usage of "whence" offers only
the options of SEEK_SET and SEEK_CUR and so is effectively a boolean
flag.  Further flags will be required to support additional metadata
required by the Fibre Channel network model, so repurpose the "whence"
field as a generic "flags" field.

xfer_seek() has always been used with SEEK_SET, so remove the "whence"
field altogether from its argument list.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2010-07-02 12:12:16 +01:00
parent b0eacbd421
commit 364b92521a
8 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/udp/slam.c
View File

@@ -462,7 +462,7 @@ static int slam_pull_header ( struct slam_request *slam,
}
/* Notify recipient of file size */
xfer_seek ( &slam->xfer, slam->total_bytes, SEEK_SET );
xfer_seek ( &slam->xfer, slam->total_bytes );
return 0;
}
@@ -526,7 +526,7 @@ static int slam_mc_socket_deliver ( struct slam_request *slam,
/* Pass to recipient */
memset ( &meta, 0, sizeof ( meta ) );
meta.whence = SEEK_SET;
meta.flags = XFER_FL_ABS_OFFSET;
meta.offset = ( packet * slam->block_size );
if ( ( rc = xfer_deliver ( &slam->xfer, iobuf, &meta ) ) != 0 )
goto err;

6
src/net/udp/tftp.c
View File

@@ -269,8 +269,8 @@ static int tftp_presize ( struct tftp_request *tftp, size_t filesize ) {
tftp->filesize = filesize;
/* Notify recipient of file size */
xfer_seek ( &tftp->xfer, filesize, SEEK_SET );
xfer_seek ( &tftp->xfer, 0, SEEK_SET );
xfer_seek ( &tftp->xfer, filesize );
xfer_seek ( &tftp->xfer, 0 );
/* Calculate expected number of blocks. Note that files whose
* length is an exact multiple of the blocksize will have a
@@ -854,7 +854,7 @@ static int tftp_rx_data ( struct tftp_request *tftp,
/* Deliver data */
memset ( &meta, 0, sizeof ( meta ) );
meta.whence = SEEK_SET;
meta.flags = XFER_FL_ABS_OFFSET;
meta.offset = offset;
if ( ( rc = xfer_deliver ( &tftp->xfer, iob_disown ( iobuf ),
&meta ) ) != 0 ) {