sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-13 23:41:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

[resolv] Simplify xfer_redirect() logic

Browse Source 
Now that we have xfer_vreopen() as the default .vredirect handler,
sending redirection events can become simpler.
This commit is contained in:
Michael Brown
2009-03-30 15:23:57 +01:00
parent 272e6ddc30
commit edea441ad5
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/core/resolv.c
View File

@@ -302,9 +302,36 @@ struct named_socket {
int have_local; int have_local;
}; };
/**
* Finish using named socket
*
* @v named Named socket
* @v rc Reason for finish
*/
static void named_done ( struct named_socket *named, int rc ) {
/* Close all interfaces */
resolv_nullify ( &named->resolv );
xfer_nullify ( &named->xfer );
xfer_close ( &named->xfer, rc );
}
/**
* Handle close() event
*
* @v xfer Data transfer interface
* @v rc Reason for close
*/
static void named_xfer_close ( struct xfer_interface *xfer, int rc ) {
struct named_socket *named =
container_of ( xfer, struct named_socket, xfer );
named_done ( named, rc );
}
/** Named socket opener data transfer interface operations */ /** Named socket opener data transfer interface operations */
static struct xfer_interface_operations named_xfer_ops = { static struct xfer_interface_operations named_xfer_ops = {
.close = ignore_xfer_close, .close = named_xfer_close,
.vredirect = ignore_xfer_vredirect, .vredirect = ignore_xfer_vredirect,
.window = no_xfer_window, .window = no_xfer_window,
.alloc_iob = default_xfer_alloc_iob, .alloc_iob = default_xfer_alloc_iob,
@@ -324,10 +351,6 @@ static void named_resolv_done ( struct resolv_interface *resolv,
struct named_socket *named = struct named_socket *named =
container_of ( resolv, struct named_socket, resolv ); container_of ( resolv, struct named_socket, resolv );
/* Unplug resolver and nullify data transfer interface */
resolv_unplug ( &named->resolv );
xfer_nullify ( &named->xfer );
/* Redirect if name resolution was successful */ /* Redirect if name resolution was successful */
if ( rc == 0 ) { if ( rc == 0 ) {
rc = xfer_redirect ( &named->xfer, LOCATION_SOCKET, rc = xfer_redirect ( &named->xfer, LOCATION_SOCKET,
@@ -336,12 +359,8 @@ static void named_resolv_done ( struct resolv_interface *resolv,
&named->local : NULL ) ); &named->local : NULL ) );
} }
/* Close data transfer interface if redirection failed */ /* Terminate resolution */
if ( rc != 0 ) named_done ( named, rc );
xfer_close ( &named->xfer, rc );
/* Unplug data transfer interface */
xfer_unplug ( &named->xfer );
} }
/** Named socket opener name resolution interface operations */ /** Named socket opener name resolution interface operations */