.xfer = INTF_INIT ( pxe_tftp_xfer_desc ),
};
-/**
- * Maximum length of a PXE TFTP URI
- *
- * The PXE TFTP API provides 128 characters for the filename; the
- * extra 128 bytes allow for the remainder of the URI.
- */
-#define PXE_TFTP_URI_LEN 256
-
/**
* Open PXE TFTP connection
*
* @v ipaddress IP address
- * @v port TFTP server port
+ * @v port TFTP server port (in network byte order)
* @v filename File name
* @v blksize Requested block size
* @ret rc Return status code
*/
static int pxe_tftp_open ( IP4_t ipaddress, UDP_PORT_t port,
UINT8_t *filename, UINT16_t blksize ) {
- struct in_addr address;
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+ } server;
struct uri *uri;
int rc;
pxe_tftp.rc = -EINPROGRESS;
/* Construct URI */
- address.s_addr = ipaddress;
- DBG ( " %s", inet_ntoa ( address ) );
+ memset ( &server, 0, sizeof ( server ) );
+ server.sin.sin_family = AF_INET;
+ server.sin.sin_addr.s_addr = ipaddress;
+ server.sin.sin_port = port;
+ DBG ( " %s", sock_ntoa ( &server.sa ) );
if ( port )
DBG ( ":%d", ntohs ( port ) );
DBG ( ":%s", filename );
- uri = tftp_uri ( address, ntohs ( port ), ( ( char * ) filename ) );
+ uri = pxe_uri ( &server.sa, ( ( char * ) filename ) );
if ( ! uri ) {
DBG ( " could not create URI\n" );
return -ENOMEM;
#include <ctype.h>
#include <ipxe/vsprintf.h>
#include <ipxe/params.h>
+#include <ipxe/tcpip.h>
#include <ipxe/uri.h>
/**
}
/**
- * Construct TFTP URI from next-server and filename
+ * Construct URI from server address and filename
*
- * @v next_server Next-server address
- * @v port Port number, or zero to use the default port
+ * @v sa_server Server address
* @v filename Filename
* @ret uri URI, or NULL on failure
*
- * TFTP filenames specified via the DHCP next-server field often
+ * PXE TFTP filenames specified via the DHCP next-server field often
* contain characters such as ':' or '#' which would confuse the
* generic URI parser. We provide a mechanism for directly
* constructing a TFTP URI from the next-server and filename.
*/
-struct uri * tftp_uri ( struct in_addr next_server, unsigned int port,
- const char *filename ) {
+struct uri * pxe_uri ( struct sockaddr *sa_server, const char *filename ) {
char buf[ 6 /* "65535" + NUL */ ];
- struct uri uri;
-
- memset ( &uri, 0, sizeof ( uri ) );
- uri.scheme = "tftp";
- uri.host = inet_ntoa ( next_server );
- if ( port ) {
- snprintf ( buf, sizeof ( buf ), "%d", port );
- uri.port = buf;
+ struct sockaddr_tcpip *st_server =
+ ( ( struct sockaddr_tcpip * ) sa_server );
+ struct uri tmp;
+ struct uri *uri;
+
+ /* Fail if filename is empty */
+ if ( ! ( filename && filename[0] ) )
+ return NULL;
+
+ /* If filename is a hierarchical absolute URI, then use that
+ * URI. (We accept only hierarchical absolute URIs, since PXE
+ * filenames sometimes start with DOS drive letters such as
+ * "C:\", which get misinterpreted as opaque absolute URIs.)
+ */
+ uri = parse_uri ( filename );
+ if ( uri && uri_is_absolute ( uri ) && ( ! uri->opaque ) )
+ return uri;
+ uri_put ( uri );
+
+ /* Otherwise, construct a TFTP URI directly */
+ memset ( &tmp, 0, sizeof ( tmp ) );
+ tmp.scheme = "tftp";
+ tmp.host = sock_ntoa ( sa_server );
+ if ( ! tmp.host )
+ return NULL;
+ if ( st_server->st_port ) {
+ snprintf ( buf, sizeof ( buf ), "%d",
+ ntohs ( st_server->st_port ) );
+ tmp.port = buf;
}
- uri.path = filename;
- return uri_dup ( &uri );
+ tmp.path = filename;
+ uri = uri_dup ( &tmp );
+ return uri;
}
const char *relative_path );
extern struct uri * resolve_uri ( const struct uri *base_uri,
struct uri *relative_uri );
-extern struct uri * tftp_uri ( struct in_addr next_server, unsigned int port,
- const char *filename );
+extern struct uri * pxe_uri ( struct sockaddr *sa_server,
+ const char *filename );
extern void churi ( struct uri *uri );
#endif /* _IPXE_URI_H */
#include <string.h>
#include <byteswap.h>
#include <ipxe/uri.h>
+#include <ipxe/tcpip.h>
#include <ipxe/params.h>
#include <ipxe/test.h>
const char *resolved;
};
-/** A TFTP URI test */
-struct uri_tftp_test {
- /** Next-server address */
- struct in_addr next_server;
- /** Port number */
- unsigned int port;
+/** A PXE URI test */
+struct uri_pxe_test {
+ /** Server address */
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
+ struct sockaddr_tcpip st;
+ } server;
/** Filename */
const char *filename;
/** URI */
uri_resolve_path_okx ( test, __FILE__, __LINE__ )
/**
- * Report URI TFTP test result
+ * Report URI PXE test result
*
- * @v test URI TFTP test
+ * @v test URI PXE test
* @v file Test code file
* @v line Test code line
*/
-static void uri_tftp_okx ( struct uri_tftp_test *test, const char *file,
- unsigned int line ) {
+static void uri_pxe_okx ( struct uri_pxe_test *test, const char *file,
+ unsigned int line ) {
char buf[ strlen ( test->string ) + 1 /* NUL */ ];
struct uri *uri;
size_t len;
/* Construct URI */
- uri = tftp_uri ( test->next_server, test->port, test->filename );
+ uri = pxe_uri ( &test->server.sa, test->filename );
okx ( uri != NULL, file, line );
if ( uri ) {
uri_okx ( uri, &test->uri, file, line );
}
uri_put ( uri );
}
-#define uri_tftp_ok( test ) uri_tftp_okx ( test, __FILE__, __LINE__ )
+#define uri_pxe_ok( test ) uri_pxe_okx ( test, __FILE__, __LINE__ )
/**
* Report current working URI test result
"http://192.168.0.254/test#bar",
};
-/** TFTP URI with absolute path */
-static struct uri_tftp_test uri_tftp_absolute = {
- { .s_addr = htonl ( 0xc0a80002 ) /* 192.168.0.2 */ }, 0,
+/** PXE URI with absolute URI */
+static struct uri_pxe_test uri_pxe_absolute = {
+ {
+ /* 192.168.0.3 */
+ .sin = {
+ .sin_family = AF_INET,
+ .sin_addr = { .s_addr = htonl ( 0xc0a80003 ) },
+ },
+ },
+ "http://not.a.tftp/uri",
+ {
+ .scheme = "http",
+ .host = "not.a.tftp",
+ .path = "/uri",
+ },
+ "http://not.a.tftp/uri",
+};
+
+/** PXE URI with absolute path */
+static struct uri_pxe_test uri_pxe_absolute_path = {
+ {
+ /* 192.168.0.2 */
+ .sin = {
+ .sin_family = AF_INET,
+ .sin_addr = { .s_addr = htonl ( 0xc0a80002 ) },
+ },
+ },
"/absolute/path",
{
.scheme = "tftp",
"tftp://192.168.0.2/absolute/path",
};
-/** TFTP URI with relative path */
-static struct uri_tftp_test uri_tftp_relative = {
- { .s_addr = htonl ( 0xc0a80003 ) /* 192.168.0.3 */ }, 0,
+/** PXE URI with relative path */
+static struct uri_pxe_test uri_pxe_relative_path = {
+ {
+ /* 192.168.0.3 */
+ .sin = {
+ .sin_family = AF_INET,
+ .sin_addr = { .s_addr = htonl ( 0xc0a80003 ) },
+ },
+ },
"relative/path",
{
.scheme = "tftp",
"tftp://192.168.0.3/relative/path",
};
-/** TFTP URI with path containing special characters */
-static struct uri_tftp_test uri_tftp_icky = {
- { .s_addr = htonl ( 0x0a000006 ) /* 10.0.0.6 */ }, 0,
+/** PXE URI with path containing special characters */
+static struct uri_pxe_test uri_pxe_icky = {
+ {
+ /* 10.0.0.6 */
+ .sin = {
+ .sin_family = AF_INET,
+ .sin_addr = { .s_addr = htonl ( 0x0a000006 ) },
+ },
+ },
"C:\\tftpboot\\icky#path",
{
.scheme = "tftp",
"tftp://10.0.0.6/C%3A\\tftpboot\\icky%23path",
};
-/** TFTP URI with custom port */
-static struct uri_tftp_test uri_tftp_port = {
- { .s_addr = htonl ( 0xc0a80001 ) /* 192.168.0.1 */ }, 4069,
+/** PXE URI with custom port */
+static struct uri_pxe_test uri_pxe_port = {
+ {
+ /* 192.168.0.1:4069 */
+ .sin = {
+ .sin_family = AF_INET,
+ .sin_addr = { .s_addr = htonl ( 0xc0a80001 ) },
+ .sin_port = htons ( 4069 ),
+ },
+ },
"/another/path",
{
.scheme = "tftp",
uri_resolve_ok ( &uri_query );
uri_resolve_ok ( &uri_fragment );
- /* TFTP URI construction tests */
- uri_tftp_ok ( &uri_tftp_absolute );
- uri_tftp_ok ( &uri_tftp_relative );
- uri_tftp_ok ( &uri_tftp_icky );
- uri_tftp_ok ( &uri_tftp_port );
+ /* PXE URI construction tests */
+ uri_pxe_ok ( &uri_pxe_absolute );
+ uri_pxe_ok ( &uri_pxe_absolute_path );
+ uri_pxe_ok ( &uri_pxe_relative_path );
+ uri_pxe_ok ( &uri_pxe_icky );
+ uri_pxe_ok ( &uri_pxe_port );
/* Current working URI tests */
uri_churi_ok ( uri_churi );
return -ENOTSUP;
}
-/**
- * Parse next-server and filename into a URI
- *
- * @v next_server Next-server address
- * @v filename Filename
- * @ret uri URI, or NULL on failure
- */
-static struct uri * parse_next_server_and_filename ( struct in_addr next_server,
- const char *filename ) {
- struct uri *uri;
-
- /* Parse filename */
- uri = parse_uri ( filename );
- if ( ! uri )
- return NULL;
-
- /* Construct a TFTP URI for the filename, if applicable */
- if ( next_server.s_addr && filename[0] && ! uri_is_absolute ( uri ) ) {
- uri_put ( uri );
- uri = tftp_uri ( next_server, 0, filename );
- if ( ! uri )
- return NULL;
- }
-
- return uri;
-}
-
/** The "keep-san" setting */
const struct setting keep_san_setting __setting ( SETTING_SANBOOT_EXTRA,
keep-san ) = {
* @ret uri URI, or NULL on failure
*/
struct uri * fetch_next_server_and_filename ( struct settings *settings ) {
- struct in_addr next_server = { 0 };
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+ } next_server;
char *raw_filename = NULL;
struct uri *uri = NULL;
char *filename;
+ /* Initialise server address */
+ memset ( &next_server, 0, sizeof ( next_server ) );
+
/* If we have a filename, fetch it along with the next-server
* setting from the same settings block.
*/
fetch_string_setting_copy ( settings, &filename_setting,
&raw_filename );
fetch_ipv4_setting ( settings, &next_server_setting,
- &next_server );
+ &next_server.sin.sin_addr );
+ }
+ if ( ! raw_filename )
+ goto err_fetch;
+
+ /* Populate server address */
+ if ( next_server.sin.sin_addr.s_addr ) {
+ next_server.sin.sin_family = AF_INET;
+ printf ( "Next server: %s\n",
+ inet_ntoa ( next_server.sin.sin_addr ) );
}
/* Expand filename setting */
- filename = expand_settings ( raw_filename ? raw_filename : "" );
+ filename = expand_settings ( raw_filename );
if ( ! filename )
goto err_expand;
-
- /* Parse next server and filename */
- if ( next_server.s_addr )
- printf ( "Next server: %s\n", inet_ntoa ( next_server ) );
if ( filename[0] )
printf ( "Filename: %s\n", filename );
- uri = parse_next_server_and_filename ( next_server, filename );
+
+ /* Construct URI */
+ uri = pxe_uri ( &next_server.sa, filename );
if ( ! uri )
goto err_parse;
free ( filename );
err_expand:
free ( raw_filename );
+ err_fetch:
return uri;
}
/* Fetch root-path setting */
fetch_string_setting_copy ( settings, &root_path_setting,
&raw_root_path );
+ if ( ! raw_root_path )
+ goto err_fetch;
/* Expand filename setting */
- root_path = expand_settings ( raw_root_path ? raw_root_path : "" );
+ root_path = expand_settings ( raw_root_path );
if ( ! root_path )
goto err_expand;
free ( root_path );
err_expand:
free ( raw_root_path );
+ err_fetch:
return uri;
}
goto err_pxe_menu_boot;
}
- /* Fetch next server and filename */
+ /* Fetch next server and filename (if any) */
filename = fetch_next_server_and_filename ( NULL );
- if ( ! filename )
- goto err_filename;
- if ( ! uri_has_path ( filename ) ) {
- /* Ignore empty filename */
- uri_put ( filename );
- filename = NULL;
- }
- /* Fetch root path */
+ /* Fetch root path (if any) */
root_path = fetch_root_path ( NULL );
- if ( ! root_path )
- goto err_root_path;
- if ( ! uri_is_absolute ( root_path ) ) {
- /* Ignore empty root path */
- uri_put ( root_path );
- root_path = NULL;
- }
/* If we have both a filename and a root path, ignore an
- * unsupported URI scheme in the root path, since it may
- * represent an NFS root.
+ * unsupported or missing URI scheme in the root path, since
+ * it may represent an NFS root.
*/
if ( filename && root_path &&
- ( xfer_uri_opener ( root_path->scheme ) == NULL ) ) {
+ ( ! ( uri_is_absolute ( root_path ) ||
+ ( xfer_uri_opener ( root_path->scheme ) == NULL ) ) ) ) {
printf ( "Ignoring unsupported root path\n" );
uri_put ( root_path );
root_path = NULL;
err_uriboot:
err_no_boot:
uri_put ( root_path );
- err_root_path:
uri_put ( filename );
- err_filename:
err_pxe_menu_boot:
err_dhcp:
err_ifopen:
projects / thirdparty / ipxe.git / commitdiff
