Skip to content

P
PPSi
Commit a28d309b authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

wrs: make tx timestamps work again with UDP 

for tx stamps, when we added the check about the frame content
(to avoid problems with high data load, see 4179fcdc), it got broken
for UDP. That's because the cmesg we get back includes a raw frame
anyways, even if we transmitted UDP or other protocols.

So now check for the trailing part of the frame we get back, to
avoid any extra leading header whatever its lenght.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent abf4a47a
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
time-wrs/wrs-socket.c
View file @ a28d309b
......@@ -344,7 +344,7 @@ static int wrs_net_recv(struct pp_instance *ppi, void *pkt, int len,
static void poll_tx_timestamp(struct pp_instance *ppi, void *pkt, int len,
struct wrs_socket *s, int fd, TimeInternal *t)
{
char data[16384];
char data[16384], *dataptr;
struct msghdr msg;
struct iovec entry;
struct sockaddr_ll from_addr;
......@@ -394,8 +394,14 @@ static void poll_tx_timestamp(struct pp_instance *ppi, void *pkt, int len,
__func__, res, strerror(errno));
continue;
}
/* Now, check if this frame is our frame. If not, retry */
if (!memcmp(data, pkt, len))
/*
* Now, check if this frame is our frame. If not, retry.
* Note: for UDP we get back a raw frame. So check trailing
* part only (we know it's 14 + 20 + 8 to skip, but we'd
* better not rely on that -- think vlans for example
*/
dataptr = data + res - len;
if (dataptr >= data && !memcmp(dataptr, pkt, len))
break;
pp_diag(ppi, time, 1, "%s: recvmsg(): not our frame\n",
__func__);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment