Skip to content

P
PPSi
Commit 94439c03 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

tools/ptpdump: fix ptpdump to read vlan number from aux data in an incoming frame 

--Add a new function dump_vlan to print vlan number
--To be able to read aux data use recvmsg instead of recvfrom
--For incoming data use aux to read VLAN number
--For outgoing use VLAN header
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent d2081838
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 32 deletions
tools/dump-funcs.c
View file @ 94439c03
...@@ -57,14 +57,8 @@ static int dump_eth(char *prefix, struct ethhdr *eth) ...@@ -57,14 +57,8 @@ static int dump_eth(char *prefix, struct ethhdr *eth)
unsigned char *d = eth->h_dest; unsigned char *d = eth->h_dest;
unsigned char *s = eth->h_source; unsigned char *s = eth->h_source;
int proto = ntohs(eth->h_proto); int proto = ntohs(eth->h_proto);
struct pp_vlanhdr *vhdr = (void *)eth;
int ret = sizeof(*eth); int ret = sizeof(*eth);
if (proto == 0x8100) {
ret = sizeof(*vhdr);
proto = ntohs(vhdr->h_proto);
printf("%sVLAN %i\n", prefix, ntohs(vhdr->h_tci) & 0xfff);
}
printf("%sETH: %04x (%02x:%02x:%02x:%02x:%02x:%02x -> " printf("%sETH: %04x (%02x:%02x:%02x:%02x:%02x:%02x -> "
"%02x:%02x:%02x:%02x:%02x:%02x)\n", prefix, proto, "%02x:%02x:%02x:%02x:%02x:%02x)\n", prefix, proto,
s[0], s[1], s[2], s[3], s[4], s[5], s[0], s[1], s[2], s[3], s[4], s[5],
...@@ -307,3 +301,11 @@ int dump_1588pkt(char *prefix, void *buf, int len, struct TimeInternal *ti) ...@@ -307,3 +301,11 @@ int dump_1588pkt(char *prefix, void *buf, int len, struct TimeInternal *ti)
return 0; return 0;
} }
int dump_vlan(char *prefix, int vlan)
{
if (vlan != 0)
printf("%sVLAN %i\n", prefix, vlan);
return 0;
}
tools/dump-main.c
View file @ 94439c03
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/udp.h> #include <netinet/udp.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/if_packet.h>
#include <net/if_arp.h> #include <net/if_arp.h>
#include <netpacket/packet.h>
#include <ppsi/ieee1588_types.h> /* from ../include */ #include <ppsi/ieee1588_types.h> /* from ../include */
#include "decent_types.h" #include "decent_types.h"
...@@ -58,6 +58,7 @@ int main(int argc, char **argv) ...@@ -58,6 +58,7 @@ int main(int argc, char **argv)
struct sockaddr_ll addr; struct sockaddr_ll addr;
struct ifreq ifr; struct ifreq ifr;
char *ifname = "eth0"; char *ifname = "eth0";
int val;
sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
if (sock < 0) { if (sock < 0) {
...@@ -93,30 +94,54 @@ int main(int argc, char **argv) ...@@ -93,30 +94,54 @@ int main(int argc, char **argv)
req.mr_type = PACKET_MR_PROMISC; req.mr_type = PACKET_MR_PROMISC;
if (setsockopt(3, SOL_PACKET, PACKET_ADD_MEMBERSHIP, if (setsockopt(sock, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
&req, sizeof(req)) < 0) { &req, sizeof(req)) < 0) {
fprintf(stderr, "%s: set promiscuous(%s): %s\n", argv[0], fprintf(stderr, "%s: set promiscuous(%s): %s\n", argv[0],
ifname, strerror(errno)); ifname, strerror(errno));
exit(1); exit(1);
} }
/* enable AUXDATA */
val = 1;
if (setsockopt(sock, SOL_PACKET, PACKET_AUXDATA,
&val, sizeof(val)) < 0) {
fprintf(stderr, "%s: set auxdata(%s): %s\n", argv[0],
ifname, strerror(errno));
exit(1);
}
/* Ok, now we are promiscuous. Just read stuff forever */ /* Ok, now we are promiscuous. Just read stuff forever */
while(1) { while(1) {
struct ethhdr *eth; struct ethhdr *eth;
struct pp_vlanhdr *vhdr; struct pp_vlanhdr *vhdr;
struct iphdr *ip; struct iphdr *ip;
static unsigned char prev[1500];
static int prevlen;
unsigned char buf[1500]; unsigned char buf[1500];
struct TimeInternal ti; struct TimeInternal ti;
struct timeval tv; struct timeval tv;
struct msghdr msg;
struct sockaddr_in from; struct iovec entry;
socklen_t fromlen = sizeof(from); struct sockaddr_ll from_addr;
union {
struct cmsghdr cm;
char buf[CMSG_SPACE(sizeof(struct tpacket_auxdata))];
} control;
struct cmsghdr *cmsg;
struct tpacket_auxdata *aux = NULL;
int vlan = 0;
int len, proto; int len, proto;
len = recvfrom(sock, buf, sizeof(buf), MSG_TRUNC, memset(&msg, 0, sizeof(msg));
(struct sockaddr *) &from, &fromlen); memset(&from_addr, 0, sizeof(from_addr));
msg.msg_iov = &entry;
msg.msg_iovlen = 1;
entry.iov_base = buf;
entry.iov_len = sizeof(buf);
msg.msg_name = (caddr_t)&from_addr;
msg.msg_namelen = sizeof(from_addr);
msg.msg_control = &control;
msg.msg_controllen = sizeof(control);
len = recvmsg(sock, &msg, MSG_TRUNC);
/* Get the receive time, copy it to TimeInternal */ /* Get the receive time, copy it to TimeInternal */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
...@@ -125,22 +150,39 @@ int main(int argc, char **argv) ...@@ -125,22 +150,39 @@ int main(int argc, char **argv)
if (len > sizeof(buf)) if (len > sizeof(buf))
len = sizeof(buf); len = sizeof(buf);
/* for some reasons, we receive it three times, check dups */
if (len == prevlen && !memcmp(buf, prev, len)) for (cmsg = CMSG_FIRSTHDR(&msg);
continue; cmsg;
memcpy(prev, buf, len); prevlen = len; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
void *dp = CMSG_DATA(cmsg);
if (cmsg->cmsg_level == SOL_PACKET &&
cmsg->cmsg_type == PACKET_AUXDATA)
aux = (struct tpacket_auxdata *)dp;
}
/* now only print ptp packets */ /* now only print ptp packets */
if (len < ETH_HLEN) if (len < ETH_HLEN)
continue; continue;
eth = (void *)buf; eth = (void *)buf;
ip = (void *)(buf + ETH_HLEN); ip = (void *)(buf + ETH_HLEN);
proto = ntohs(eth->h_proto); proto = ntohs(eth->h_proto);
/* get the VLAN for incomming frames */
vlan = 0;
if (aux) {
/* already in the network order */
vlan = aux->tp_vlan_tci & 0xfff;
}
/* Get the VLAN for outgoing frames */
if (proto == 0x8100) { /* VLAN is visible (e.g.: outgoing) */ if (proto == 0x8100) { /* VLAN is visible (e.g.: outgoing) */
vhdr = (void *)buf; vhdr = (void *)buf;
proto = ntohs(vhdr->h_proto); proto = ntohs(vhdr->h_proto);
ip = (void *)(buf + sizeof(*vhdr)); ip = (void *)(buf + sizeof(*vhdr));
vlan = ntohs(vhdr->h_tci) & 0xfff;
} }
switch(proto) { switch(proto) {
...@@ -166,6 +208,9 @@ int main(int argc, char **argv) ...@@ -166,6 +208,9 @@ int main(int argc, char **argv)
case ETH_P_1588: case ETH_P_1588:
print_spaces(&ti); print_spaces(&ti);
ret = dump_vlan("", vlan);
if (ret != 0)
break;
ret = dump_1588pkt("", buf, len, &ti); ret = dump_1588pkt("", buf, len, &ti);
break; break;
default: default:
...@@ -179,16 +224,3 @@ int main(int argc, char **argv) ...@@ -179,16 +224,3 @@ int main(int argc, char **argv)
return 0; return 0;
} }
tools/ptpdump.h
View file @ 94439c03
...@@ -16,5 +16,6 @@ ...@@ -16,5 +16,6 @@
int dump_udppkt(char *prefix, void *buf, int len, struct TimeInternal *ti); int dump_udppkt(char *prefix, void *buf, int len, struct TimeInternal *ti);
int dump_payloadpkt(char *prefix, void *buf, int len, struct TimeInternal *ti); int dump_payloadpkt(char *prefix, void *buf, int len, struct TimeInternal *ti);
int dump_1588pkt(char *prefix, void *buf, int len, struct TimeInternal *ti); int dump_1588pkt(char *prefix, void *buf, int len, struct TimeInternal *ti);
int dump_vlan(char *prefix, int vlan);
#endif /* __PTPDUMP_H__ */ #endif /* __PTPDUMP_H__ */
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