Enhance the parseing of IPv4 information.

[yaboot.git] / second / fs_of.c

diff --git a/second/fs_of.c b/second/fs_of.c
index 95c131d684bec7722a87b4fe60b238353ee6f20f..5c7dd9bee949d81b269bc761bfd00c4f539eaf2d 100644 (file)
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -45,17 +45,17 @@
 #include "debug.h"
 
 #define LOAD_BUFFER_POS                0x1000000
 #include "debug.h"
 
 #define LOAD_BUFFER_POS                0x1000000

-#define LOAD_BUFFER_SIZE       0x1000000
+#define LOAD_BUFFER_SIZE       0x1400000

 
 

-static int of_open(struct boot_file_t* file, const char* dev_name,
-                  struct partition_t* part, const char* file_name);
+static int of_open(struct boot_file_t* file,
+                  struct partition_t* part, struct boot_fspec_t* fspec);

 static int of_read(struct boot_file_t* file, unsigned int size, void* buffer);
 static int of_seek(struct boot_file_t* file, unsigned int newpos);
 static int of_close(struct boot_file_t* file);
 
 
 static int of_read(struct boot_file_t* file, unsigned int size, void* buffer);
 static int of_seek(struct boot_file_t* file, unsigned int newpos);
 static int of_close(struct boot_file_t* file);
 
 

-static int of_net_open(struct boot_file_t* file, const char* dev_name,
-                      struct partition_t* part, const char* file_name);
+static int of_net_open(struct boot_file_t* file,
+                      struct partition_t* part, struct boot_fspec_t* fspec);

 static int of_net_read(struct boot_file_t* file, unsigned int size, void* buffer);
 static int of_net_seek(struct boot_file_t* file, unsigned int newpos);
 
 static int of_net_read(struct boot_file_t* file, unsigned int size, void* buffer);
 static int of_net_seek(struct boot_file_t* file, unsigned int newpos);
 


@@ -79,8 +79,8 @@ struct fs_t of_net_filesystem =
 };
 
 static int
 };
 
 static int

-of_open(struct boot_file_t* file, const char* dev_name,
-       struct partition_t* part, const char* file_name)
+of_open(struct boot_file_t* file,
+       struct partition_t* part, struct boot_fspec_t* fspec)

 {
      static char       buffer[1024];
      char               *filename;
 {
      static char       buffer[1024];
      char               *filename;


@@ -89,7 +89,7 @@ of_open(struct boot_file_t* file, const char* dev_name,
      DEBUG_ENTER;
      DEBUG_OPEN;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
 

-     strncpy(buffer, dev_name, 768);
+     strncpy(buffer, fspec->dev, 768);

      strcat(buffer, ":");
      if (part) {
           if (part->sys_ind == LINUX_RAID) {
      strcat(buffer, ":");
      if (part) {
           if (part->sys_ind == LINUX_RAID) {


@@ -101,10 +101,10 @@ of_open(struct boot_file_t* file, const char* dev_name,
          sprintf(pn, "%02d", part->part_number);
          strcat(buffer, pn);
      }
          sprintf(pn, "%02d", part->part_number);
          strcat(buffer, pn);
      }

-     if (file_name && strlen(file_name)) {
+     if (fspec->file && strlen(fspec->file)) {

          if (part)
               strcat(buffer, ",");
          if (part)
               strcat(buffer, ",");

-         filename = strdup(file_name);
+         filename = strdup(fspec->file);

          for (p = filename; *p; p++)
               if (*p == '/')
                    *p = '\\';
          for (p = filename; *p; p++)
               if (*p == '/')
                    *p = '\\';


@@ -131,25 +131,47 @@ of_open(struct boot_file_t* file, const char* dev_name,
 }
 
 static int
 }
 
 static int

-of_net_open(struct boot_file_t* file, const char* dev_name,
-           struct partition_t* part, const char* file_name)
+of_net_open(struct boot_file_t* file,
+           struct partition_t* part, struct boot_fspec_t* fspec)

 {
      static char       buffer[1024];
 {
      static char       buffer[1024];

-     char               *filename;
+     char               *filename = NULL;

      char               *p;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
 
      char               *p;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
 

-     strncpy(buffer, dev_name, 768);
-     if (file_name && strlen(file_name)) {
-         strcat(buffer, ",");
-         filename = strdup(file_name);
+     if (fspec->file && strlen(fspec->file)) {
+         filename = strdup(fspec->file);

          for (p = filename; *p; p++)
               if (*p == '/')
                    *p = '\\';
          for (p = filename; *p; p++)
               if (*p == '/')
                    *p = '\\';

-         strcat(buffer, filename);
-         free(filename);
+     }
+
+     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;\n",
+               fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr);
+     strncpy(buffer, fspec->dev, 768);
+     /* If we didn't get a ':' include one */
+     if (fspec->dev[strlen(fspec->dev)-1] != ':')
+          strcat(buffer, ":");
+     strcat(buffer, fspec->siaddr);
+     strcat(buffer, ",");
+     strcat(buffer, filename);
+     strcat(buffer, ",");
+     strcat(buffer, fspec->ciaddr);
+     strcat(buffer, ",");
+     strcat(buffer, fspec->giaddr);
+
+     /* If /packages/cas exists the we have a "new skool" tftp */
+     if (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE) {
+          strcat(buffer, ",");
+          strcat(buffer, fspec->bootp_retries);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->tftp_retries);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->addl_params);
+     } else {
+          DEBUG_F("No \"/packages/cas\" using simple args\n")

      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);
      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);