Skip to content

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

toos/ptpdump: code reorganizations 

This moves some stuff between dump-main.c and dump-funcs.c, preparing
for dump-funcs to be used within ppsi itself.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 5589514b
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 31 deletions
tools/dump-funcs.c
View file @ 23976c85
...@@ -22,28 +22,32 @@ static int dumpstruct(char *prefix, char *name, void *ptr, int size) ...@@ -22,28 +22,32 @@ static int dumpstruct(char *prefix, char *name, void *ptr, int size)
return ret; return ret;
} }
static void dump_eth(struct ethhdr *eth, struct TimeInternal *ti)
{
unsigned char *d = eth->h_dest;
unsigned char *s = eth->h_source;
#if __STDC_HOSTED__ #if __STDC_HOSTED__
{ static void dump_time(struct TimeInternal *ti)
struct timeval tv; {
struct tm tm; struct timeval tv;
struct tm tm;
tv.tv_sec = ti->seconds;
tv.tv_usec = ti->nanoseconds / 1000; tv.tv_sec = ti->seconds;
localtime_r(&tv.tv_sec, &tm); tv.tv_usec = ti->nanoseconds / 1000;
printf("TIME: (%li - 0x%lx) %02i:%02i:%02i.%06li\n", localtime_r(&tv.tv_sec, &tm);
tv.tv_sec, tv.tv_sec, printf("TIME: (%li - 0x%lx) %02i:%02i:%02i.%06li\n",
tm.tm_hour, tm.tm_min, tm.tm_sec, (long)tv.tv_usec); tv.tv_sec, tv.tv_sec,
} tm.tm_hour, tm.tm_min, tm.tm_sec, (long)tv.tv_usec);
}
#else #else
static void dump_time(struct TimeInternal *ti)
{
printf("TIME: (%li - 0x%lx) %li.%06li\n", (long)ti->seconds, printf("TIME: (%li - 0x%lx) %li.%06li\n", (long)ti->seconds,
(long)ti->seconds, (long)ti->seconds, (long)ti->nanoseconds); (long)ti->seconds, (long)ti->seconds, (long)ti->nanoseconds);
}
#endif #endif
static void dump_eth(struct ethhdr *eth)
{
unsigned char *d = eth->h_dest;
unsigned char *s = eth->h_source;
printf("ETH: %04x (%02x:%02x:%02x:%02x:%02x:%02x -> " printf("ETH: %04x (%02x:%02x:%02x:%02x:%02x:%02x -> "
"%02x:%02x:%02x:%02x:%02x:%02x)\n", ntohs(eth->h_proto), "%02x:%02x:%02x:%02x:%02x:%02x)\n", ntohs(eth->h_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],
...@@ -73,7 +77,7 @@ static void dump_1stamp(char *s, struct stamp *t) ...@@ -73,7 +77,7 @@ static void dump_1stamp(char *s, struct stamp *t)
uint64_t sec = (uint64_t)(ntohs(t->sec.msb)) << 32; uint64_t sec = (uint64_t)(ntohs(t->sec.msb)) << 32;
sec |= (uint64_t)(ntohl(t->sec.lsb)); sec |= (uint64_t)(ntohl(t->sec.lsb));
printf("%s%lli.%09i\n", s, sec, ntohl(t->nsec)); printf("%s%lu.%09i\n", s, (unsigned long)sec, ntohl(t->nsec));
} }
static void dump_1quality(char *s, ClockQuality *q) static void dump_1quality(char *s, ClockQuality *q)
...@@ -156,8 +160,8 @@ static void dump_payload(void *pl, int len) ...@@ -156,8 +160,8 @@ static void dump_payload(void *pl, int len)
printf("VERSION: %i (type %i, len %i, domain %i)\n", printf("VERSION: %i (type %i, len %i, domain %i)\n",
h->versionPTP, h->messageType, h->versionPTP, h->messageType,
ntohs(h->messageLength), h->domainNumber); ntohs(h->messageLength), h->domainNumber);
printf("FLAGS: 0x%04x (correction 0x%08llx)\n", h->flagField, printf("FLAGS: 0x%04x (correction 0x%08lu)\n", h->flagField,
h->correctionField); (unsigned long)h->correctionField);
dump_1port("PORT: ", h->sourcePortIdentity); dump_1port("PORT: ", h->sourcePortIdentity);
printf("REST: seq %i, ctrl %i, log-interval %i\n", printf("REST: seq %i, ctrl %i, log-interval %i\n",
ntohs(h->sequenceId), h->controlField, h->logMessageInterval); ntohs(h->sequenceId), h->controlField, h->logMessageInterval);
...@@ -230,35 +234,41 @@ static void dump_payload(void *pl, int len) ...@@ -230,35 +234,41 @@ static void dump_payload(void *pl, int len)
dumpstruct("DUMP: ", "payload", pl, len); dumpstruct("DUMP: ", "payload", pl, len);
} }
/* This dumps a complete udp frame, starting from the eth header */
int dump_udppkt(void *buf, int len, struct TimeInternal *ti) int dump_udppkt(void *buf, int len, struct TimeInternal *ti)
{ {
struct ethhdr *eth = buf; struct ethhdr *eth = buf;
struct iphdr *ip = buf + ETH_HLEN; struct iphdr *ip = buf + ETH_HLEN;
struct udphdr *udp = (void *)(ip + 1); struct udphdr *udp = (void *)(ip + 1);
void *payload = (void *)(udp + 1); void *payload = (void *)(udp + 1);
int udpdest = ntohs(udp->dest);
if (len < ETH_HLEN + sizeof(*ip) + sizeof(*udp))
return -1;
/* page 239 and following */
if (udpdest != 319 && udpdest != 320) if (ti)
return -1; dump_time(ti);
dump_eth(eth);
dump_eth(eth, ti);
dump_ip(ip); dump_ip(ip);
dump_udp(udp); dump_udp(udp);
dump_payload(payload, len - (payload - buf)); dump_payload(payload, len - (payload - buf));
return 0; return 0;
} }
/* This dumps the payload only, used for udp frames without headers */
int dump_payloadpkt(void *buf, int len, struct TimeInternal *ti)
{
if (ti)
dump_time(ti);
dump_payload(buf, len);
return 0;
}
/* This dumps everything, used for raw frames with headers and ptp payload */
int dump_1588pkt(void *buf, int len, struct TimeInternal *ti) int dump_1588pkt(void *buf, int len, struct TimeInternal *ti)
{ {
struct ethhdr *eth = buf; struct ethhdr *eth = buf;
void *payload = (void *)(eth + 1); void *payload = (void *)(eth + 1);
dump_eth(eth, ti); if (ti)
dump_time(ti);
dump_eth(eth);
dump_payload(payload, len - (payload - buf)); dump_payload(payload, len - (payload - buf));
return 0; return 0;
} }
tools/dump-main.c
View file @ 23976c85
...@@ -116,13 +116,25 @@ int main(int argc, char **argv) ...@@ -116,13 +116,25 @@ int main(int argc, char **argv)
ip = (void *)(buf + ETH_HLEN); ip = (void *)(buf + ETH_HLEN);
switch(ntohs(eth->h_proto)) { switch(ntohs(eth->h_proto)) {
case ETH_P_IP: case ETH_P_IP:
if (len < ETH_HLEN + sizeof(*ip)) {
struct udphdr *udp = (void *)(ip + 1);
int udpdest = ntohs(udp->dest);
/*
* Filter before calling the dump function, otherwise
* we'll report TIMEDELAY for not-relevant frames
*/
if (len < ETH_HLEN + sizeof(*ip) + sizeof(*udp))
continue; continue;
if (ip->protocol != IPPROTO_UDP) if (ip->protocol != IPPROTO_UDP)
continue; continue;
if (udpdest != 319 && udpdest != 320)
continue;
print_spaces(&ti); print_spaces(&ti);
ret = dump_udppkt(buf, len, &ti); ret = dump_udppkt(buf, len, &ti);
break; break;
}
case ETH_P_1588: case ETH_P_1588:
print_spaces(&ti); print_spaces(&ti);
ret = dump_1588pkt(buf, len, &ti); ret = dump_1588pkt(buf, len, &ti);
......
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