p2p/net: emulate unix multicast socket behaviour

Unix sockets can join more than one multicast group, and this what I want to emulate adding a second multicast mac address to the wrpc sockets and checking this mac also during recv if the socket was configured accordingly Signed-off-by: C.Prados <c.prados@gsi.de>

p2p/net: emulate unix multicast socket behaviour
Unix sockets can join more than one multicast group, and this what I want to emulate adding a second multicast mac address to the wrpc sockets and checking this mac also during recv if the socket was configured accordingly Signed-off-by: C.Prados <c.prados@gsi.de>
08c6d17f · Cesar Prados · e08f10df · 08c6d17f · 08c6d17f
Commit 08c6d17f authored Nov 03, 2014 by Cesar Prados
Hide whitespace changes
Inline Side-by-side

Showing with 49 additions and 6 deletions

ptpd_netif.h include/ptpd_netif.h +10 -2

net.c lib/net.c +39 -4

No files found.
--- a/include/ptpd_netif.h
+++ b/include/ptpd_netif.h
@@ -53,6 +53,10 @@ typedef struct {
 	int family;
 // MAC address
 	mac_addr_t mac;
+// MAC address for multicast multi subscription
+	mac_addr_t mac_multicast;
+// If there is multicast multi subscription set to 1
+        int multi_membership;
 // Destination MASC address, filled by recvfrom() function on interfaces bound to multiple addresses
 	mac_addr_t mac_dest;
 // IP address
@@ -96,11 +100,15 @@ typedef struct _wr_timestamp wr_timestamp_t;
 // - initializes connection with the mighty HAL daemon
 int ptpd_netif_init();

-// Creates UDP or Ethernet RAW socket (determined by sock_type) bound to bind_addr. If PTPD_FLAG_MULTICAST is set, the socket is
-// automatically added to multicast group. User can specify physical_port field to bind the socket to specific switch port only.
+// Creates UDP or Ethernet RAW socket (determined by sock_type) bound to bind_addr. If PTPD_FLAG_MULTICAST is set, the socket can
+// join another multicast group. User can specify physical_port field to bind the socket to specific switch port only.
 wr_socket_t *ptpd_netif_create_socket(int sock_type, int flags,
 				      wr_sockaddr_t * bind_addr);

+// Adds a second mac address to the same socket. It simulates the behaviour of
+// unix sockets that can accept more than one multicast address.
+int ptpd_netif_multicast_group(wr_socket_t * sock, wr_sockaddr_t * bind_addr);
+
 // Sends a UDP/RAW packet (data, data_length) to address provided in wr_sockaddr_t.
 // For raw frames, mac/ethertype needs to be provided, for UDP - ip/port.
 // Every transmitted frame has assigned a tag value, stored at tag parameter. This value is later used

--- a/lib/net.c
+++ b/lib/net.c
@@ -94,6 +94,9 @@ wr_socket_t *ptpd_netif_create_socket(int sock_type, int flags,

 	memcpy(&sock->bind_addr, bind_addr, sizeof(wr_sockaddr_t));

+        if( flags == PTPD_FLAGS_MULTICAST)
+                sock->bind_addr.multi_membership = 0x1;
+
 	/*get mac from endpoint */
 	get_mac_addr(sock->local_mac);

@@ -109,6 +112,30 @@ wr_socket_t *ptpd_netif_create_socket(int sock_type, int flags,
 	return (wr_socket_t *) (sock);
 }

+/*
+ * Add a second mac address to the same socket, it emulates the
+ * behaviour of multicast unix sockets, which can accept more
+ * than one multicast address. So far in this implementation
+ * it is just one.
+ */
+int ptpd_netif_multicast_group(wr_socket_t * sock, wr_sockaddr_t * bind_addr)
+{
+        uint8_t multi_mac;
+	struct my_socket *s = (struct my_socket *) sock;
+
+        /* check if the socket it is configured for mulit multicast */
+        if (!s->bind_addr.multi_membership)
+                return -1;
+
+        /* check if it is a multicast address */
+        if (bind_addr->mac[0] & 0x1)
+                return -1;
+
+        memcpy(&s->bind_addr.mac_multicast, bind_addr->mac, sizeof(mac_addr_t));
+
+        return 0;
+}
+
 int ptpd_netif_close_socket(wr_socket_t * sock)
 {
 	struct my_socket *s = (struct my_socket *)sock;
@@ -144,7 +171,7 @@ void ptpd_netif_linearize_rx_timestamp(wr_timestamp_t * ts, int32_t dmtd_phase,
  nsec_r = ts->nsec;
 /* The falling edge TS is the rising - 1 thick if the "rising counter ahead" bit is set. */
 	nsec_f = cntr_ahead ? ts->nsec - (clock_period / 1000) : ts->nsec;
-        
+

 /* Adjust the rising edge timestamp phase so that it "jumps" roughly around the point
   where the counter value changes */
@@ -153,14 +180,14 @@ void ptpd_netif_linearize_rx_timestamp(wr_timestamp_t * ts, int32_t dmtd_phase,
 		phase_r += clock_period;

 /* Do the same with the phase for the falling edge, but additionally shift it by extra 180 degrees
-  (so that it matches the falling edge counter) */ 
+  (so that it matches the falling edge counter) */
 	int phase_f = ts->raw_phase - transition_point + (clock_period / 2);
 	if(phase_f < 0)
 		phase_f += clock_period;
 	if(phase_f >= clock_period)
 		phase_f -= clock_period;

-/* If we are within +- 25% from the transition in the rising edge counter, pick the falling one */	
+/* If we are within +- 25% from the transition in the rising edge counter, pick the falling one */
  if( phase_r > 3 * clock_period / 4 || phase_r < clock_period / 4 )
  {
 		ts->nsec = nsec_f;
@@ -325,9 +352,17 @@ void update_rx_queues()

 	for (i = 0; i < NET_MAX_SOCKETS; i++) {
 		s = &socks[i];
+
 		if (s->in_use && !memcmp(hdr.dstmac, s->bind_addr.mac, 6)
 		    && hdr.ethtype == s->bind_addr.ethertype)
-			break;	/*they match */
+			break; /* they match */
+
+                /* if one interface joined multiple multicast groups */
+                if (s->bind_addr.multi_membership) {
+                        if (s->in_use && !memcmp(hdr.dstmac, s->bind_addr.mac_multicast, 6)
+                            && hdr.ethtype == s->bind_addr.ethertype)
+                                break; /* they match */
+                }
 		s = NULL;
 	}