xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-12-12 06:16:29 +00:00
Code Issues Projects Releases Wiki Activity

[xfer] Always nullify interface while sending close() message

Browse Source 
Objects typically call xfer_close() as part of their response to a
close() message.  If the initiating object has already nullified the
xfer interface then this isn't a problem, but it can lead to
unexpected behaviour when the initiating object is aiming to reuse the
connection and so does not nullify the interface.

Fix by always temporarily nullifying the interface during xfer_close()
(as was already being done by xfer_vreopen() in order to work around
this specific problem).

Reported-by: infernix <infernix@infernix.net>
Tested-by: infernix <infernix@infernix.net>
This commit is contained in:
Michael Brown 2009-07-06 16:16:59 +01:00
parent 546cc62394
commit b7e93a6a55
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/open.c
View File

@ -188,15 +188,10 @@ int xfer_open ( struct xfer_interface *xfer, int type, ... ) {
* method handler.
*/
int xfer_vreopen ( struct xfer_interface *xfer, int type, va_list args ) {
struct xfer_interface_operations *op = xfer->op;
/* Close existing connection */
xfer_nullify ( xfer );
xfer_close ( xfer, 0 );
/* Restore to operational status */
xfer->op = op;
/* Open new location */
return xfer_vopen ( xfer, type, args );
}

3
src/core/xfer.c
View File

@ -45,11 +45,14 @@ static struct xfer_metadata dummy_metadata;
*/
void xfer_close ( struct xfer_interface *xfer, int rc ) {
struct xfer_interface *dest = xfer_get_dest ( xfer );
struct xfer_interface_operations *op = xfer->op;
DBGC ( xfer, "XFER %p->%p close\n", xfer, dest );
xfer_unplug ( xfer );
xfer_nullify ( xfer );
dest->op->close ( dest, rc );
xfer->op = op;
xfer_put ( dest );
}