sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-18 18:40:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

[undi] Fill in ProtType correctly in PXENV_UNDI_ISR

Browse Source 
Determine the network-layer packet type and fill it in for UNDI
clients.  This is required by some NBPs such as emBoot's winBoot/i.

This change requires refactoring the link-layer portions of the
gPXE netdevice API, so that it becomes possible to strip the
link-layer header without passing the packet up the network stack.
This commit is contained in:
Michael Brown
2008-08-20 03:21:37 +01:00
parent f6f6f626f7
commit 30fb3b3810
5 changed files with 145 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/net/ethernet.c
View File

@@ -38,17 +38,16 @@
static uint8_t eth_broadcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/**
* Transmit Ethernet packet
* Add Ethernet link-layer header
*
* @v iobuf I/O buffer
* @v netdev Network device
* @v net_protocol Network-layer protocol
* @v ll_dest Link-layer destination address
*
* Prepends the Ethernet link-layer header and transmits the packet.
*/
static int eth_tx ( struct io_buffer *iobuf, struct net_device *netdev,
struct net_protocol *net_protocol, const void *ll_dest ) {
static int eth_push ( struct io_buffer *iobuf, struct net_device *netdev,
struct net_protocol *net_protocol,
const void *ll_dest ) {
struct ethhdr *ethhdr = iob_push ( iobuf, sizeof ( *ethhdr ) );
/* Build Ethernet header */
@@ -56,35 +55,38 @@ static int eth_tx ( struct io_buffer *iobuf, struct net_device *netdev,
memcpy ( ethhdr->h_source, netdev->ll_addr, ETH_ALEN );
ethhdr->h_protocol = net_protocol->net_proto;
/* Hand off to network device */
return netdev_tx ( netdev, iobuf );
return 0;
}
/**
* Process received Ethernet packet
* Remove Ethernet link-layer header
*
* @v iobuf I/O buffer
* @v netdev Network device
*
* Strips off the Ethernet link-layer header and passes up to the
* network-layer protocol.
* @v iobuf I/O buffer
* @v netdev Network device
* @v net_proto Network-layer protocol, in network-byte order
* @v ll_source Source link-layer address
* @ret rc Return status code
*/
static int eth_rx ( struct io_buffer *iobuf, struct net_device *netdev ) {
static int eth_pull ( struct io_buffer *iobuf,
struct net_device *netdev __unused,
uint16_t *net_proto, const void **ll_source ) {
struct ethhdr *ethhdr = iobuf->data;
/* Sanity check */
if ( iob_len ( iobuf ) < sizeof ( *ethhdr ) ) {
DBG ( "Ethernet packet too short (%zd bytes)\n",
iob_len ( iobuf ) );
free_iob ( iobuf );
return -EINVAL;
}
/* Strip off Ethernet header */
iob_pull ( iobuf, sizeof ( *ethhdr ) );
/* Hand off to network-layer protocol */
return net_rx ( iobuf, netdev, ethhdr->h_protocol, ethhdr->h_source );
/* Fill in required fields */
*net_proto = ethhdr->h_protocol;
*ll_source = ethhdr->h_source;
return 0;
}
/**
@@ -110,7 +112,7 @@ struct ll_protocol ethernet_protocol __ll_protocol = {
.ll_addr_len = ETH_ALEN,
.ll_header_len = ETH_HLEN,
.ll_broadcast = eth_broadcast,
.tx = eth_tx,
.rx = eth_rx,
.push = eth_push,
.pull = eth_pull,
.ntoa = eth_ntoa,
};

28
src/net/netdevice.c
View File

@@ -439,6 +439,7 @@ struct net_device * find_netdev_by_location ( unsigned int bus_type,
*/
int net_tx ( struct io_buffer *iobuf, struct net_device *netdev,
struct net_protocol *net_protocol, const void *ll_dest ) {
int rc;
/* Force a poll on the netdevice to (potentially) clear any
* backed-up TX completions. This is needed on some network
@@ -447,7 +448,15 @@ int net_tx ( struct io_buffer *iobuf, struct net_device *netdev,
*/
netdev_poll ( netdev );
return netdev->ll_protocol->tx ( iobuf, netdev, net_protocol, ll_dest );
/* Add link-layer header */
if ( ( rc = netdev->ll_protocol->push ( iobuf, netdev, net_protocol,
ll_dest ) ) != 0 ) {
free_iob ( iobuf );
return rc;
}
/* Transmit packet */
return netdev_tx ( netdev, iobuf );
}
/**
@@ -485,6 +494,10 @@ int net_rx ( struct io_buffer *iobuf, struct net_device *netdev,
static void net_step ( struct process *process __unused ) {
struct net_device *netdev;
struct io_buffer *iobuf;
struct ll_protocol *ll_protocol;
uint16_t net_proto;
const void *ll_source;
int rc;
/* Poll and process each network device */
list_for_each_entry ( netdev, &net_devices, list ) {
@@ -499,10 +512,21 @@ static void net_step ( struct process *process __unused ) {
* NIC faster than they arrive.
*/
if ( ( iobuf = netdev_rx_dequeue ( netdev ) ) ) {
DBGC ( netdev, "NETDEV %p processing %p (%p+%zx)\n",
netdev, iobuf, iobuf->data,
iob_len ( iobuf ) );
netdev->ll_protocol->rx ( iobuf, netdev );
/* Remove link-layer header */
ll_protocol = netdev->ll_protocol;
if ( ( rc = ll_protocol->pull ( iobuf, netdev,
&net_proto,
&ll_source ) ) != 0 ) {
free_iob ( iobuf );
continue;
}
net_rx ( iobuf, netdev, net_proto, ll_source );
}
}
}