narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ipv4] Use broadcast link-layer address for all broadcast IPv4 addresses 

When transmitting, use the broadcast link-layer address for any
broadcast address (e.g. 192.168.0.255), not just INADDR_BROADCAST
(255.255.255.255).

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/5/head
Michael Brown 2011-07-15 19:21:07 +01:00
parent dfbb3bd184
commit 5b41381f33
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/ipv4.c
View File

@ -110,10 +110,6 @@ static struct ipv4_miniroute * ipv4_route ( struct in_addr *dest ) {
int local; int local;
int has_gw; int has_gw;
/* Never attempt to route the broadcast address */
if ( dest->s_addr == INADDR_BROADCAST )
return NULL;
/* Find first usable route in routing table */ /* Find first usable route in routing table */
list_for_each_entry ( miniroute, &ipv4_miniroutes, list ) { list_for_each_entry ( miniroute, &ipv4_miniroutes, list ) {
if ( ! netdev_is_open ( miniroute->netdev ) ) if ( ! netdev_is_open ( miniroute->netdev ) )
@ -260,15 +256,17 @@ static uint16_t ipv4_pshdr_chksum ( struct io_buffer *iobuf, uint16_t csum ) {
* *
* @v dest IPv4 destination address * @v dest IPv4 destination address
* @v src IPv4 source address * @v src IPv4 source address
* @v netmask IPv4 subnet mask
* @v netdev Network device * @v netdev Network device
* @v ll_dest Link-layer destination address buffer * @v ll_dest Link-layer destination address buffer
* @ret rc Return status code * @ret rc Return status code
*/ */
static int ipv4_ll_addr ( struct in_addr dest, struct in_addr src, static int ipv4_ll_addr ( struct in_addr dest, struct in_addr src,
struct net_device *netdev, uint8_t *ll_dest ) { struct in_addr netmask, struct net_device *netdev,
uint8_t *ll_dest ) {
struct ll_protocol *ll_protocol = netdev->ll_protocol; struct ll_protocol *ll_protocol = netdev->ll_protocol;
if ( dest.s_addr == INADDR_BROADCAST ) { if ( ( ( dest.s_addr ^ INADDR_BROADCAST ) & ~netmask.s_addr ) == 0 ) {
/* Broadcast address */ /* Broadcast address */
memcpy ( ll_dest, netdev->ll_broadcast, memcpy ( ll_dest, netdev->ll_broadcast,
ll_protocol->ll_addr_len ); ll_protocol->ll_addr_len );
@ -306,6 +304,7 @@ static int ipv4_tx ( struct io_buffer *iobuf,
struct sockaddr_in *sin_dest = ( ( struct sockaddr_in * ) st_dest ); struct sockaddr_in *sin_dest = ( ( struct sockaddr_in * ) st_dest );
struct ipv4_miniroute *miniroute; struct ipv4_miniroute *miniroute;
struct in_addr next_hop; struct in_addr next_hop;
struct in_addr netmask = { .s_addr = 0 };
uint8_t ll_dest[MAX_LL_ADDR_LEN]; uint8_t ll_dest[MAX_LL_ADDR_LEN];
int rc; int rc;
@ -326,6 +325,7 @@ static int ipv4_tx ( struct io_buffer *iobuf,
( ! IN_MULTICAST ( ntohl ( next_hop.s_addr ) ) ) && ( ! IN_MULTICAST ( ntohl ( next_hop.s_addr ) ) ) &&
( ( miniroute = ipv4_route ( &next_hop ) ) != NULL ) ) { ( ( miniroute = ipv4_route ( &next_hop ) ) != NULL ) ) {
iphdr->src = miniroute->address; iphdr->src = miniroute->address;
netmask = miniroute->netmask;
netdev = miniroute->netdev; netdev = miniroute->netdev;
} }
if ( ! netdev ) { if ( ! netdev ) {
@ -343,7 +343,7 @@ static int ipv4_tx ( struct io_buffer *iobuf,
( ( netdev->rx_stats.good & 0xf ) << 0 ) ); ( ( netdev->rx_stats.good & 0xf ) << 0 ) );
/* Determine link-layer destination address */ /* Determine link-layer destination address */
if ( ( rc = ipv4_ll_addr ( next_hop, iphdr->src, netdev, if ( ( rc = ipv4_ll_addr ( next_hop, iphdr->src, netmask, netdev,
ll_dest ) ) != 0 ) { ll_dest ) ) != 0 ) {
DBG ( "IPv4 has no link-layer address for %s: %s\n", DBG ( "IPv4 has no link-layer address for %s: %s\n",
inet_ntoa ( next_hop ), strerror ( rc ) ); inet_ntoa ( next_hop ), strerror ( rc ) );