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

Added ipv4_pseudo_header structure

This commit is contained in:
Nikhil Chandru Rao 2006-06-28 09:59:27 +00:00
parent e60817fa7a
commit 6e2c97b0c0
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/include/gpxe/ip.h
View File

@ -11,7 +11,6 @@
/* IP constants */ /* IP constants */
#define IP_HLEN 20
#define IP_VER 4 #define IP_VER 4
#define IP_MASK_VER 0xf0 #define IP_MASK_VER 0xf0
#define IP_MASK_HLEN 0x0f #define IP_MASK_HLEN 0x0f
@ -21,16 +20,20 @@
#define IP_TOS 0 #define IP_TOS 0
#define IP_TTL 64 #define IP_TTL 64
/* IP6 constants */ /* IP4 pseudo header */
struct ipv4_pseudo_header {
#define IP6_HLEN 38 struct in_addr src;
struct in_addr dest;
uint8_t zero_padding;
uint8_t protocol;
uint16_t len;
};
struct pk_buff; struct pk_buff;
struct net_device; struct net_device;
struct net_protocol; struct net_protocol;
extern struct net_protocol ipv4_protocol; extern struct net_protocol ipv4_protocol;
extern struct net_protocol ipv6_protocol;
extern int add_ipv4_address ( struct net_device *netdev, extern int add_ipv4_address ( struct net_device *netdev,
struct in_addr address, struct in_addr netmask, struct in_addr address, struct in_addr netmask,
@ -38,11 +41,6 @@ extern int add_ipv4_address ( struct net_device *netdev,
extern void del_ipv4_address ( struct net_device *netdev ); extern void del_ipv4_address ( struct net_device *netdev );
extern int ipv4_uip_tx ( struct pk_buff *pkb ); extern int ipv4_uip_tx ( struct pk_buff *pkb );
extern int ipv4_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in_addr *dest ); extern int ipv4_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in_addr *dest );
extern int ipv6_tx ( struct pk_buff *pkb, uint16_t trans_proto, struct in6_addr *dest );
extern void ipv4_rx ( struct pk_buff *pkb, struct net_device *netdev, const void *ll_source );
extern void ipv6_rx ( struct pk_buff *pkb, struct net_device *netdev, const void *ll_source );
#endif /* _GPXE_IP_H */ #endif /* _GPXE_IP_H */

19
src/net/ipv4.c
View File

@ -124,21 +124,18 @@ static void ipv4_dump ( struct iphdr *iphdr __unused ) {
void ipv4_tx_csum ( struct pk_buff *pkb, uint8_t trans_proto ) { void ipv4_tx_csum ( struct pk_buff *pkb, uint8_t trans_proto ) {
struct iphdr *iphdr = pkb->data; struct iphdr *iphdr = pkb->data;
void *pshdr = malloc ( IP_PSHLEN ); struct ipv4_pseudo_header pshdr;
void *csum_offset = iphdr + IP_HLEN + ( trans_proto == IP_UDP ? 6 : 16 ); void *csum_offset = iphdr + sizeof ( *iphdr ) + ( trans_proto == IP_UDP ? 6 : 16 );
int offset = 0;
/* Calculate pseudo header */ /* Calculate pseudo header */
memcpy ( pshdr, &iphdr->src, sizeof ( in_addr ) ); pshdr.src = iphdr->src;
offset += sizeof ( in_addr ); pshdr.dest = iphdr->dest;
memcpy ( pshdr + offset, &iphdr->dest, sizeof ( in_addr ) ); pshdr.zero_padding = 0x00;
offset += sizeof ( in_addr ); pshdr.protocol = iphdr->protocol;
*( ( uint8_t* ) ( pshdr + offset++ ) ) = 0x00; pshdr.len = htons ( pkb_len ( pkb ) - sizeof ( *iphdr ) );
*( ( uint8_t* ) ( pshdr + offset++ ) ) = iphdr->protocol;
*( ( uint16_t* ) ( pshdr + offset ) ) = pkb_len ( pkb ) - IP_HLEN;
/* Update the checksum value */ /* Update the checksum value */
*( ( uint16_t* ) csum_offset ) = *( ( uint16_t* ) csum_offset ) + calc_chksum ( pshdr, IP_PSHLEN ); *( ( uint16_t* ) csum_offset ) = *( ( uint16_t* ) csum_offset ) + calc_chksum ( &pshdr, IP_PSHLEN );
} }
/** /**