External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-07-03 00:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

tap: make tap_update_mac() generic

Browse Source 
Use ethhdr rather than tap_hdr.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-ID: <20240303135114.1023026-9-lvivier@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Laurent Vivier 2024-03-06 16:58:37 +11:00 committed by Stefano Brivio
parent 7df624e79a
commit 6b22e10a26
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tap.c
View File

@ -419,18 +419,18 @@ size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n)
} }
/** /**
* tap_update_mac() - Update tap L2 header with new Ethernet addresses * eth_update_mac() - Update tap L2 header with new Ethernet addresses
* @taph: Tap headers to update * @eh: Ethernet headers to update
* @eth_d: Ethernet destination address, NULL if unchanged * @eth_d: Ethernet destination address, NULL if unchanged
* @eth_s: Ethernet source address, NULL if unchanged * @eth_s: Ethernet source address, NULL if unchanged
*/ */
void tap_update_mac(struct tap_hdr *taph, void eth_update_mac(struct ethhdr *eh,
const unsigned char *eth_d, const unsigned char *eth_s) const unsigned char *eth_d, const unsigned char *eth_s)
{ {
if (eth_d) if (eth_d)
memcpy(taph->eh.h_dest, eth_d, sizeof(taph->eh.h_dest)); memcpy(eh->h_dest, eth_d, sizeof(eh->h_dest));
if (eth_s) if (eth_s)
memcpy(taph->eh.h_source, eth_s, sizeof(taph->eh.h_source)); memcpy(eh->h_source, eth_s, sizeof(eh->h_source));
} }
PACKET_POOL_DECL(pool_l4, UIO_MAXIOV, pkt_buf); PACKET_POOL_DECL(pool_l4, UIO_MAXIOV, pkt_buf);

2
tap.h
View File

@ -74,7 +74,7 @@ void tap_icmp6_send(const struct ctx *c,
const void *in, size_t len); const void *in, size_t len);
int tap_send(const struct ctx *c, const void *data, size_t len); int tap_send(const struct ctx *c, const void *data, size_t len);
size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n); size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n);
void tap_update_mac(struct tap_hdr *taph, void eth_update_mac(struct ethhdr *eh,
const unsigned char *eth_d, const unsigned char *eth_s); const unsigned char *eth_d, const unsigned char *eth_s);
void tap_listen_handler(struct ctx *c, uint32_t events); void tap_listen_handler(struct ctx *c, uint32_t events);
void tap_handler_pasta(struct ctx *c, uint32_t events, void tap_handler_pasta(struct ctx *c, uint32_t events,

8
tcp.c
View File

@ -981,10 +981,10 @@ void tcp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s)
struct tcp4_l2_buf_t *b4 = &tcp4_l2_buf[i]; struct tcp4_l2_buf_t *b4 = &tcp4_l2_buf[i];
struct tcp6_l2_buf_t *b6 = &tcp6_l2_buf[i]; struct tcp6_l2_buf_t *b6 = &tcp6_l2_buf[i];
tap_update_mac(&b4->taph, eth_d, eth_s); eth_update_mac(&b4->taph.eh, eth_d, eth_s);
tap_update_mac(&b6->taph, eth_d, eth_s); eth_update_mac(&b6->taph.eh, eth_d, eth_s);
tap_update_mac(&b4f->taph, eth_d, eth_s); eth_update_mac(&b4f->taph.eh, eth_d, eth_s);
tap_update_mac(&b6f->taph, eth_d, eth_s); eth_update_mac(&b6f->taph.eh, eth_d, eth_s);
} }
} }

4
udp.c
View File

@ -288,8 +288,8 @@ void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s)
struct udp4_l2_buf_t *b4 = &udp4_l2_buf[i]; struct udp4_l2_buf_t *b4 = &udp4_l2_buf[i];
struct udp6_l2_buf_t *b6 = &udp6_l2_buf[i]; struct udp6_l2_buf_t *b6 = &udp6_l2_buf[i];
tap_update_mac(&b4->taph, eth_d, eth_s); eth_update_mac(&b4->taph.eh, eth_d, eth_s);
tap_update_mac(&b6->taph, eth_d, eth_s); eth_update_mac(&b6->taph.eh, eth_d, eth_s);
} }
} }