Adaptation for the new protocols and interface structs.
implementation of receive in the protocols. Also all unwanted packets are discarded.
This commit is contained in:
Manoel R. Abranches
parent
c3639ae731
commit
60cdb895da
9 changed files with 505 additions and 226 deletions
|
|
@ -23,20 +23,11 @@
|
|||
#include <grub/err.h>
|
||||
#include <grub/list.h>
|
||||
#include <grub/net/netbuff.h>
|
||||
#include <grub/net/type_net.h>
|
||||
#include <grub/net/protocol.h>
|
||||
|
||||
struct grub_net_card;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
GRUB_NET_TFTP_ID,
|
||||
GRUB_NET_UDP_ID,
|
||||
GRUB_NET_IPV4_ID,
|
||||
GRUB_NET_IPV6_ID,
|
||||
GRUB_NET_ETHERNET_ID,
|
||||
GRUB_NET_ARP_ID,
|
||||
GRUB_NET_DHCP_ID
|
||||
|
||||
}protocol_type_t;
|
||||
|
||||
struct grub_net_card_driver
|
||||
{
|
||||
|
|
@ -66,76 +57,36 @@ struct grub_net_card
|
|||
void *data;
|
||||
};
|
||||
|
||||
struct grub_net_network_level_interface;
|
||||
//struct grub_net_network_layer_interface;
|
||||
|
||||
typedef union grub_net_network_level_address
|
||||
struct grub_net_network_layer_interface
|
||||
{
|
||||
grub_uint32_t ipv4;
|
||||
} grub_net_network_level_netaddress_t;
|
||||
|
||||
typedef union grub_net_network_level_netaddress
|
||||
{
|
||||
struct {
|
||||
grub_uint32_t base;
|
||||
int masksize;
|
||||
} ipv4;
|
||||
} grub_net_network_level_address_t;
|
||||
|
||||
typedef enum grub_network_level_protocol_id
|
||||
{
|
||||
GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4
|
||||
} grub_network_level_protocol_id_t;
|
||||
|
||||
struct grub_net_network_level_interface;
|
||||
|
||||
struct grub_net_network_level_protocol
|
||||
{
|
||||
struct grub_net_network_level_protocol *next;
|
||||
char *name;
|
||||
grub_network_level_protocol_id_t id;
|
||||
grub_err_t (*ntoa) (char *name, grub_net_network_level_address_t *addr);
|
||||
char * (*aton) (union grub_net_network_level_address addr);
|
||||
grub_err_t (*net_ntoa) (char *name,
|
||||
grub_net_network_level_netaddress_t *addr);
|
||||
char * (*net_aton) (grub_net_network_level_netaddress_t addr);
|
||||
int (* match_net) (grub_net_network_level_netaddress_t net,
|
||||
grub_net_network_level_address_t addr);
|
||||
grub_err_t (*init) (struct grub_net_network_level_interface *dev);
|
||||
grub_err_t (*fini) (struct grub_net_network_level_interface *dev);
|
||||
grub_err_t (*send) (struct grub_net_network_level_interface *dev, void *buf,
|
||||
grub_size_t buflen);
|
||||
grub_size_t (*recv) (struct grub_net_network_level_interface *dev, void *buf,
|
||||
grub_size_t buflen);
|
||||
};
|
||||
|
||||
struct grub_net_network_level_interface
|
||||
{
|
||||
struct grub_net_network_level_interface *next;
|
||||
struct grub_net_network_layer_interface *next;
|
||||
char *name;
|
||||
/* Underlying protocol. */
|
||||
struct grub_net_network_level_protocol *protocol;
|
||||
struct grub_net_network_layer_protocol *protocol;
|
||||
struct grub_net_card *card;
|
||||
union grub_net_network_level_address address;
|
||||
union grub_net_network_layer_address address;
|
||||
void *data;
|
||||
};
|
||||
|
||||
struct grub_net_route
|
||||
{
|
||||
struct grub_net_route *next;
|
||||
grub_net_network_level_netaddress_t target;
|
||||
grub_net_network_layer_netaddress_t target;
|
||||
char *name;
|
||||
struct grub_net_network_level_protocol *prot;
|
||||
struct grub_net_network_layer_protocol *prot;
|
||||
int is_gateway;
|
||||
union
|
||||
{
|
||||
struct grub_net_network_level_interface *interface;
|
||||
grub_net_network_level_address_t gw;
|
||||
struct grub_net_network_layer_interface *interface;
|
||||
grub_net_network_layer_address_t gw;
|
||||
};
|
||||
};
|
||||
|
||||
struct grub_net_session;
|
||||
|
||||
struct grub_net_session_level_protocol
|
||||
struct grub_net_session_layer_protocol
|
||||
{
|
||||
void (*close) (struct grub_net_session *session);
|
||||
grub_ssize_t (*recv) (struct grub_net_session *session, void *buf,
|
||||
|
|
@ -146,7 +97,7 @@ struct grub_net_session_level_protocol
|
|||
|
||||
struct grub_net_session
|
||||
{
|
||||
struct grub_net_session_level_protocol *protocol;
|
||||
struct grub_net_session_layer_protocol *protocol;
|
||||
void *data;
|
||||
};
|
||||
|
||||
|
|
@ -170,23 +121,23 @@ grub_net_session_recv (struct grub_net_session *session, void *buf,
|
|||
return session->protocol->recv (session, buf, size);
|
||||
}
|
||||
|
||||
extern struct grub_net_network_level_interface *grub_net_network_level_interfaces;
|
||||
struct grub_net_network_layer_interface *grub_net_network_layer_interfaces;
|
||||
|
||||
static inline void
|
||||
grub_net_network_level_interface_register (struct grub_net_network_level_interface *inter)
|
||||
grub_net_network_layer_interface_register (struct grub_net_network_layer_interface *inter)
|
||||
{
|
||||
grub_list_push (GRUB_AS_LIST_P (&grub_net_network_level_interfaces),
|
||||
grub_list_push (GRUB_AS_LIST_P (&grub_net_network_layer_interfaces),
|
||||
GRUB_AS_LIST (inter));
|
||||
}
|
||||
|
||||
static inline void
|
||||
grub_net_network_level_interface_unregister (struct grub_net_network_level_interface *inter)
|
||||
grub_net_network_layer_interface_unregister (struct grub_net_network_layer_interface *inter)
|
||||
{
|
||||
grub_list_remove (GRUB_AS_LIST_P (&grub_net_network_level_interfaces),
|
||||
grub_list_remove (GRUB_AS_LIST_P (&grub_net_network_layer_interfaces),
|
||||
GRUB_AS_LIST (inter));
|
||||
}
|
||||
|
||||
#define FOR_NET_NETWORK_LEVEL_INTERFACES(var) for (var = grub_net_network_level_interfaces; var; var = var->next)
|
||||
#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;
|
||||
|
||||
|
|
@ -224,28 +175,13 @@ grub_net_card_unregister (struct grub_net_card *card)
|
|||
|
||||
#define FOR_NET_CARDS(var) for (var = grub_net_cards; var; var = var->next)
|
||||
|
||||
extern struct grub_net_network_level_protocol *grub_net_network_level_protocols;
|
||||
|
||||
static inline void
|
||||
grub_net_network_level_protocol_register (struct grub_net_network_level_protocol *prot)
|
||||
{
|
||||
grub_list_push (GRUB_AS_LIST_P (&grub_net_network_level_protocols),
|
||||
GRUB_AS_LIST (prot));
|
||||
}
|
||||
|
||||
static inline void
|
||||
grub_net_network_level_protocol_unregister (struct grub_net_network_level_protocol *prot)
|
||||
{
|
||||
grub_list_remove (GRUB_AS_LIST_P (&grub_net_network_level_protocols),
|
||||
GRUB_AS_LIST (prot));
|
||||
}
|
||||
|
||||
#define FOR_NET_NETWORK_LEVEL_PROTOCOLS(var) for ((var) = grub_net_network_level_protocols; (var); (var) = (var)->next)
|
||||
#define FOR_NET_NETWORK_LEVEL_PROTOCOLS(var) for ((var) = grub_net_network_layer_protocols; (var); (var) = (var)->next)
|
||||
|
||||
static inline grub_err_t
|
||||
grub_net_resolve_address_in_protocol (struct grub_net_network_level_protocol *prot,
|
||||
grub_net_resolve_address_in_protocol (struct grub_net_network_layer_protocol *prot,
|
||||
char *name,
|
||||
grub_net_network_level_address_t *addr)
|
||||
grub_net_network_layer_address_t *addr)
|
||||
{
|
||||
return prot->ntoa (name, addr);
|
||||
}
|
||||
|
|
@ -254,14 +190,14 @@ struct grub_net_session *
|
|||
grub_net_open_tcp (char *address, grub_uint16_t port);
|
||||
|
||||
grub_err_t
|
||||
grub_net_resolve_address (struct grub_net_network_level_protocol **prot,
|
||||
grub_net_resolve_address (struct grub_net_network_layer_protocol **prot,
|
||||
char *name,
|
||||
grub_net_network_level_address_t *addr);
|
||||
grub_net_network_layer_address_t *addr);
|
||||
|
||||
grub_err_t
|
||||
grub_net_route_address (grub_net_network_level_address_t addr,
|
||||
grub_net_network_level_address_t *gateway,
|
||||
struct grub_net_network_level_interface **interf);
|
||||
grub_net_route_address (grub_net_network_layer_address_t addr,
|
||||
grub_net_network_layer_address_t *gateway,
|
||||
struct grub_net_network_layer_interface **interf);
|
||||
|
||||
|
||||
#endif /* ! GRUB_NET_HEADER */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue