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

[resolv] Use pass-through interfaces for name resolution multiplexer 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2017-09-06 11:43:22 +01:00
parent 8047baf7c6
commit 53f273af90
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/core/resolv.c
View File

@ -180,19 +180,16 @@ static int resmux_try ( struct resolv_mux *mux ) {
} }
/** /**
* Child resolved name * Close name resolution multiplexer
* *
* @v mux Name resolution multiplexer * @v mux Name resolution multiplexer
* @v sa Completed socket address * @v rc Reason for close
*/ */
static void resmux_child_resolv_done ( struct resolv_mux *mux, static void resmux_close ( struct resolv_mux *mux, int rc ) {
struct sockaddr *sa ) {
DBGC ( mux, "RESOLV %p resolved \"%s\" to %s using method %s\n", /* Shut down all interfaces */
mux, mux->name, sock_ntoa ( sa ), mux->resolver->name ); intf_shutdown ( &mux->child, rc );
intf_shutdown ( &mux->parent, rc );
/* Pass resolution to parent */
resolv_done ( &mux->parent, sa );
} }
/** /**
@ -226,18 +223,28 @@ static void resmux_child_close ( struct resolv_mux *mux, int rc ) {
return; return;
finished: finished:
intf_shutdown ( &mux->parent, rc ); resmux_close ( mux, rc );
} }
/** Name resolution multiplexer child interface operations */ /** Name resolution multiplexer child interface operations */
static struct interface_operation resmux_child_op[] = { static struct interface_operation resmux_child_op[] = {
INTF_OP ( resolv_done, struct resolv_mux *, resmux_child_resolv_done ),
INTF_OP ( intf_close, struct resolv_mux *, resmux_child_close ), INTF_OP ( intf_close, struct resolv_mux *, resmux_child_close ),
}; };
/** Name resolution multiplexer child interface descriptor */ /** Name resolution multiplexer child interface descriptor */
static struct interface_descriptor resmux_child_desc = static struct interface_descriptor resmux_child_desc =
INTF_DESC ( struct resolv_mux, child, resmux_child_op ); INTF_DESC_PASSTHRU ( struct resolv_mux, child, resmux_child_op,
parent );
/** Name resolution multiplexer parent interface operations */
static struct interface_operation resmux_parent_op[] = {
INTF_OP ( intf_close, struct resolv_mux *, resmux_close ),
};
/** Name resolution multiplexer parent interface descriptor */
static struct interface_descriptor resmux_parent_desc =
INTF_DESC_PASSTHRU ( struct resolv_mux, parent, resmux_parent_op,
child );
/** /**
* Start name resolution * Start name resolution
@ -258,7 +265,7 @@ int resolv ( struct interface *resolv, const char *name,
if ( ! mux ) if ( ! mux )
return -ENOMEM; return -ENOMEM;
ref_init ( &mux->refcnt, NULL ); ref_init ( &mux->refcnt, NULL );
intf_init ( &mux->parent, &null_intf_desc, &mux->refcnt ); intf_init ( &mux->parent, &resmux_parent_desc, &mux->refcnt );
intf_init ( &mux->child, &resmux_child_desc, &mux->refcnt ); intf_init ( &mux->child, &resmux_child_desc, &mux->refcnt );
mux->resolver = table_start ( RESOLVERS ); mux->resolver = table_start ( RESOLVERS );
if ( sa ) if ( sa )
@ -338,7 +345,8 @@ static struct interface_operation named_xfer_ops[] = {
/** Named socket opener data transfer interface descriptor */ /** Named socket opener data transfer interface descriptor */
static struct interface_descriptor named_xfer_desc = static struct interface_descriptor named_xfer_desc =
INTF_DESC ( struct named_socket, xfer, named_xfer_ops ); INTF_DESC_PASSTHRU ( struct named_socket, xfer, named_xfer_ops,
resolv );
/** /**
* Name resolved * Name resolved
@ -379,7 +387,8 @@ static struct interface_operation named_resolv_op[] = {
/** Named socket opener resolver interface descriptor */ /** Named socket opener resolver interface descriptor */
static struct interface_descriptor named_resolv_desc = static struct interface_descriptor named_resolv_desc =
INTF_DESC ( struct named_socket, resolv, named_resolv_op ); INTF_DESC_PASSTHRU ( struct named_socket, resolv, named_resolv_op,
xfer );
/** /**
* Open named socket * Open named socket