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

Protocols now load data into a buffer; they don't execute it.

Browse Source
This commit is contained in:
Michael Brown
2005-05-09 14:27:29 +00:00
parent 116f17f605
commit 0fe74493f4
6 changed files with 37 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/main.c
View File

@@ -162,6 +162,7 @@ void initialise ( void ) {
MAIN - Kick off routine
**************************************************************************/
int main ( void ) {
struct buffer buffer;
int skip = 0;
/* Print out configuration */
@@ -213,8 +214,15 @@ int main ( void ) {
continue;
}
/* Boot from the device */
load ( &dev, load_block );
/* Load boot file from the device */
init_buffer ( &buffer, 0x7c00, 0x100 );
if ( ! load ( &dev, &buffer ) ) {
/* Load (e.g. TFTP failed) */
printf ( "...load failed\n" );
continue;
}
printf ( "Loaded file of size %d\n", buffer.fill );
}

19
src/core/nic.c
View File

@@ -282,14 +282,10 @@ static int nic_configure ( struct type_dev *type_dev ) {
/*
* Download a file from the specified URL and process it with the
* specified function
* Download a file from the specified URL into the specified buffer
*
*/
int download_url ( char *url,
int ( * process ) ( unsigned char *data,
unsigned int blocknum,
unsigned int len, int eof ) ) {
int download_url ( char *url, struct buffer *buffer ) {
struct protocol *proto;
struct sockaddr_in server;
char *filename;
@@ -303,7 +299,7 @@ int download_url ( char *url,
}
/* Call protocol's method to download the file */
return proto->load ( url, &server, filename, process );
return proto->load ( url, &server, filename, buffer );
}
@@ -312,10 +308,7 @@ int download_url ( char *url,
/**************************************************************************
LOAD - Try to get booted
**************************************************************************/
static int nic_load ( struct type_dev *type_dev,
int ( * process ) ( unsigned char *data,
unsigned int blocknum,
unsigned int size, int eof ) ) {
static int nic_load ( struct type_dev *type_dev, struct buffer *buffer ) {
char *kernel;
/* Now use TFTP to load file */
@@ -327,12 +320,10 @@ static int nic_load ( struct type_dev *type_dev,
#endif
: KERNEL_BUF;
if ( kernel ) {
download_url(kernel,process); /* We don't return except on error */
printf("Unable to load file.\n");
return download_url ( kernel, buffer );
} else {
printf("No filename\n");
}
interruptible_sleep(2); /* lay off the server for a while */
return 0;
}