mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-09 13:30:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

avb: don't include ethernet header in in packets

Browse source 
Move vlan_id and prio to the stream.
This commit is contained in:
Wim Taymans 2022-04-07 15:14:45 +02:00
parent dec2bdf241
commit 9bfb23f3f8
16 changed files with 217 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/module-avb/aecp.c
View file

@ -43,13 +43,13 @@ static int reply_not_implemented(struct aecp *aecp, const void *p, int len)
{
struct server *server = aecp->server;
uint8_t buf[len];
struct avb_packet_aecp_header *reply = (struct avb_packet_aecp_header*)buf;
struct avb_ethernet_header *h = (void*)buf;
struct avb_packet_aecp_header *reply = SPA_PTROFF(h, sizeof(*h), void);
memcpy(reply, p, len);
memcpy(h, p, len);
AVB_PACKET_AECP_SET_STATUS(reply, AVB_AECP_STATUS_NOT_IMPLEMENTED);
return avb_server_send_packet(server, reply->hdr.eth.src,
AVB_TSN_ETH, reply, len);
return avb_server_send_packet(server, h->src, AVB_TSN_ETH, buf, len);
}
static const struct msg_info msg_info[] = {
@ -80,14 +80,15 @@ static int aecp_message(void *data, uint64_t now, const void *message, int len)
{
struct aecp *aecp = data;
struct server *server = aecp->server;
const struct avb_packet_aecp_header *p = message;
const struct avb_ethernet_header *h = message;
const struct avb_packet_aecp_header *p = SPA_PTROFF(h, sizeof(*h), void);
const struct msg_info *info;
int message_type;
if (ntohs(p->hdr.eth.type) != AVB_TSN_ETH)
if (ntohs(h->type) != AVB_TSN_ETH)
return 0;
if (memcmp(p->hdr.eth.dest, mac, 6) != 0 &&
memcmp(p->hdr.eth.dest, server->mac_addr, 6) != 0)
if (memcmp(h->dest, mac, 6) != 0 &&
memcmp(h->dest, server->mac_addr, 6) != 0)
return 0;
if (AVB_PACKET_GET_SUBTYPE(&p->hdr) != AVB_SUBTYPE_AECP)
return 0;
@ -96,14 +97,14 @@ static int aecp_message(void *data, uint64_t now, const void *message, int len)
info = find_msg_info(message_type, NULL);
if (info == NULL)
return reply_not_implemented(aecp, p, len);
return reply_not_implemented(aecp, message, len);
pw_log_debug("got AECP message %s", info->name);
if (info->handle == NULL)
return reply_not_implemented(aecp, p, len);
return reply_not_implemented(aecp, message, len);
return info->handle(aecp, p, len);
return info->handle(aecp, message, len);
}
static void aecp_destroy(void *data)