From 2b6b02ee7eaad2539e26eb9507833aa3c1c9c15e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 7 Dec 2020 13:51:46 +0000 Subject: [tls] Use intf_insert() to add TLS to an interface Restructure the use of add_tls() to insert a TLS filter onto an existing interface. This allows for the possibility of using add_tls() to start TLS on an existing connection (as used in several protocols which will negotiate the choice to use TLS before the ClientHello is sent). Signed-off-by: Michael Brown --- src/include/ipxe/http.h | 4 +--- src/include/ipxe/tls.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/include/ipxe') diff --git a/src/include/ipxe/http.h b/src/include/ipxe/http.h index 0893c9537..117f174af 100644 --- a/src/include/ipxe/http.h +++ b/src/include/ipxe/http.h @@ -45,11 +45,9 @@ struct http_scheme { * * @v xfer Data transfer interface * @v name Host name - * @v next Next interface * @ret rc Return status code */ - int ( * filter ) ( struct interface *xfer, const char *name, - struct interface **next ); + int ( * filter ) ( struct interface *xfer, const char *name ); }; /** HTTP scheme table */ diff --git a/src/include/ipxe/tls.h b/src/include/ipxe/tls.h index febbdc589..2eaaadf20 100644 --- a/src/include/ipxe/tls.h +++ b/src/include/ipxe/tls.h @@ -378,7 +378,6 @@ struct tls_connection { /** RX I/O buffer alignment */ #define TLS_RX_ALIGN 16 -extern int add_tls ( struct interface *xfer, const char *name, - struct interface **next ); +extern int add_tls ( struct interface *xfer, const char *name ); #endif /* _IPXE_TLS_H */ -- cgit v1.2.3-55-g7522