pdelay/socket: add network support for pdelay in wrpc arch

Add the pdelay mac address to the same socket, it means that one socket has two multicast addr, E2E and P2P. During recv the wrpc function check both mac addresses. Send function uses the E2E or P2P mac addr depending on the msg to be sent. [changed by Alessandro: create one socket only, according to Kconfig settings] Signed-off-by: C.Prados <c.prados@gsi.de>

pdelay/socket: add network support for pdelay in wrpc arch
Add the pdelay mac address to the same socket, it means that one socket has two multicast addr, E2E and P2P. During recv the wrpc function check both mac addresses. Send function uses the E2E or P2P mac addr depending on the msg to be sent. [changed by Alessandro: create one socket only, according to Kconfig settings] Signed-off-by: C.Prados <c.prados@gsi.de>
42b1fafe · Cesar Prados · Alessandro Rubini · 547136f0 · 42b1fafe · 42b1fafe
Commit 42b1fafe authored Oct 23, 2014 by Cesar Prados Committed by Alessandro Rubini May 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

common-fun.h proto-standard/common-fun.h +7 -1

wrpc-socket.c time-wrpc/wrpc-socket.c +4 -1

No files found.
--- a/proto-standard/common-fun.h
+++ b/proto-standard/common-fun.h
@@ -38,8 +38,14 @@ int st_com_slave_handle_followup(struct pp_instance *ppi, unsigned char *buf,
 static inline int __send_and_log(struct pp_instance *ppi, int msglen,
 				 int msgtype, int chtype)
 {
+	int pdelay_addr = 0;
+
+	if (msgtype == PPM_PDELAY_REQ || msgtype == PPM_PDELAY_RESP)
+		pdelay_addr = 1;
+
 	if (ppi->n_ops->send(ppi, ppi->tx_frame, msglen + ppi->tx_offset,
-			    &ppi->last_snt_time, chtype, 0) < msglen) {
+			     &ppi->last_snt_time, chtype,
+			     pdelay_addr) < msglen) {
 		pp_diag(ppi, frames, 1, "%s(%d) Message can't be sent\n",
 			pp_msg_names[msgtype], msgtype);
 		return PP_SEND_ERROR;

--- a/time-wrpc/wrpc-socket.c
+++ b/time-wrpc/wrpc-socket.c
@@ -29,8 +29,11 @@ static int wrpc_open_ch(struct pp_instance *ppi)
 	struct wr_sockaddr addr;

 	addr.ethertype = ETH_P_1588;
+#ifdef CONFIG_E2E
 	memcpy(addr.mac, PP_MCAST_MACADDRESS, sizeof(mac_addr_t));
-
+#else
+	memcpy(addr.mac, PP_PDELAY_MACADDRESS, sizeof(mac_addr_t));
+#endif
 	sock = ptpd_netif_create_socket(&__static_ptp_socket, &addr,
 					PTPD_SOCK_RAW_ETHERNET, 0);
 	if (!sock)