Implement few variables

diff --git a/grub-core/commands/net.c b/grub-core/commands/net.c
index 9d28c2ff7c0d9a285a7413f5ebcea3cde1a97aa5..5a21178e519b560aaeb743b1580255ab11e4b9e5 100644 (file)
--- a/grub-core/commands/net.c
+++ b/grub-core/commands/net.c
@@ -21,6 +21,7 @@
 #include <grub/mm.h>
 #include <grub/dl.h>
 #include <grub/command.h>
+#include <grub/env.h>
 
 struct grub_net_route
 {
@@ -41,13 +42,6 @@ struct grub_net_network_level_interface *grub_net_network_level_interfaces = NUL
 struct grub_net_card *grub_net_cards = NULL;
 struct grub_net_network_level_protocol *grub_net_network_level_protocols = NULL;
 
-static inline void
-grub_net_network_level_interface_register (struct grub_net_network_level_interface *inter)
-{
-  grub_list_push (GRUB_AS_LIST_P (&grub_net_network_level_interfaces),
-                 GRUB_AS_LIST (inter));
-}
-
 static inline void
 grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
 {
@@ -212,6 +206,10 @@ grub_cmd_deladdr (struct grub_command *cmd __attribute__ ((unused)),
   if (inter == NULL)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("address not found"));
 
+  if (inter->flags & GRUB_NET_INTERFACE_PERMANENT)
+    return grub_error (GRUB_ERR_IO,
+                      N_("you can't delete this address"));
+
   grub_net_network_level_interface_unregister (inter);
   grub_free (inter->name);
   grub_free (inter);
@@ -219,9 +217,104 @@ grub_cmd_deladdr (struct grub_command *cmd __attribute__ ((unused)),
   return GRUB_ERR_NONE;  
 }
 
+/*
+  Currently suppoerted adresses:
+  IPv4:   XXX.XXX.XXX.XXX
+ */
+#define MAX_STR_ADDR_LEN sizeof ("XXX.XXX.XXX.XXX")
+
+static void
+addr_to_str (const grub_net_network_level_address_t *target, char *buf)
+{
+  switch (target->type)
+    {
+    case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4:
+      {
+       grub_uint32_t n = grub_be_to_cpu32 (target->ipv4);
+       grub_snprintf (buf, MAX_STR_ADDR_LEN, "%d.%d.%d.%d",
+                      ((n >> 24) & 0xff), ((n >> 16) & 0xff),
+                      ((n >> 8) & 0xff), ((n >> 0) & 0xff));
+      }
+      return;
+    }
+  grub_printf ("Unknown address type %d\n", target->type);
+}
+
+/*
+  Currently suppoerted adresses:
+  ethernet:   XX:XX:XX:XX:XX:XX
+ */
+
+#define MAX_STR_HWADDR_LEN (sizeof ("XX:XX:XX:XX:XX:XX"))
+
+static void
+hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
+{
+  str[0] = 0;
+  switch (addr->type)
+    {
+    case GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET:
+      {
+       char *ptr;
+       unsigned i;
+       for (ptr = str, i = 0; i < ARRAY_SIZE (addr->mac); i++)
+         {
+           grub_snprintf (ptr, MAX_STR_HWADDR_LEN - (ptr - str),
+                          "%02x:", addr->mac[i] & 0xff);
+           ptr += (sizeof ("XX:") - 1);
+         }
+      return;
+      }
+    }
+  grub_printf ("Unsupported hw address type %d\n", addr->type);
+}
+
+/* FIXME: implement this. */
+static char *
+hwaddr_set_env (struct grub_env_var *var __attribute__ ((unused)),
+               const char *val __attribute__ ((unused)))
+{
+  return NULL;
+}
+
+/* FIXME: implement this. */
+static char *
+addr_set_env (struct grub_env_var *var __attribute__ ((unused)),
+             const char *val __attribute__ ((unused)))
+{
+  return NULL;
+}
+
+static void
+grub_net_network_level_interface_register (struct grub_net_network_level_interface *inter)
+{
+  {
+    char buf[MAX_STR_HWADDR_LEN];
+    char name[grub_strlen (inter->name) + sizeof ("net__mac")];
+    hwaddr_to_str (&inter->hwaddress, buf);
+    grub_snprintf (name, sizeof (name), "net_%s_mac", inter->name);
+    grub_env_set (name, buf);
+    grub_register_variable_hook (name, 0, hwaddr_set_env);
+  }
+
+  {
+    char buf[MAX_STR_ADDR_LEN];
+    char name[grub_strlen (inter->name) + sizeof ("net__ip")];
+    addr_to_str (&inter->address, buf);
+    grub_snprintf (name, sizeof (name), "net_%s_ip", inter->name);
+    grub_env_set (name, buf);
+    grub_register_variable_hook (name, 0, addr_set_env);
+  }
+
+  grub_list_push (GRUB_AS_LIST_P (&grub_net_network_level_interfaces),
+                 GRUB_AS_LIST (inter));
+}
+
 struct grub_net_network_level_interface *
 grub_net_add_addr (const char *name, struct grub_net_card *card,
-                  grub_net_network_level_address_t addr)
+                  grub_net_network_level_address_t addr,
+                  grub_net_link_level_address_t hwaddress,
+                  grub_net_interface_flags_t flags)
 {
   struct grub_net_network_level_interface *inter;
 
@@ -231,6 +324,8 @@ grub_net_add_addr (const char *name, struct grub_net_card *card,
 
   inter->name = grub_strdup (name);
   grub_memcpy (&(inter->address), &addr, sizeof (inter->address));
+  grub_memcpy (&(inter->hwaddress), &hwaddress, sizeof (inter->hwaddress));
+  inter->flags = flags;
   inter->card = card;
 
   grub_net_network_level_interface_register (inter);
@@ -238,6 +333,7 @@ grub_net_add_addr (const char *name, struct grub_net_card *card,
   return inter;
 }
 
+/* FIXME: support MAC specifying.  */
 static grub_err_t
 grub_cmd_addaddr (struct grub_command *cmd __attribute__ ((unused)),
                  int argc, char **args)
@@ -245,6 +341,7 @@ grub_cmd_addaddr (struct grub_command *cmd __attribute__ ((unused)),
   struct grub_net_card *card;
   grub_net_network_level_address_t addr;
   grub_err_t err;
+  grub_net_interface_flags_t flags = 0;
 
   if (argc != 3)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("three arguments expected"));
@@ -259,7 +356,15 @@ grub_cmd_addaddr (struct grub_command *cmd __attribute__ ((unused)),
   if (err)
     return err;
 
-  grub_net_add_addr (args[0], card, addr);
+  if (card->flags & GRUB_NET_CARD_NO_MANUAL_INTERFACES)
+    return grub_error (GRUB_ERR_IO,
+                      "this card doesn't support address addition");
+
+  if (card->flags & GRUB_NET_CARD_HWADDRESS_IMMUTABLE)
+    flags |= GRUB_NET_INTERFACE_HWADDRESS_IMMUTABLE;
+
+  grub_net_add_addr (args[0], card, addr, card->default_address,
+                    flags);
   return grub_errno;
 }
 
@@ -397,19 +502,9 @@ print_net_address (const grub_net_network_level_netaddress_t *target)
 static void
 print_address (const grub_net_network_level_address_t *target)
 {
-  switch (target->type)
-    {
-    case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4:
-      {
-       grub_uint32_t n = grub_be_to_cpu32 (target->ipv4);
-       grub_printf ("%d.%d.%d.%d ", ((n >> 24) & 0xff),
-                    ((n >> 16) & 0xff),
-                    ((n >> 8) & 0xff),
-                    ((n >> 0) & 0xff));
-      }
-      return;
-    }
-  grub_printf ("Unknown address type %d\n", target->type);
+  char buf[MAX_STR_ADDR_LEN];
+  addr_to_str (target, buf);
+  grub_xputs (buf);
 }
 
 static grub_err_t
@@ -487,7 +582,7 @@ static grub_command_t cmd_lsroutes, cmd_lscards;
 GRUB_MOD_INIT(net)
 {
   cmd_addaddr = grub_register_command ("net_add_addr", grub_cmd_addaddr,
-                                      "SHORTNAME CARD ADDRESS",
+                                      "SHORTNAME CARD ADDRESS [HWADDRESS]",
                                       N_("Add a network address."));
   cmd_deladdr = grub_register_command ("net_del_addr", grub_cmd_deladdr,
                                       "SHORTNAME",

diff --git a/grub-core/fs/i386/pc/pxe.c b/grub-core/fs/i386/pc/pxe.c
index 85d138bb004aa3d254d785a1f7cdfe1613f2485e..1d9ea8f89b81eb061d2f49f98510dc6b18001e32 100644 (file)
--- a/grub-core/fs/i386/pc/pxe.c
+++ b/grub-core/fs/i386/pc/pxe.c
@@ -41,6 +41,7 @@ static grub_uint32_t grub_pxe_default_gateway_ip;
 static unsigned grub_pxe_blksize = GRUB_PXE_MIN_BLKSIZE;
 
 static grub_file_t curr_file = 0;
+static grub_net_link_level_address_t pxe_hwaddr;
 
 struct grub_pxe_data
 {
@@ -322,29 +323,6 @@ grub_env_write_readonly (struct grub_env_var *var __attribute__ ((unused)),
   return NULL;
 }
 
-static void
-set_mac_env (grub_uint8_t *mac_addr, grub_size_t mac_len)
-{
-  char buf[(sizeof ("XX:") - 1) * mac_len + 1];
-  char *ptr = buf;
-  unsigned i;
-
-  for (i = 0; i < mac_len; i++)
-    {
-      grub_snprintf (ptr, sizeof (buf) - (ptr - buf),
-                    "%02x:", mac_addr[i] & 0xff);
-      ptr += (sizeof ("XX:") - 1);
-    }
-  if (mac_len)
-    *(ptr - 1) = 0;
-  else
-    buf[0] = 0;
-
-  grub_env_set ("net_pxe_mac", buf);
-  /* XXX: Is it possible to change MAC in PXE?  */
-  grub_register_variable_hook ("net_pxe_mac", 0, grub_env_write_readonly);
-}
-
 static void
 set_env_limn_ro (const char *varname, char *value, grub_size_t len)
 {
@@ -432,8 +410,10 @@ grub_pxe_detect (void)
   grub_pxe_your_ip = bp->your_ip;
   grub_pxe_default_server_ip = bp->server_ip;
   grub_pxe_default_gateway_ip = bp->gateway_ip;
-  set_mac_env (bp->mac_addr, bp->hw_len < sizeof (bp->mac_addr) ? bp->hw_len
-              : sizeof (bp->mac_addr));
+  grub_memcpy (pxe_hwaddr.mac, bp->mac_addr,
+              bp->hw_len < sizeof (pxe_hwaddr.mac)
+              ? bp->hw_len : sizeof (pxe_hwaddr.mac));
+  pxe_hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
   set_env_limn_ro ("net_pxe_boot_file", (char *) bp->boot_file,
                   sizeof (bp->boot_file));
   set_env_limn_ro ("net_pxe_dhcp_server_name", (char *) bp->server_name,
@@ -589,7 +569,10 @@ GRUB_MOD_INIT(pxe)
       grub_net_card_register (&grub_pxe_card);
       addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
       addr.ipv4 = grub_pxe_your_ip;
-      inter = grub_net_add_addr ("pxe", &grub_pxe_card, addr);
+      inter = grub_net_add_addr ("pxe", &grub_pxe_card, addr, pxe_hwaddr,
+                                GRUB_NET_INTERFACE_PERMANENT
+                                | GRUB_NET_INTERFACE_ADDRESS_IMMUTABLE
+                                | GRUB_NET_INTERFACE_HWADDRESS_IMMUTABLE);
       if (grub_pxe_default_gateway_ip != grub_pxe_default_server_ip)
        {
          grub_net_network_level_netaddress_t target;

diff --git a/include/grub/net.h b/include/grub/net.h
index 4efd79f79c316a5e603e70940d590e3adb23d25e..649bf40965c4df908ea2f06c3a613725c0b690ad 100644 (file)
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -34,6 +34,33 @@ typedef struct grub_net
 
 extern grub_net_t (*EXPORT_VAR (grub_net_open)) (const char *name);
 
+typedef enum grub_link_level_protocol_id 
+{
+  GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET
+} grub_link_level_protocol_id_t;
+
+typedef struct grub_net_link_level_address
+{
+  grub_link_level_protocol_id_t type;
+  union
+  {
+    grub_uint8_t mac[6];
+  };
+} grub_net_link_level_address_t;
+
+typedef enum grub_net_interface_flags
+  {
+    GRUB_NET_INTERFACE_HWADDRESS_IMMUTABLE = 1,
+    GRUB_NET_INTERFACE_ADDRESS_IMMUTABLE = 2,
+    GRUB_NET_INTERFACE_PERMANENT = 4
+  } grub_net_interface_flags_t;
+
+typedef enum grub_net_card_flags
+  {
+    GRUB_NET_CARD_HWADDRESS_IMMUTABLE = 1,
+    GRUB_NET_CARD_NO_MANUAL_INTERFACES = 2
+  } grub_net_card_flags_t;
+
 struct grub_net_card;
 
 struct grub_net_card_driver
@@ -49,6 +76,8 @@ struct grub_net_card
   struct grub_net_card *next;
   char *name;
   struct grub_net_card_driver *driver;
+  grub_net_link_level_address_t default_address;
+  grub_net_card_flags_t flags;
   void *data;
 };
 
@@ -88,6 +117,8 @@ struct grub_net_network_level_interface
   char *name;
   struct grub_net_card *card;
   grub_net_network_level_address_t address;
+  grub_net_link_level_address_t hwaddress;
+  grub_net_interface_flags_t flags;
   void *data;
 };
 
@@ -130,7 +161,9 @@ grub_net_session_recv (struct grub_net_session *session, void *buf,
 
 struct grub_net_network_level_interface *
 grub_net_add_addr (const char *name, struct grub_net_card *card,
-                  grub_net_network_level_address_t addr);
+                  grub_net_network_level_address_t addr,
+                  grub_net_link_level_address_t hwaddress,
+                  grub_net_interface_flags_t flags);
 
 extern struct grub_net_network_level_interface *grub_net_network_level_interfaces;