david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Simplify ipv4_tx() by not having a separate "source" variable now that 

we are constructing the IP header ourselves.

Formatting fix-ups (80 column limit is mandatory!)
This commit is contained in:
Michael Brown 2006-06-26 16:10:34 +00:00
parent b49de73950
commit 35557914e3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/ipv4.c
View File

@ -238,7 +238,6 @@ int ipv4_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in_addr *dest )
struct ipv4_miniroute *miniroute;
struct net_device *netdev = NULL;
struct in_addr next_hop;
struct in_addr source;
uint8_t ll_dest_buf[MAX_LL_ADDR_LEN];
const uint8_t *ll_dest = ll_dest_buf;
int rc;
@ -273,7 +272,7 @@ int ipv4_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in_addr *dest )
miniroute->netmask.s_addr ) == 0 ) ||
( miniroute->gateway.s_addr != INADDR_NONE ) ) {
netdev = miniroute->netdev;
source = miniroute->address;
iphdr->src = miniroute->address;
if ( miniroute->gateway.s_addr != INADDR_NONE )
next_hop = miniroute->gateway;
break;
@ -286,8 +285,6 @@ int ipv4_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in_addr *dest )
goto err;
}
/* Copy the source address, after this the IP header is complete */
memcpy ( &iphdr->src, &source, sizeof ( struct in_addr ) );
/* Calculate the transport layer checksum */
ipv4_tx_csum ( pkb, trans_proto );
@ -312,8 +309,10 @@ int ipv4_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in_addr *dest )
ll_dest_buf[5] = next_hop_bytes[3];
} else {
/* Unicast address: resolve via ARP */
if ( ( rc = arp_resolve ( netdev, &ipv4_protocol, &next_hop, &source, ll_dest_buf ) ) != 0 ) {
DBG ( "No ARP entry for %s\n", inet_ntoa ( iphdr->dest ) );
if ( ( rc = arp_resolve ( netdev, &ipv4_protocol, &next_hop,
&iphdr->src, ll_dest_buf ) ) != 0 ) {
DBG ( "No ARP entry for %s\n",
inet_ntoa ( iphdr->dest ) );
goto err;
}
}
@ -322,7 +321,6 @@ int ipv4_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in_addr *dest )
return net_tx ( pkb, netdev, &ipv4_protocol, ll_dest );
err:
/* Warning: Allowing this function to execute causes bochs to go into an infinite loop */
free_pkb ( pkb );
return rc;
}