Skip to content

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

time-{unix,wrs}: prepare for PROTO_VLAN addition 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 46c498d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 174 deletions
include/ppsi/ppsi.h
View file @ 81590d98
...@@ -316,6 +316,7 @@ extern int pp_config_file(struct pp_globals *ppg, int force, char *fname); ...@@ -316,6 +316,7 @@ extern int pp_config_file(struct pp_globals *ppg, int force, char *fname);
#define PPSI_PROTO_RAW 0 #define PPSI_PROTO_RAW 0
#define PPSI_PROTO_UDP 1 #define PPSI_PROTO_UDP 1
#define PPSI_PROTO_VLAN 2 /* Actually: vlan over raw eth */
#define PPSI_ROLE_AUTO 0 #define PPSI_ROLE_AUTO 0
#define PPSI_ROLE_MASTER 1 #define PPSI_ROLE_MASTER 1
......
time-unix/unix-socket.c
View file @ 81590d98
This diff is collapsed.
time-wrs/wrs-socket.c
View file @ 81590d98
...@@ -245,15 +245,18 @@ int wrs_net_recv(struct pp_instance *ppi, void *pkt, int len, ...@@ -245,15 +245,18 @@ int wrs_net_recv(struct pp_instance *ppi, void *pkt, int len,
TimeInternal *t) TimeInternal *t)
{ {
struct pp_channel *ch1, *ch2; struct pp_channel *ch1, *ch2;
int ret = -1; int fd, ret = -1;
if (ppi->proto == PPSI_PROTO_RAW) { switch(ppi->proto) {
int fd = NP(ppi)->ch[PP_NP_GEN].fd; case PPSI_PROTO_RAW:
fd = NP(ppi)->ch[PP_NP_GEN].fd;
ret = wrs_recv_msg(ppi, fd, pkt, len, t); ret = wrs_recv_msg(ppi, fd, pkt, len, t);
if (ret > 0 && pp_diag_allow(ppi, frames, 2)) if (ret > 0 && pp_diag_allow(ppi, frames, 2))
dump_1588pkt("recv: ", pkt, ret, t); dump_1588pkt("recv: ", pkt, ret, t);
} else { break;
case PPSI_PROTO_UDP:
/* UDP: always handle EVT msgs before GEN */ /* UDP: always handle EVT msgs before GEN */
ch1 = &(NP(ppi)->ch[PP_NP_EVT]); ch1 = &(NP(ppi)->ch[PP_NP_EVT]);
ch2 = &(NP(ppi)->ch[PP_NP_GEN]); ch2 = &(NP(ppi)->ch[PP_NP_GEN]);
...@@ -265,7 +268,14 @@ int wrs_net_recv(struct pp_instance *ppi, void *pkt, int len, ...@@ -265,7 +268,14 @@ int wrs_net_recv(struct pp_instance *ppi, void *pkt, int len,
if (ret > 0 && pp_diag_allow(ppi, frames, 2)) if (ret > 0 && pp_diag_allow(ppi, frames, 2))
dump_payloadpkt("recv: ", pkt, ret, t); dump_payloadpkt("recv: ", pkt, ret, t);
break;
case PPSI_PROTO_VLAN:
/* FIXME */
default:
return -1;
} }
if (ret < 0) if (ret < 0)
return ret; return ret;
pp_diag(ppi, time, 1, "recv stamp: (correct %i) %9li.%09li\n", pp_diag(ppi, time, 1, "recv stamp: (correct %i) %9li.%09li\n",
...@@ -337,10 +347,10 @@ static void poll_tx_timestamp(struct pp_instance *ppi, void *pkt, int len, ...@@ -337,10 +347,10 @@ static void poll_tx_timestamp(struct pp_instance *ppi, void *pkt, int len,
/* /*
* Raw frames return "sock_extended_err" too, telling this is * Raw frames return "sock_extended_err" too, telling this is
* a tx timestamp. Udp doesn't so don't check in udp mode * a tx timestamp. UDP does not; so don't check in udp mode
* (the pointer is only checked for non-null) * (the pointer is only checked for non-null)
*/ */
if (!(ppi->proto == PPSI_PROTO_RAW)) if (!(ppi->proto != PPSI_PROTO_UDP))
serr = (void *)1; serr = (void *)1;
for (cmsg = CMSG_FIRSTHDR(&msg); for (cmsg = CMSG_FIRSTHDR(&msg);
...@@ -384,7 +394,8 @@ int wrs_net_send(struct pp_instance *ppi, void *pkt, int len, ...@@ -384,7 +394,8 @@ int wrs_net_send(struct pp_instance *ppi, void *pkt, int len,
*/ */
drop = ppsi_drop_tx(); drop = ppsi_drop_tx();
if (ppi->proto == PPSI_PROTO_RAW) { switch (ppi->proto) {
case PPSI_PROTO_RAW:
fd = NP(ppi)->ch[PP_NP_GEN].fd; fd = NP(ppi)->ch[PP_NP_GEN].fd;
hdr->h_proto = htons(ETH_P_1588); hdr->h_proto = htons(ETH_P_1588);
if (drop) if (drop)
...@@ -401,7 +412,7 @@ int wrs_net_send(struct pp_instance *ppi, void *pkt, int len, ...@@ -401,7 +412,7 @@ int wrs_net_send(struct pp_instance *ppi, void *pkt, int len,
poll_tx_timestamp(ppi, pkt, len, s, fd, t); poll_tx_timestamp(ppi, pkt, len, s, fd, t);
if (drop) /* avoid messaging about stamps that are not used */ if (drop) /* avoid messaging about stamps that are not used */
goto drop_msg; break;
if (pp_diag_allow(ppi, frames, 2)) if (pp_diag_allow(ppi, frames, 2))
dump_1588pkt("send: ", pkt, len, t); dump_1588pkt("send: ", pkt, len, t);
...@@ -409,28 +420,35 @@ int wrs_net_send(struct pp_instance *ppi, void *pkt, int len, ...@@ -409,28 +420,35 @@ int wrs_net_send(struct pp_instance *ppi, void *pkt, int len,
t->correct, (long)t->seconds, t->correct, (long)t->seconds,
(long)t->nanoseconds); (long)t->nanoseconds);
return ret; return ret;
}
/* else: UDP */ case PPSI_PROTO_UDP:
fd = NP(ppi)->ch[chtype].fd; fd = NP(ppi)->ch[chtype].fd;
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(chtype == PP_NP_GEN ? PP_GEN_PORT : PP_EVT_PORT); addr.sin_port = htons(chtype == PP_NP_GEN
addr.sin_addr.s_addr = NP(ppi)->mcast_addr; ? PP_GEN_PORT : PP_EVT_PORT);
if (drop) addr.sin_addr.s_addr = NP(ppi)->mcast_addr;
addr.sin_port = 3200; if (drop)
ret = sendto(fd, pkt, len, 0, addr.sin_port = 3200;
(struct sockaddr *)&addr, sizeof(struct sockaddr_in)); ret = sendto(fd, pkt, len, 0, (struct sockaddr *)&addr,
poll_tx_timestamp(ppi, pkt, len, s, fd, t); sizeof(struct sockaddr_in));
poll_tx_timestamp(ppi, pkt, len, s, fd, t);
if (drop) /* like above: skil messages about timestamps */
break;
if (drop) /* like above: skil messages about timestamps */ if (pp_diag_allow(ppi, frames, 2))
goto drop_msg; dump_payloadpkt("send: ", pkt, len, t);
pp_diag(ppi, time, 1, "send stamp: (correct %i) %9li.%09li\n",
t->correct, (long)t->seconds,
(long)t->nanoseconds);
return ret;
case PPSI_PROTO_VLAN:
/* FIXME */
default:
return -1;
}
if (pp_diag_allow(ppi, frames, 2))
dump_payloadpkt("send: ", pkt, len, t);
pp_diag(ppi, time, 1, "send stamp: (correct %i) %9li.%09li\n",
t->correct, (long)t->seconds,
(long)t->nanoseconds);
drop_msg:
if (drop) if (drop)
pp_diag(ppi, frames, 1, "Drop sent frame\n"); pp_diag(ppi, frames, 1, "Drop sent frame\n");
......
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