From: Paul Nasrat <pnasrat@redhat.com>
Date: Tue, 15 May 2007 13:24:06 +0000 (+0100)
Subject: load_my_config_file() modifications in yaboot.c
X-Git-Tag: yaboot-1.3.14rc2~3
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=cf0768af118d79ba4888a7fb0fcd800fdf76dc98

load_my_config_file() modifications in yaboot.c

This second part, deletes the netbooting like PXE algorithm from
yaboot.c (reallocated in prom.c) and sets the use of prom_get_netinfo(),
prom_get_mac (), prom_get_ip () functions in load_my_config_file()
function to netbooting work like before the changes.

Signed-off-by: Paulo Ricardo Paz Vital <vital@br.ibm.com>
---

diff --git a/second/yaboot.c b/second/yaboot.c
index e75046a..30abbd6 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -429,35 +429,6 @@ bail:
      return result;
 }
 
-/*
- * "bootp-response" is the property name which is specified in
- * the recommended practice doc for obp-tftp. However, pmac
- * provides a "dhcp-response" property and chrp provides a
- * "bootpreply-packet" property.  The latter appears to begin the
- * bootp packet at offset 0x2a in the property for some reason.
- */
-
-struct bootp_property_offset {
-     char *name; /* property name */
-     int offset; /* offset into property where bootp packet occurs */
-};
-static const struct bootp_property_offset bootp_response_properties[] = {
-     { .name = "bootp-response", .offset = 0 },
-     { .name = "dhcp-response", .offset = 0 },
-     { .name = "bootpreply-packet", .offset = 0x2a },
-};
-
-struct bootp_packet {
-     u8 op, htype, hlen, hops;
-     u32 xid;
-     u16 secs, flags;
-     u32 ciaddr, yiaddr, siaddr, giaddr;
-     unsigned char chaddr[16];
-     unsigned char sname[64];
-     unsigned char file[128];
-     /* vendor options go here if we need them */
-};
-
 /*
  * Search for config file by MAC address, then by IP address.
  * Basically copying pxelinux's algorithm.
@@ -465,47 +436,12 @@ struct bootp_packet {
  */
 static int load_my_config_file(struct boot_fspec_t *orig_fspec)
 {
-     void *bootp_response = NULL;
-     char *propname;
      struct bootp_packet *packet;
-     int i = 0, size, offset = 0, rc = 0;
-     prom_handle chosen;
+     int rc = 0;
      struct boot_fspec_t fspec = *orig_fspec;
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
-     chosen = prom_finddevice("/chosen");
-     if (chosen < 0) {
-          prom_printf("chosen=%d\n", chosen);
-	  return 0;
-     }
-
-     for (i = 0; i < ARRAY_SIZE(bootp_response_properties); i++) {
-	  propname = bootp_response_properties[i].name;
-	  size = prom_getproplen(chosen, propname);
-	  if (size <= 0)
-	       continue;
-
-	  DEBUG_F("using /chosen/%s\n", propname);
-	  offset = bootp_response_properties[i].offset;
-	  break;
-     }
-
-     if (size <= 0)
-	  goto out;
-
-     if (sizeof(*packet) > size - offset) {
-	  prom_printf("Malformed %s property?\n", propname);
-	  goto out;
-     }
-
-     bootp_response = malloc(size);
-     if (!bootp_response)
-	  goto out;
-
-     if (prom_getprop(chosen, propname, bootp_response, size) < 0)
-	  goto out;
-
-     packet = bootp_response + offset;
+     packet = prom_get_netinfo();
 
      /*
       * First, try to match on mac address with the hardware type
@@ -518,15 +454,10 @@ static int load_my_config_file(struct boot_fspec_t *orig_fspec)
 	  goto out;
 
      if (_machine == _MACH_chrp)
-         sprintf(fspec.file, "/etc/%02x", packet->htype);
+         sprintf(fspec.file, "/etc/%02x-", packet->htype);
      else
-         sprintf(fspec.file, "%02x", packet->htype);
-
-     for (i = 0; i < packet->hlen; i++) {
-	  char tmp[4];
-	  sprintf(tmp, "-%02x", packet->chaddr[i]);
-	  strcat(fspec.file, tmp);
-     }
+         sprintf(fspec.file, "%02x-", packet->htype);
+     strcat(fspec.file, prom_get_mac(packet));
 
      rc = load_config_file(&fspec);
      if (rc)
@@ -537,8 +468,12 @@ static int load_my_config_file(struct boot_fspec_t *orig_fspec)
       * Now try to match on IP.
       */
      free(fspec.file);
+     /* 8 chars in yiaddr + \0 */
      fspec.file = malloc(9);
-     sprintf(fspec.file, "%08X", packet->yiaddr);
+     if (!fspec.file)
+         goto out;
+
+     strcat(fspec.file, prom_get_ip(packet));
 
      while (strlen(fspec.file)) {
 	  rc = load_config_file(&fspec);
@@ -553,7 +488,6 @@ static int load_my_config_file(struct boot_fspec_t *orig_fspec)
 	  orig_fspec->file = fspec.file;
      else
 	  free(fspec.file);
-     free(bootp_response);
      return rc;
 }