vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use the correct address types in net.c.

Browse source 
implement ntoa ipv4 function.
This commit is contained in:
Manoel R. Abranches 2010-09-15 13:00:51 -03:00
parent 10830203a0
commit 9a9cee4e43
5 changed files with 97 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/grub/net.h
View file

@ -31,6 +31,8 @@ struct grub_net_card;
struct grub_net_card_driver
{
struct grub_net_card_driver *next;
char *name;
grub_err_t (*init) (struct grub_net_card *dev);
grub_err_t (*fini) (struct grub_net_card *dev);
grub_err_t (*send) (struct grub_net_card *dev,struct grub_net_buff *nb);
@ -66,7 +68,7 @@ struct grub_net_network_layer_interface
/* Underlying protocol. */
struct grub_net_network_layer_protocol *protocol;
struct grub_net_card *card;
union grub_net_network_layer_address address;
grub_net_network_layer_address_t address;
void *data;
};
@ -121,7 +123,7 @@ grub_net_session_recv (struct grub_net_session *session, void *buf,
return session->protocol->recv (session, buf, size);
}
struct grub_net_network_layer_interface *grub_net_network_layer_interfaces;
extern struct grub_net_network_layer_interface *EXPORT_VAR(grub_net_network_layer_interfaces);
static inline void
grub_net_network_layer_interface_register (struct grub_net_network_layer_interface *inter)
@ -139,7 +141,7 @@ grub_net_network_layer_interface_unregister (struct grub_net_network_layer_inter
#define FOR_NET_NETWORK_LEVEL_INTERFACES(var) for (var = grub_net_network_layer_interfaces; var; var = var->next)
extern struct grub_net_route *grub_net_routes;
extern struct grub_net_route *EXPORT_VAR(grub_net_routes);
static inline void
grub_net_route_register (struct grub_net_route *route)
@ -157,7 +159,7 @@ grub_net_route_unregister (struct grub_net_route *route)
#define FOR_NET_ROUTES(var) for (var = grub_net_routes; var; var = var->next)
extern struct grub_net_card *grub_net_cards;
extern struct grub_net_card *EXPORT_VAR(grub_net_cards);
static inline void
grub_net_card_register (struct grub_net_card *card)
@ -174,7 +176,26 @@ grub_net_card_unregister (struct grub_net_card *card)
}
#define FOR_NET_CARDS(var) for (var = grub_net_cards; var; var = var->next)
struct grub_net_card_driver *grub_net_card_drivers;
static inline void
grub_net_card_driver_register (struct grub_net_card_driver *driver)
{
grub_list_push (GRUB_AS_LIST_P (&grub_net_card_drivers),
GRUB_AS_LIST (driver));
}
static inline void
grub_net_card_driver_unregister (struct grub_net_card_driver *driver)
{
grub_list_remove (GRUB_AS_LIST_P (&grub_net_card_drivers),
GRUB_AS_LIST (driver));
}
void ofdriver_ini(void);
void ofdriver_fini(void);
#define FOR_NET_CARD_DRIVERS(var) for (var = grub_net_card_drivers; var; var = var->next)
#define FOR_NET_NETWORK_LEVEL_PROTOCOLS(var) for ((var) = grub_net_network_layer_protocols; (var); (var) = (var)->next)

5
include/grub/net/protocol.h
View file

@ -1,6 +1,7 @@
#ifndef GRUB_PROTOCOL_HEADER
#define GRUB_PROTOCOL_HEADER
#include <grub/err.h>
#include <grub/mm.h>
#include <grub/net/interface.h>
#include <grub/net/netbuff.h>
#include <grub/net/type_net.h>
@ -60,7 +61,7 @@ struct grub_net_network_layer_protocol
grub_uint16_t type; /* IANA Ethertype */
//grub_network_layer_protocol_id_t id;
grub_err_t (*ntoa) (char *name, grub_net_network_layer_address_t *addr);
char * (*aton) (union grub_net_network_layer_address addr);
char * (*aton) (grub_net_network_layer_address_t addr);
grub_err_t (*net_ntoa) (char *name,
grub_net_network_layer_netaddress_t *addr);
char * (*net_aton) (grub_net_network_layer_netaddress_t addr);
@ -87,7 +88,7 @@ struct grub_net_link_layer_protocol
grub_uint16_t ethertype);
};
extern struct grub_net_network_layer_protocol *grub_net_network_layer_protocols;
extern struct grub_net_network_layer_protocol *EXPORT_VAR(grub_net_network_layer_protocols);
typedef struct grub_net_protocol *grub_net_protocol_t;
void grub_net_application_layer_protocol_register (struct grub_net_application_layer_protocol *prot);

8
include/grub/net/type_net.h
View file

@ -18,16 +18,16 @@ typedef enum
}grub_net_protocol_id_t;
typedef union grub_net_network_layer_address
typedef union grub_net_network_layer_netaddress
{
grub_uint32_t ipv4;
} grub_net_network_layer_netaddress_t;
} grub_net_network_layer_address_t;
typedef union grub_net_network_layer_netaddress
typedef union grub_net_network_layer_address
{
struct {
grub_uint32_t base;
int masksize;
} ipv4;
} grub_net_network_layer_address_t;
} grub_net_network_layer_netaddress_t;
#endif