Move bootp into a separate file

grub-core/Makefile.core.def

@@ -1579,6 +1579,7 @@ module = {
 module = {
   name = net;
   common = net/net.c;
+  common = net/bootp.c;
   common = net/ip.c;
   common = net/udp.c;
   common = net/ethernet.c;

grub-core/net/net.c

@@ -16,10 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/net/udp.h>
 #include <grub/net.h>
 #include <grub/net/netbuff.h>
-#include <grub/net/ip.h>
 #include <grub/time.h>
 #include <grub/file.h>
 #include <grub/i18n.h>
@@ -28,16 +26,14 @@
 #include <grub/dl.h>
 #include <grub/command.h>
 #include <grub/env.h>
-#include <grub/term.h>
 #include <grub/net/ethernet.h>
-#include <grub/datetime.h>
 #include <grub/loader.h>
 #include <grub/bufio.h>
 #include <grub/kernel.h>
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
-static char *default_server;
+char *grub_net_default_server;
 
 struct grub_net_route
 {
@@ -59,17 +55,6 @@ struct grub_net_card *grub_net_cards = NULL;
 struct grub_net_network_level_protocol *grub_net_network_level_protocols = NULL;
 static struct grub_fs grub_net_fs;
 
-static inline void
-grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
-{
-  inter->card->num_ifaces--;
-  *inter->prev = inter->next;
-  if (inter->next)
-    inter->next->prev = inter->prev;
-  inter->next = 0;
-  inter->prev = 0;
-}
-
 void
 grub_net_card_unregister (struct grub_net_card *card)
 {
@@ -644,7 +629,7 @@ grub_net_open_real (const char *name)
     {
       protname = "tftp";
       protnamelen = sizeof ("tftp") - 1;
-      server = default_server;
+      server = grub_net_default_server;
     }
   else
     {
@@ -659,7 +644,7 @@ grub_net_open_real (const char *name)
       else
 	{
 	  protnamelen = grub_strlen (name);
-	  server = default_server;
+	  server = grub_net_default_server;
 	  protname = name;
 	}
     }
@@ -911,483 +896,6 @@ grub_net_fs_read (grub_file_t file, char *buf, grub_size_t len)
   return grub_net_fs_read_real (file, buf, len);
 }
 
-static char *
-grub_env_write_readonly (struct grub_env_var *var __attribute__ ((unused)),
-			 const char *val __attribute__ ((unused)))
-{
-  return NULL;
-}
-
-static void
-set_env_limn_ro (const char *intername, const char *suffix,
-		 char *value, grub_size_t len)
-{
-  char c;
-  char varname[sizeof ("net_") + grub_strlen (intername) + sizeof ("_")
-	       + grub_strlen (suffix)];
-  grub_snprintf (varname, sizeof (varname), "net_%s_%s", intername, suffix);
-  c = value[len];
-  value[len] = 0;
-  grub_env_set (varname, value);
-  value[len] = c;
-  grub_register_variable_hook (varname, 0, grub_env_write_readonly);
-}
-
-static void
-parse_dhcp_vendor (const char *name, void *vend, int limit)
-{
-  grub_uint8_t *ptr, *ptr0;
-
-  ptr = ptr0 = vend;
-
-  if (ptr[0] != GRUB_NET_BOOTP_RFC1048_MAGIC_0
-      || ptr[1] != GRUB_NET_BOOTP_RFC1048_MAGIC_1
-      || ptr[2] != GRUB_NET_BOOTP_RFC1048_MAGIC_2
-      || ptr[3] != GRUB_NET_BOOTP_RFC1048_MAGIC_3)
-    return;
-  ptr = ptr + sizeof (grub_uint32_t);
-  while (ptr - ptr0 < limit)
-    {
-      grub_uint8_t tagtype;
-      grub_uint8_t taglength;
-
-      tagtype = *ptr++;
-
-      /* Pad tag.  */
-      if (tagtype == 0)
-	continue;
-
-      /* End tag.  */
-      if (tagtype == 0xff)
-	return;
-
-      taglength = *ptr++;
-
-      switch (tagtype)
-	{
-	case 12:
-	  set_env_limn_ro (name, "hostname", (char *) ptr, taglength);
-	  break;
-
-	case 15:
-	  set_env_limn_ro (name, "domain", (char *) ptr, taglength);
-	  break;
-
-	case 17:
-	  set_env_limn_ro (name, "rootpath", (char *) ptr, taglength);
-	  break;
-
-	case 18:
-	  set_env_limn_ro (name, "extensionspath", (char *) ptr, taglength);
-	  break;
-
-	  /* If you need any other options please contact GRUB
-	     developpement team.  */
-	}
-
-      ptr += taglength;
-    }
-}
-
-#define OFFSET_OF(x, y) ((grub_uint8_t *)((y)->x) - (grub_uint8_t *)(y))
-
-struct grub_net_network_level_interface *
-grub_net_configure_by_dhcp_ack (const char *name,
-				struct grub_net_card *card,
-				grub_net_interface_flags_t flags,
-				const struct grub_net_bootp_packet *bp,
-				grub_size_t size,
-				int is_def, char **device, char **path)
-{
-  grub_net_network_level_address_t addr;
-  grub_net_link_level_address_t hwaddr;
-  struct grub_net_network_level_interface *inter;
-
-  addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-  addr.ipv4 = bp->your_ip;
-
-  if (device)
-    *device = 0;
-  if (path)
-    *path = 0;
-
-  grub_memcpy (hwaddr.mac, bp->mac_addr,
-	       bp->hw_len < sizeof (hwaddr.mac) ? bp->hw_len
-	       : sizeof (hwaddr.mac));
-  hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
-
-  inter = grub_net_add_addr (name, card, addr, hwaddr, flags);
-  {
-    grub_net_network_level_netaddress_t target;
-    grub_net_network_level_address_t gw;
-    char rname[grub_strlen (name) + sizeof ("_gw")];
-	  
-    target.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-    target.ipv4.base = bp->server_ip;
-    target.ipv4.masksize = 32;
-    gw.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-    gw.ipv4 = bp->gateway_ip;
-    grub_snprintf (rname, sizeof (rname), "%s_gw", name);
-    grub_net_add_route_gw (rname, target, gw);
-  }
-  {
-    grub_net_network_level_netaddress_t target;
-    target.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-    target.ipv4.base = bp->gateway_ip;
-    target.ipv4.masksize = 32;
-    grub_net_add_route (name, target, inter);
-  }
-
-  if (size > OFFSET_OF (boot_file, bp))
-    set_env_limn_ro (name, "boot_file", (char *) bp->boot_file,
-		     sizeof (bp->boot_file));
-  if (is_def)
-    default_server = 0;
-  if (size > OFFSET_OF (server_name, bp)
-      && bp->server_name[0])
-    {
-      set_env_limn_ro (name, "dhcp_server_name", (char *) bp->server_name,
-		       sizeof (bp->server_name));
-      if (is_def && !default_server)
-	{
-	  default_server = grub_strdup (bp->server_name);
-	  grub_print_error ();
-	}
-      if (device && !*device)
-	{
-	  *device = grub_xasprintf ("tftp,%s", bp->server_name);
-	  grub_print_error ();
-	}
-    }
-  if (is_def && !default_server)
-    {
-      default_server = grub_xasprintf ("%d.%d.%d.%d",
-				       ((grub_uint8_t *) &bp->server_ip)[0],
-				       ((grub_uint8_t *) &bp->server_ip)[1],
-				       ((grub_uint8_t *) &bp->server_ip)[2],
-				       ((grub_uint8_t *) &bp->server_ip)[3]);
-      grub_print_error ();
-    }
-
-  if (device && !*device)
-    {
-      *device = grub_xasprintf ("tftp,%d.%d.%d.%d",
-				((grub_uint8_t *) &bp->server_ip)[0],
-				((grub_uint8_t *) &bp->server_ip)[1],
-				((grub_uint8_t *) &bp->server_ip)[2],
-				((grub_uint8_t *) &bp->server_ip)[3]);
-      grub_print_error ();
-    }
-  if (size > OFFSET_OF (boot_file, bp) && path)
-    {
-      *path = grub_strndup (bp->boot_file, sizeof (bp->boot_file));
-      grub_print_error ();
-      if (*path)
-	{
-	  char *slash;
-	  slash = grub_strrchr (*path, '/');
-	  if (slash)
-	    *slash = 0;
-	  else
-	    **path = 0;
-	}
-    }
-  if (size > OFFSET_OF (vendor, bp))
-    parse_dhcp_vendor (name, &bp->vendor, size - OFFSET_OF (vendor, bp));
-
-  inter->dhcp_ack = grub_malloc (size);
-  if (inter->dhcp_ack)
-    {
-      grub_memcpy (inter->dhcp_ack, bp, size);
-      inter->dhcp_acklen = size;
-    }
-  else
-    grub_errno = GRUB_ERR_NONE;
-
-  return inter;
-}
-
-void
-grub_net_process_dhcp (struct grub_net_buff *nb,
-		       struct grub_net_card *card)
-{
-  char *name;
-  struct grub_net_network_level_interface *inf;
-
-  name = grub_xasprintf ("%s:dhcp", card->name);
-  if (!name)
-    {
-      grub_print_error ();
-      return;
-    }
-  grub_net_configure_by_dhcp_ack (name, card,
-				  0, (const struct grub_net_bootp_packet *) nb->data,
-				  (nb->tail - nb->data), 0, 0, 0);
-  grub_free (name);
-  if (grub_errno)
-    grub_print_error ();
-  else
-    {
-      FOR_NET_NETWORK_LEVEL_INTERFACES(inf)
-	if (grub_memcmp (inf->name, card->name, grub_strlen (card->name)) == 0
-	    && grub_memcmp (inf->name + grub_strlen (card->name),
-			    ":dhcp_tmp", sizeof (":dhcp_tmp") - 1) == 0)
-	  {
-	    grub_net_network_level_interface_unregister (inf);
-	    break;
-	  }
-    }
-}
-
-static char
-hexdigit (grub_uint8_t val)
-{
-  if (val < 10)
-    return val + '0';
-  return val + 'a' - 10;
-}
-
-static grub_err_t
-grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
-		  int argc, char **args)
-{
-  struct grub_net_network_level_interface *inter;
-  int num;
-  grub_uint8_t *ptr;
-  grub_uint8_t taglength;
-
-  if (argc < 4)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "4 arguments expected");
-
-  FOR_NET_NETWORK_LEVEL_INTERFACES (inter)
-    if (grub_strcmp (inter->name, args[1]) == 0)
-      break;
-
-  if (!inter)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-		       N_("unrecognised interface %s"), args[1]);
-
-  if (!inter->dhcp_ack)
-    return grub_error (GRUB_ERR_IO, N_("no DHCP info found"));
-
-  if (inter->dhcp_acklen <= OFFSET_OF (vendor, inter->dhcp_ack))
-    return grub_error (GRUB_ERR_IO, N_("no DHCP options found"));
-
-  num = grub_strtoul (args[2], 0, 0);
-  if (grub_errno)
-    return grub_errno;
-
-  ptr = inter->dhcp_ack->vendor;
-
-  if (ptr[0] != GRUB_NET_BOOTP_RFC1048_MAGIC_0
-      || ptr[1] != GRUB_NET_BOOTP_RFC1048_MAGIC_1
-      || ptr[2] != GRUB_NET_BOOTP_RFC1048_MAGIC_2
-      || ptr[3] != GRUB_NET_BOOTP_RFC1048_MAGIC_3)
-    return grub_error (GRUB_ERR_IO, N_("no DHCP options found"));
-  ptr = ptr + sizeof (grub_uint32_t);
-  while (1)
-    {
-      grub_uint8_t tagtype;
-
-      if (ptr >= ((grub_uint8_t *) inter->dhcp_ack) + inter->dhcp_acklen)
-	return grub_error (GRUB_ERR_IO, N_("no DHCP option %d found"), num);
-
-      tagtype = *ptr++;
-
-      /* Pad tag.  */
-      if (tagtype == 0)
-	continue;
-
-      /* End tag.  */
-      if (tagtype == 0xff)
-	return grub_error (GRUB_ERR_IO, N_("no DHCP option %d found"), num);
-
-      taglength = *ptr++;
-	
-      if (tagtype == num)
-	break;
-      ptr += taglength;
-    }
-
-  if (grub_strcmp (args[3], "string") == 0)
-    {
-      char *val = grub_malloc (taglength + 1);
-      if (!val)
-	return grub_errno;
-      grub_memcpy (val, ptr, taglength);
-      val[taglength] = 0;
-      if (args[0][0] == '-' && args[0][1] == 0)
-	grub_printf ("%s\n", val);
-      else
-	return grub_env_set (args[0], val);
-      return GRUB_ERR_NONE;
-    }
-
-  if (grub_strcmp (args[3], "number") == 0)
-    {
-      grub_uint64_t val = 0;
-      int i;
-      for (i = 0; i < taglength; i++)
-	val = (val << 8) | ptr[i];
-      if (args[0][0] == '-' && args[0][1] == 0)
-	grub_printf ("%llu\n", (unsigned long long) val);
-      else
-	{
-	  char valn[64];
-	  grub_printf (valn, sizeof (valn), "%lld\n", (unsigned long long) val);
-	  return grub_env_set (args[0], valn);
-	}
-      return GRUB_ERR_NONE;
-    }
-
-  if (grub_strcmp (args[3], "hex") == 0)
-    {
-      char *val = grub_malloc (2 * taglength + 1);
-      int i;
-      if (!val)
-	return grub_errno;
-      for (i = 0; i < taglength; i++)
-	{
-	  val[2 * i] = hexdigit (ptr[i] >> 4);
-	  val[2 * i + 1] = hexdigit (ptr[i] & 0xf);
-	}
-      val[2 * taglength] = 0;
-      if (args[0][0] == '-' && args[0][1] == 0)
-	grub_printf ("%s\n", val);
-      else
-	return grub_env_set (args[0], val);
-      return GRUB_ERR_NONE;
-    }
-
-  return grub_error (GRUB_ERR_BAD_ARGUMENT,
-		     "unrecognised format specification %s", args[3]);
-}
-
-static grub_err_t
-grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
-		int argc, char **args)
-{
-  struct grub_net_card *card;
-  struct grub_net_network_level_interface *ifaces;
-  grub_size_t ncards = 0;
-  unsigned j = 0;
-  int interval;
-  grub_err_t err;
-
-  FOR_NET_CARDS (card)
-  {
-    if (argc > 0 && grub_strcmp (card->name, args[0]) != 0)
-      continue;
-    ncards++;
-  }
-
-  ifaces = grub_zalloc (ncards * sizeof (ifaces[0]));
-  if (!ifaces)
-    return grub_errno;
-
-  j = 0;
-  FOR_NET_CARDS (card)
-  {
-    if (argc > 0 && grub_strcmp (card->name, args[0]) != 0)
-      continue;
-    ifaces[j].card = card;
-    ifaces[j].next = &ifaces[j+1];
-    if (j)
-      ifaces[j].prev = &ifaces[j-1].next;
-    ifaces[j].name = grub_xasprintf ("%s:dhcp_tmp", card->name);
-    card->num_ifaces++;
-    if (!ifaces[j].name)
-      {
-	unsigned i;
-	for (i = 0; i < j; i++)
-	  grub_free (ifaces[i].name);
-	grub_free (ifaces);
-	return grub_errno;
-      }
-    ifaces[j].address.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV;
-    grub_memcpy (&ifaces[j].hwaddress, &card->default_address, 
-		 sizeof (ifaces[j].hwaddress));
-    j++;
-  }
-  ifaces[ncards - 1].next = grub_net_network_level_interfaces;
-  if (grub_net_network_level_interfaces)
-    grub_net_network_level_interfaces->prev = & ifaces[ncards - 1].next;
-  grub_net_network_level_interfaces = &ifaces[0];
-  ifaces[0].prev = &grub_net_network_level_interfaces;
-  for (interval = 200; interval < 10000; interval *= 2)
-    {
-      int done = 0;
-      for (j = 0; j < ncards; j++)
-	{
-	  struct grub_net_bootp_packet *pack;
-	  struct grub_datetime date;
-	  grub_int32_t t;
-	  struct grub_net_buff *nb;
-	  struct udphdr *udph;
-	  grub_net_network_level_address_t target;
-
-	  if (!ifaces[j].prev)
-	    continue;
-	  nb = grub_netbuff_alloc (sizeof (*pack));
-	  if (!nb)
-	    return grub_errno;
-	  err = grub_netbuff_reserve (nb, sizeof (*pack) + 64 + 128);
-	  if (err)
-	    return err;
-	  err = grub_netbuff_push (nb, sizeof (*pack) + 64);
-	  if (err)
-	    return err;
-	  pack = (void *) nb->data;
-	  done = 1;
-	  grub_memset (pack, 0, sizeof (*pack) + 64);
-	  pack->opcode = 1;
-	  pack->hw_type = 1;
-	  pack->hw_len = 6;
-	  err = grub_get_datetime (&date);
-	  if (err || !grub_datetime2unixtime (&date, &t))
-	    {
-	      grub_errno = GRUB_ERR_NONE;
-	      t = 0;
-	    }
-	  pack->ident = grub_cpu_to_be32 (t);
-	  pack->seconds = 0;//grub_cpu_to_be16 (t);
-
-	  grub_memcpy (&pack->mac_addr, &ifaces[j].hwaddress.mac, 6); 
-
-	  grub_netbuff_push (nb, sizeof (*udph));
-
-	  udph = (struct udphdr *) nb->data;
-	  udph->src = grub_cpu_to_be16 (68);
-	  udph->dst = grub_cpu_to_be16 (67);
-	  udph->chksum = 0;
-	  udph->len = grub_cpu_to_be16 (nb->tail - nb->data);
-
-	  target.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-	  target.ipv4 = 0xffffffff;
-
-	  err = grub_net_send_ip_packet (&ifaces[j], &target, nb);
-	  if (err)
-	    return err;
-	}
-      if (!done)
-	break;
-      grub_net_poll_cards (interval);
-    }
-
-  err = GRUB_ERR_NONE;
-  for (j = 0; j < ncards; j++)
-    {
-      if (!ifaces[j].prev)
-	continue;
-      grub_error_push ();
-      grub_net_network_level_interface_unregister (&ifaces[j]);
-      err = grub_error (GRUB_ERR_FILE_NOT_FOUND, "couldn't configure %s",
-			ifaces[j].card->name);
-    }
-
-  return err;
-}
-
 static struct grub_fs grub_net_fs =
   {
     .name = "netfs",
@@ -1423,8 +931,8 @@ grub_net_restore_hw (void)
 static void *fini_hnd;
 
 static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
-static grub_command_t cmd_lsroutes, cmd_lscards, cmd_getdhcp, cmd_bootp;
+static grub_command_t cmd_lsroutes, cmd_lscards;
-static grub_command_t cmd_dhcp, cmd_lsaddr;
+static grub_command_t cmd_lsaddr;
 
 GRUB_MOD_INIT(net)
 {
@@ -1446,15 +954,7 @@ GRUB_MOD_INIT(net)
 				       "", N_("list network cards"));
   cmd_lsaddr = grub_register_command ("net_ls_addr", grub_cmd_listaddrs,
 				       "", N_("list network addresses"));
-  cmd_bootp = grub_register_command ("net_bootp", grub_cmd_bootp,
+  grub_bootp_init ();
-				     "[CARD]",
-				     N_("perform a bootp autoconfiguration"));
-  cmd_dhcp = grub_register_command ("net_dhcp", grub_cmd_bootp,
-				     "[CARD]",
-				     N_("perform a bootp autoconfiguration"));
-  cmd_getdhcp = grub_register_command ("net_get_dhcp_option", grub_cmd_dhcpopt,
-				       N_("VAR INTERFACE NUMBER DESCRIPTION"),
-				       N_("retrieve DHCP option and save it into VAR. If VAR is - then print the value."));
 
   grub_fs_register (&grub_net_fs);
   grub_net_open = grub_net_open_real;
@@ -1466,6 +966,7 @@ GRUB_MOD_INIT(net)
 
 GRUB_MOD_FINI(net)
 {
+  grub_bootp_fini ();
   grub_unregister_command (cmd_addaddr);
   grub_unregister_command (cmd_deladdr);
   grub_unregister_command (cmd_addroute);
@@ -1473,7 +974,6 @@ GRUB_MOD_FINI(net)
   grub_unregister_command (cmd_lsroutes);
   grub_unregister_command (cmd_lscards);
   grub_unregister_command (cmd_lsaddr);
-  grub_unregister_command (cmd_getdhcp);
   grub_fs_unregister (&grub_net_fs);
   grub_net_open = NULL;
   grub_net_fini_hw (0);

include/grub/net.h

@@ -429,4 +429,20 @@ extern struct grub_net_network_level_interface *grub_net_network_level_interface
 void
 grub_net_poll_cards (unsigned time);
 
+void grub_bootp_init (void);
+void grub_bootp_fini (void);
+
+static inline void
+grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
+{
+  inter->card->num_ifaces--;
+  *inter->prev = inter->next;
+  if (inter->next)
+    inter->next->prev = inter->prev;
+  inter->next = 0;
+  inter->prev = 0;
+}
+
+extern char *grub_net_default_server;
+
 #endif /* ! GRUB_NET_HEADER */