Restructure pxe
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
9a9852df79
commit
03b170647d
5 changed files with 433 additions and 341 deletions
|
|
@ -31,6 +31,7 @@
|
|||
#include <grub/extcmd.h>
|
||||
#include <grub/datetime.h>
|
||||
#include <grub/i18n.h>
|
||||
#include <grub/net.h>
|
||||
|
||||
static const struct grub_arg_option options[] =
|
||||
{
|
||||
|
|
@ -45,6 +46,8 @@ static const char grub_human_sizes[] = {' ', 'K', 'M', 'G', 'T'};
|
|||
static grub_err_t
|
||||
grub_ls_list_devices (int longlist)
|
||||
{
|
||||
grub_net_app_level_t proto;
|
||||
|
||||
auto int grub_ls_print_devices (const char *name);
|
||||
int grub_ls_print_devices (const char *name)
|
||||
{
|
||||
|
|
@ -58,6 +61,16 @@ grub_ls_list_devices (int longlist)
|
|||
|
||||
grub_device_iterate (grub_ls_print_devices);
|
||||
grub_xputs ("\n");
|
||||
|
||||
grub_puts_ (N_ ("Network protocols:\n"));
|
||||
|
||||
FOR_NET_APP_LEVEL (proto)
|
||||
{
|
||||
grub_printf ("%s ", proto->name);
|
||||
}
|
||||
|
||||
grub_xputs ("\n");
|
||||
|
||||
grub_refresh ();
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -22,30 +22,135 @@
|
|||
#include <grub/dl.h>
|
||||
#include <grub/command.h>
|
||||
|
||||
struct grub_net_route
|
||||
{
|
||||
struct grub_net_route *next;
|
||||
grub_net_network_level_netaddress_t target;
|
||||
char *name;
|
||||
struct grub_net_network_level_protocol *prot;
|
||||
int is_gateway;
|
||||
union
|
||||
{
|
||||
struct grub_net_network_level_interface *interface;
|
||||
grub_net_network_level_address_t gw;
|
||||
};
|
||||
};
|
||||
|
||||
struct grub_net_route *grub_net_routes = NULL;
|
||||
struct grub_net_network_level_interface *grub_net_network_level_interfaces = NULL;
|
||||
struct grub_net_card *grub_net_cards = NULL;
|
||||
struct grub_net_network_level_protocol *grub_net_network_level_protocols = NULL;
|
||||
|
||||
grub_err_t
|
||||
grub_net_resolve_address (struct grub_net_network_level_protocol **prot,
|
||||
char *name,
|
||||
grub_net_network_level_address_t *addr)
|
||||
static inline void
|
||||
grub_net_network_level_interface_register (struct grub_net_network_level_interface *inter)
|
||||
{
|
||||
FOR_NET_NETWORK_LEVEL_PROTOCOLS (*prot)
|
||||
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)
|
||||
{
|
||||
grub_list_remove (GRUB_AS_LIST_P (&grub_net_network_level_interfaces),
|
||||
GRUB_AS_LIST (inter));
|
||||
}
|
||||
|
||||
#define FOR_NET_NETWORK_LEVEL_INTERFACES(var) for (var = grub_net_network_level_interfaces; var; var = var->next)
|
||||
|
||||
static inline void
|
||||
grub_net_route_register (struct grub_net_route *route)
|
||||
{
|
||||
grub_list_push (GRUB_AS_LIST_P (&grub_net_routes),
|
||||
GRUB_AS_LIST (route));
|
||||
}
|
||||
|
||||
static inline void
|
||||
grub_net_route_unregister (struct grub_net_route *route)
|
||||
{
|
||||
grub_list_remove (GRUB_AS_LIST_P (&grub_net_routes),
|
||||
GRUB_AS_LIST (route));
|
||||
}
|
||||
|
||||
#define FOR_NET_ROUTES(var) for (var = grub_net_routes; var; var = var->next)
|
||||
|
||||
static int
|
||||
parse_ip (const char *val, grub_uint32_t *ip, const char **rest)
|
||||
{
|
||||
grub_uint32_t newip = 0;
|
||||
unsigned long t;
|
||||
int i;
|
||||
const char *ptr = val;
|
||||
|
||||
for (i = 0; i < 4; i++)
|
||||
{
|
||||
grub_err_t err;
|
||||
err = grub_net_resolve_address_in_protocol (*prot, name, addr);
|
||||
if (err == GRUB_ERR_NET_BAD_ADDRESS)
|
||||
t = grub_strtoul (ptr, (char **) &ptr, 0);
|
||||
if (grub_errno)
|
||||
{
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
continue;
|
||||
return 0;
|
||||
}
|
||||
if (err)
|
||||
return err;
|
||||
if (t & ~0xff)
|
||||
return 0;
|
||||
newip >>= 8;
|
||||
newip |= (t << 24);
|
||||
if (i != 3 && *ptr != '.')
|
||||
return 0;
|
||||
ptr++;
|
||||
}
|
||||
*ip = newip;
|
||||
if (rest)
|
||||
*rest = ptr - 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
match_net (const grub_net_network_level_netaddress_t *net,
|
||||
const grub_net_network_level_address_t *addr)
|
||||
{
|
||||
if (net->type != addr->type)
|
||||
return 0;
|
||||
switch (net->type)
|
||||
{
|
||||
case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4:
|
||||
{
|
||||
grub_int32_t mask = (1 << net->ipv4.masksize) - 1;
|
||||
return ((net->ipv4.base & mask) == (addr->ipv4 & mask));
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_net_resolve_address (const char *name,
|
||||
grub_net_network_level_address_t *addr)
|
||||
{
|
||||
if (parse_ip (name, &addr->ipv4, NULL))
|
||||
{
|
||||
addr->type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
return grub_error (GRUB_ERR_NET_BAD_ADDRESS, N_("Unrecognised address %s"),
|
||||
return grub_error (GRUB_ERR_NET_BAD_ADDRESS, N_("unrecognised address %s"),
|
||||
name);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_net_resolve_net_address (const char *name,
|
||||
grub_net_network_level_netaddress_t *addr)
|
||||
{
|
||||
const char *rest;
|
||||
if (parse_ip (name, &addr->ipv4.base, &rest))
|
||||
{
|
||||
addr->type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
|
||||
if (*rest == '/')
|
||||
{
|
||||
addr->ipv4.masksize = grub_strtoul (rest + 1, NULL, 0);
|
||||
if (!grub_errno)
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
addr->ipv4.masksize = 32;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
return grub_error (GRUB_ERR_NET_BAD_ADDRESS, N_("unrecognised address %s"),
|
||||
name);
|
||||
}
|
||||
|
||||
|
|
@ -71,8 +176,7 @@ grub_net_route_address (grub_net_network_level_address_t addr,
|
|||
{
|
||||
if (depth && prot != route->prot)
|
||||
continue;
|
||||
prot = route->prot;
|
||||
if (!route->prot->match_net (route->target, curtarget))
|
||||
if (!match_net (&route->target, &curtarget))
|
||||
continue;
|
||||
|
||||
if (route->is_gateway)
|
||||
|
|
@ -107,7 +211,6 @@ grub_cmd_deladdr (struct grub_command *cmd __attribute__ ((unused)),
|
|||
if (inter == NULL)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("address not found"));
|
||||
|
||||
inter->protocol->fini (inter);
|
||||
grub_net_network_level_interface_unregister (inter);
|
||||
grub_free (inter->name);
|
||||
grub_free (inter);
|
||||
|
|
@ -115,18 +218,35 @@ grub_cmd_deladdr (struct grub_command *cmd __attribute__ ((unused)),
|
|||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
struct grub_net_network_level_interface *inter;
|
||||
|
||||
inter = grub_zalloc (sizeof (*inter));
|
||||
if (!inter)
|
||||
return NULL;
|
||||
|
||||
inter->name = grub_strdup (name);
|
||||
grub_memcpy (&(inter->address), &addr, sizeof (inter->address));
|
||||
inter->card = card;
|
||||
|
||||
grub_net_network_level_interface_register (inter);
|
||||
|
||||
return inter;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_addaddr (struct grub_command *cmd __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
struct grub_net_card *card;
|
||||
struct grub_net_network_level_protocol *prot;
|
||||
grub_err_t err;
|
||||
grub_net_network_level_address_t addr;
|
||||
struct grub_net_network_level_interface *inter;
|
||||
grub_err_t err;
|
||||
|
||||
if (argc != 4)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("four arguments expected"));
|
||||
if (argc != 3)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("three arguments expected"));
|
||||
|
||||
FOR_NET_CARDS (card)
|
||||
if (grub_strcmp (card->name, args[1]))
|
||||
|
|
@ -134,36 +254,12 @@ grub_cmd_addaddr (struct grub_command *cmd __attribute__ ((unused)),
|
|||
if (card == NULL)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("card not found"));
|
||||
|
||||
FOR_NET_NETWORK_LEVEL_PROTOCOLS (prot)
|
||||
if (grub_strcmp (prot->name, args[2]))
|
||||
break;
|
||||
|
||||
if (card == NULL)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("protocol not found"));
|
||||
|
||||
err = grub_net_resolve_address_in_protocol (prot, args[3], &addr);
|
||||
err = grub_net_resolve_address (args[2], &addr);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
inter = grub_zalloc (sizeof (*inter));
|
||||
if (!inter)
|
||||
return grub_errno;
|
||||
|
||||
inter->name = grub_strdup (args[0]);
|
||||
inter->protocol = prot;
|
||||
grub_memcpy (&(inter->address), &addr, sizeof (inter->address));
|
||||
inter->card = card;
|
||||
|
||||
err = prot->init (inter);
|
||||
if (err)
|
||||
{
|
||||
grub_free (inter->name);
|
||||
grub_free (inter);
|
||||
return err;
|
||||
}
|
||||
grub_net_network_level_interface_register (inter);
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
grub_net_add_addr (args[0], card, addr);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
|
|
@ -188,84 +284,157 @@ grub_cmd_delroute (struct grub_command *cmd __attribute__ ((unused)),
|
|||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_addroute (struct grub_command *cmd __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
grub_err_t
|
||||
grub_net_add_route (const char *name,
|
||||
grub_net_network_level_netaddress_t target,
|
||||
struct grub_net_network_level_interface *inter)
|
||||
{
|
||||
struct grub_net_network_level_protocol *prot;
|
||||
struct grub_net_route *route;
|
||||
|
||||
if (argc < 3)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
N_("At least 3 arguments are expected"));
|
||||
|
||||
route = grub_zalloc (sizeof (*route));
|
||||
if (!route)
|
||||
return grub_errno;
|
||||
|
||||
route->name = grub_strdup (args[0]);
|
||||
route->name = grub_strdup (name);
|
||||
if (!route->name)
|
||||
{
|
||||
grub_free (route);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
FOR_NET_NETWORK_LEVEL_PROTOCOLS(prot)
|
||||
{
|
||||
grub_err_t err;
|
||||
err = prot->net_ntoa (args[1], &(route->target));
|
||||
if (err == GRUB_ERR_NET_BAD_ADDRESS)
|
||||
{
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
continue;
|
||||
}
|
||||
if (err)
|
||||
return err;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!prot)
|
||||
route->target = target;
|
||||
route->is_gateway = 0;
|
||||
route->interface = inter;
|
||||
|
||||
grub_net_route_register (route);
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_net_add_route_gw (const char *name,
|
||||
grub_net_network_level_netaddress_t target,
|
||||
grub_net_network_level_address_t gw)
|
||||
{
|
||||
struct grub_net_route *route;
|
||||
|
||||
route = grub_zalloc (sizeof (*route));
|
||||
if (!route)
|
||||
return grub_errno;
|
||||
|
||||
route->name = grub_strdup (name);
|
||||
if (!route->name)
|
||||
{
|
||||
grub_free (route->name);
|
||||
grub_free (route);
|
||||
return grub_error (GRUB_ERR_NET_BAD_ADDRESS,
|
||||
N_("Unrecognised address %s"), args[1]);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
route->target = target;
|
||||
route->is_gateway = 1;
|
||||
route->gw = gw;
|
||||
|
||||
grub_net_route_register (route);
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_addroute (struct grub_command *cmd __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
grub_net_network_level_netaddress_t target;
|
||||
if (argc < 3)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
N_("At least 3 arguments are expected"));
|
||||
|
||||
grub_net_resolve_net_address (args[1], &target);
|
||||
|
||||
if (grub_strcmp (args[2], "gw") == 0 && argc >= 4)
|
||||
{
|
||||
grub_err_t err;
|
||||
route->is_gateway = 1;
|
||||
err = grub_net_resolve_address_in_protocol (prot,
|
||||
args[3], &(route->gw));
|
||||
grub_net_network_level_address_t gw;
|
||||
|
||||
err = grub_net_resolve_address (args[3], &gw);
|
||||
if (err)
|
||||
{
|
||||
grub_free (route->name);
|
||||
grub_free (route);
|
||||
return err;
|
||||
}
|
||||
return err;
|
||||
return grub_net_add_route_gw (args[0], target, gw);
|
||||
}
|
||||
else
|
||||
{
|
||||
struct grub_net_network_level_interface *inter;
|
||||
route->is_gateway = 0;
|
||||
|
||||
FOR_NET_NETWORK_LEVEL_INTERFACES (inter)
|
||||
if (grub_strcmp (inter->name, args[2]))
|
||||
break;
|
||||
|
||||
if (!inter)
|
||||
{
|
||||
grub_free (route->name);
|
||||
grub_free (route);
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
N_("Unrecognised interface %s"), args[2]);
|
||||
}
|
||||
route->interface = inter;
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
N_("unrecognised interface %s"), args[2]);
|
||||
return grub_net_add_route (args[0], target, inter);
|
||||
}
|
||||
}
|
||||
|
||||
grub_net_route_register (route);
|
||||
static void
|
||||
print_net_address (const grub_net_network_level_netaddress_t *target)
|
||||
{
|
||||
switch (target->type)
|
||||
{
|
||||
case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4:
|
||||
grub_printf ("%d.%d.%d.%d/%d ", ((target->ipv4.base >> 24) & 0xff),
|
||||
((target->ipv4.base >> 16) & 0xff),
|
||||
((target->ipv4.base >> 8) & 0xff),
|
||||
((target->ipv4.base >> 0) & 0xff),
|
||||
target->ipv4.masksize);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
print_address (const grub_net_network_level_address_t *target)
|
||||
{
|
||||
switch (target->type)
|
||||
{
|
||||
case GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4:
|
||||
grub_printf ("%d.%d.%d.%d ", ((target->ipv4 >> 24) & 0xff),
|
||||
((target->ipv4 >> 16) & 0xff),
|
||||
((target->ipv4 >> 8) & 0xff),
|
||||
((target->ipv4 >> 0) & 0xff));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_listroutes (struct grub_command *cmd __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
{
|
||||
struct grub_net_route *route;
|
||||
FOR_NET_ROUTES(route)
|
||||
{
|
||||
grub_printf ("%s ", route->name);
|
||||
print_net_address (&route->target);
|
||||
if (route->is_gateway)
|
||||
{
|
||||
grub_printf ("gw ");
|
||||
print_address (&route->gw);
|
||||
}
|
||||
else
|
||||
grub_printf ("%s", route->interface->name);
|
||||
}
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_listcards (struct grub_command *cmd __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
{
|
||||
struct grub_net_card *card;
|
||||
FOR_NET_CARDS(card)
|
||||
{
|
||||
grub_printf ("%s ", card->name);
|
||||
}
|
||||
grub_printf ("\n");
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
|
@ -301,11 +470,12 @@ grub_net_open_real (const char *name)
|
|||
}
|
||||
|
||||
static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
|
||||
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 PROTOCOL ADDRESS",
|
||||
"SHORTNAME CARD ADDRESS",
|
||||
N_("Add a network address."));
|
||||
cmd_deladdr = grub_register_command ("net_del_addr", grub_cmd_deladdr,
|
||||
"SHORTNAME",
|
||||
|
|
@ -316,6 +486,11 @@ GRUB_MOD_INIT(net)
|
|||
cmd_delroute = grub_register_command ("net_del_route", grub_cmd_delroute,
|
||||
"SHORTNAME",
|
||||
N_("Delete a network route."));
|
||||
cmd_lsroutes = grub_register_command ("net_ls_routes", grub_cmd_listroutes,
|
||||
"", N_("list network routes"));
|
||||
cmd_lscards = grub_register_command ("net_ls_cards", grub_cmd_listcards,
|
||||
"", N_("list network cards"));
|
||||
|
||||
grub_net_open = grub_net_open_real;
|
||||
}
|
||||
|
||||
|
|
@ -325,5 +500,7 @@ GRUB_MOD_FINI(net)
|
|||
grub_unregister_command (cmd_deladdr);
|
||||
grub_unregister_command (cmd_addroute);
|
||||
grub_unregister_command (cmd_delroute);
|
||||
grub_unregister_command (cmd_lsroutes);
|
||||
grub_unregister_command (cmd_lscards);
|
||||
grub_net_open = NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue