general: peer and peer_vid are ppi-wide, not channel-wide

With UDP we have two channels but we talk with the same peers. Moreover, we reply with a general message to an event message, so having two peers was plain wrong. I'm well aware this commit should happen before vlans are introduced, but I don't want to deal with all the conflicts in moving it back. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

general: peer and peer_vid are ppi-wide, not channel-wide
With UDP we have two channels but we talk with the same peers. Moreover, we reply with a general message to an event message, so having two peers was plain wrong. I'm well aware this commit should happen before vlans are introduced, but I don't want to deal with all the conflicts in moving it back. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
80ab8482 · Alessandro Rubini · f350de47 · 80ab8482 · 80ab8482 · 80ab8482
Commit 80ab8482 authored Nov 13, 2014 by Alessandro Rubini
Showing with 21 additions and 21 deletions

pp-instance.h include/ppsi/pp-instance.h +2 -2

wr-api.h proto-ext-whiterabbit/wr-api.h +1 -1

unix-socket.c time-unix/unix-socket.c +9 -9

wrs-socket.c time-wrs/wrs-socket.c +9 -9

No files found.
--- a/include/ppsi/pp-instance.h
+++ b/include/ppsi/pp-instance.h
@@ -62,8 +62,6 @@ struct pp_channel {
 	};
 	void *arch_data;	/* Other arch-private info, if any */
 	unsigned char addr[6];	/* Our own MAC address */
-	unsigned char peer[6];	/* Our peer's MAC address */
-	uint16_t peer_vid;	/* Our peer's VID (for PROTO_VLAN) */
 	int pkt_present;
 };
@@ -151,6 +149,8 @@ struct pp_instance {
 	struct pp_channel ch[__NR_PP_NP];	/* general and event ch */
 	Integer32 mcast_addr;			/* only ipv4/udp */
 	int tx_offset, rx_offset;		/* ptp payload vs send/recv */
+	unsigned char peer[6];	/* Our peer's MAC address */
+	uint16_t peer_vid;	/* Our peer's VID (for PROTO_VLAN) */
 	/* Times, for the various offset computations */
 	TimeInternal t1, t2, t3, t4;			/* *the* stamps */

--- a/proto-ext-whiterabbit/wr-api.h
+++ b/proto-ext-whiterabbit/wr-api.h
@@ -12,7 +12,7 @@
 #include <ppsi/lib.h>
 #include "wr-constants.h"
-#define WRS_PPSI_SHMEM_VERSION 10 /* added peer_vid */
+#define WRS_PPSI_SHMEM_VERSION 11 /* peer is per-ppi, not per-chan */
 /*
 * This structure is used as extension-specific data in the DSPort

--- a/time-unix/unix-socket.c
+++ b/time-unix/unix-socket.c
@@ -26,7 +26,7 @@
 /* unix_recv_msg uses recvmsg for timestamp query */
 static int unix_recv_msg(struct pp_instance *ppi, int fd, void *pkt, int len,
-			 TimeInternal *t, uint16_t *peer_vid)
+			 TimeInternal *t)
 {
 	struct ethhdr *hdr = pkt;
 	ssize_t ret;
@@ -108,9 +108,9 @@ static int unix_recv_msg(struct pp_instance *ppi, int fd, void *pkt, int len,
 				break; /* ok */
 		if (i == ppi->nvlans)
 			return -2; /* not ours: say it's dropped */
-		*peer_vid = ppi->vlans[i];
+		ppi->peer_vid = ppi->vlans[i];
 	} else {
-		*peer_vid = 0;
+		ppi->peer_vid = 0;
 	}
 	if (ppsi_drop_rx()) {
@@ -137,16 +137,16 @@ static int unix_net_recv(struct pp_instance *ppi, void *pkt, int len,
 	case PPSI_PROTO_VLAN:
 		ch2 = ppi->ch + PP_NP_GEN;
-		ret = unix_recv_msg(ppi, ch2->fd, pkt, len, t, &ch2->peer_vid);
+		ret = unix_recv_msg(ppi, ch2->fd, pkt, len, t);
 		if (ret <= 0)
 			return ret;
 		if (hdr->h_proto != htons(ETH_P_1588))
 			return 0;
-		memcpy(ppi->ch[PP_NP_GEN].peer, hdr->h_source, ETH_ALEN);
+		memcpy(ppi->peer, hdr->h_source, ETH_ALEN);
 		if (pp_diag_allow(ppi, frames, 2)) {
 			if (ppi->proto == PPSI_PROTO_VLAN)
-				pp_printf("recv: VLAN %i\n", ch2->peer_vid);
+				pp_printf("recv: VLAN %i\n", ppi->peer_vid);
 			dump_1588pkt("recv: ", pkt, ret, t);
 		}
 		return ret;
@@ -159,9 +159,9 @@ static int unix_net_recv(struct pp_instance *ppi, void *pkt, int len,
 		ret = -1;
 		if (ch1->pkt_present)
-			ret = unix_recv_msg(ppi, ch1->fd, pkt, len, t, NULL);
+			ret = unix_recv_msg(ppi, ch1->fd, pkt, len, t);
 		else if (ch2->pkt_present)
-			ret = unix_recv_msg(ppi, ch2->fd, pkt, len, t, NULL);
+			ret = unix_recv_msg(ppi, ch2->fd, pkt, len, t);
 		if (ret <= 0)
 			return ret;
 		/* We can't save the peer's mac address in UDP mode */
@@ -216,7 +216,7 @@ static int unix_net_send(struct pp_instance *ppi, void *pkt, int len,
 		/* similar to sending raw frames, but w/ different header */
 		ch = ppi->ch + PP_NP_GEN;
 		vhdr->h_proto = htons(ETH_P_1588);
-		vhdr->h_tci = htons(ch->peer_vid); /* prio is 0 */
+		vhdr->h_tci = htons(ppi->peer_vid); /* prio is 0 */
 		vhdr->h_tpid = htons(0x8100);
 		memcpy(vhdr->h_dest, PP_MCAST_MACADDRESS, ETH_ALEN);

--- a/time-wrs/wrs-socket.c
+++ b/time-wrs/wrs-socket.c
@@ -158,7 +158,7 @@ static void wrs_linearize_rx_timestamp(TimeInternal *ts,
 static int wrs_recv_msg(struct pp_instance *ppi, int fd, void *pkt, int len,
-			TimeInternal *t, uint16_t *peer_vid)
+			TimeInternal *t)
 {
 	struct ethhdr *hdr = pkt;
 	struct wrs_socket *s;
@@ -250,9 +250,9 @@ drop:
 				break; /* ok */
 		if (i == ppi->nvlans)
 			return 0; /* not ours */
-		*peer_vid = ppi->vlans[i];
+		ppi->peer_vid = ppi->vlans[i];
 	} else {
-		*peer_vid = 0;
+		ppi->peer_vid = 0;
 	}
 	if (ppsi_drop_rx()) {
@@ -275,16 +275,16 @@ int wrs_net_recv(struct pp_instance *ppi, void *pkt, int len,
 	case PPSI_PROTO_VLAN:
 		ch2 = ppi->ch + PP_NP_GEN;
-		ret = wrs_recv_msg(ppi, ch2->fd, pkt, len, t, &ch2->peer_vid);
+		ret = wrs_recv_msg(ppi, ch2->fd, pkt, len, t);
 		if (ret <= 0)
 			return ret;
 		if (hdr->h_proto != htons(ETH_P_1588))
 			return 0;
-		memcpy(ppi->ch[PP_NP_GEN].peer, hdr->h_source, ETH_ALEN);
+		memcpy(ppi->peer, hdr->h_source, ETH_ALEN);
 		if (pp_diag_allow(ppi, frames, 2)) {
 			if (ppi->proto == PPSI_PROTO_VLAN)
-				pp_printf("recv: VLAN %i\n", ch2->peer_vid);
+				pp_printf("recv: VLAN %i\n", ppi->peer_vid);
 			dump_1588pkt("recv: ", pkt, ret, t);
 		}
 		break;
@@ -295,9 +295,9 @@ int wrs_net_recv(struct pp_instance *ppi, void *pkt, int len,
 		ch2 = &(ppi->ch[PP_NP_GEN]);
 		if (ch1->pkt_present)
-			ret = wrs_recv_msg(ppi, ch1->fd, pkt, len, t, NULL);
+			ret = wrs_recv_msg(ppi, ch1->fd, pkt, len, t);
 		else if (ch2->pkt_present)
-			ret = wrs_recv_msg(ppi, ch2->fd, pkt, len, t, NULL);
+			ret = wrs_recv_msg(ppi, ch2->fd, pkt, len, t);
 		if (ret < 0)
 			break;
 		if (pp_diag_allow(ppi, frames, 2))
@@ -463,7 +463,7 @@ int wrs_net_send(struct pp_instance *ppi, void *pkt, int len,
 		/* similar to sending raw frames, but w/ different header */
 		ch = ppi->ch + PP_NP_GEN;
 		vhdr->h_proto = htons(ETH_P_1588);
-		vhdr->h_tci = htons(ch->peer_vid); /* prio is 0 */
+		vhdr->h_tci = htons(ppi->peer_vid); /* prio is 0 */
 		vhdr->h_tpid = htons(0x8100);
 		if (drop)
 			hdr->h_proto++;