narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More URL parsing moved into url.c

pull/1/head
Michael Brown 2005-05-01 23:58:45 +00:00
parent d5bf9e71ea
commit f9f1d2c84c
1 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/nic.c
View File

@ -291,48 +291,20 @@ int download_url ( char *url,
int ( * process ) ( unsigned char *data, int ( * process ) ( unsigned char *data,
unsigned int blocknum, unsigned int blocknum,
unsigned int len, int eof ) ) { unsigned int len, int eof ) ) {
struct url_info url_info;
struct protocol *proto; struct protocol *proto;
struct sockaddr_in server; struct sockaddr_in server;
char *filename;
DBG ( "Loading %s\n", url ); printf ( "Loading %s\n", url );
/* Parse URL */ /* Parse URL */
parse_url ( &url_info, url ); if ( ! parse_url ( url, &proto, &server, &filename ) ) {
DBG ( "Unusable URL %s\n", url );
return 0;
}
/* Identify protocol */
proto = identify_protocol ( url_info.protocol );
if ( ! proto ) {
if ( url_info.protocol ) {
printf ( "Unknown protocol %s\n", url_info.protocol );
} else {
printf ( "No default protocols\n" );
}
goto error_out;
}
/* Resolve hostname */
server.sin_addr = arptable[ARP_SERVER].ipaddr;
if ( url_info.host ) {
if ( ! resolv ( &server.sin_addr, url_info.host ) ) {
printf ( "Cannot resolve host %s\n", url_info.host );
goto error_out;
}
}
/* Resolve port number */
server.sin_port = url_info.port ?
strtoul ( url_info.port, NULL, 10 ) : 0;
/* Restore URL */
unparse_url ( &url_info );
/* Call protocol's method to download the file */ /* Call protocol's method to download the file */
return proto->load ( url, &server, url_info.file, process ); return proto->load ( url, &server, filename, process );
error_out:
unparse_url ( &url_info );
return 0;
} }