commit 586f1d67e4b2b32b45f7e6e70f5a98bd20db33eb
author Esin Karaman <esin.karaman@netsia.com> Thu Jun 04 10:15:34 2020 +0000
committer Pier Luigi Ventre <pier@opennetworking.org> Fri Jun 12 08:49:55 2020 +0000
tree 91898cbc1eed34296bae752afbde0754b25f11b1
parent 4c5947c2f0867d40f65417700bfa1489f02e063d

VOL-3166 IgmpProxy should support "double-tagging" of ongoing IGMP messages.
Also, priority bits of IGMP query messages that are sent to UNI ports by
IgmpProxy should be configurable separately.

Change-Id: Ia125c43515d234134b81f1039cf2f1f170d47161

app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java

diff --git a/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
index 97e97cc..edd23f6 100644
--- a/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
@@ -129,7 +129,9 @@
     private static boolean withRADownlink = false;
     private static boolean periodicQuery = true;
     private static short mvlan = 4000;
+    private static short mvlanInner = VlanId.NONE.toShort();
     private static byte igmpCos = 7;
+    private static byte igmpUniCos = 7;
     public static boolean connectPointMode = true;
     public static ConnectPoint connectPoint = null;
     private static ConnectPoint sourceDeviceAndPort = null;
@@ -257,6 +259,8 @@
         if (config != null) {
             mvlan = config.egressVlan().toShort();
             IgmpSender.getInstance().setMvlan(mvlan);
+            mvlanInner = config.egressInnerVlan().toShort();
+            IgmpSender.getInstance().setMvlanInner(mvlanInner);
         }
         deviceService.addListener(deviceListener);
         scheduledExecutorService.scheduleAtFixedRate(new IgmpProxyTimerTask(), 1000, 1000, TimeUnit.MILLISECONDS);
@@ -487,10 +491,14 @@
         Ethernet ethpkt;
         Ip4Address srcIp = getDeviceIp(groupMember.getDeviceId());
         if (groupMember.getv2()) {
-            ethpkt = IgmpSender.getInstance().buildIgmpV2Query(groupMember.getGroupIp(), srcIp);
+            ethpkt = IgmpSender.getInstance().buildIgmpV2Query(groupMember.getGroupIp(),
+                    srcIp, groupMember.getvlan().toShort());
         } else {
-            ethpkt = IgmpSender.getInstance().buildIgmpV3Query(groupMember.getGroupIp(), srcIp);
+            ethpkt = IgmpSender.getInstance().buildIgmpV3Query(groupMember.getGroupIp(),
+                    srcIp, groupMember.getvlan().toShort());
         }
+        log.debug("Sending IGMP query to {}/{} for group {}: {}",
+                groupMember.getDeviceId(), groupMember.getPortNumber(), groupMember.getGroupIp(), ethpkt);
         IgmpSender.getInstance().sendIgmpPacket(ethpkt, groupMember.getDeviceId(), groupMember.getPortNumber());
     }
 
@@ -895,6 +903,7 @@
             withRAUplink = newCfg.withRAUplink();
             withRADownlink = newCfg.withRADownlink();
             igmpCos = newCfg.igmpCos();
+            igmpUniCos = newCfg.igmpUniCos(); // defines priority bit of IGMP query message sent to UNI ports
             periodicQuery = newCfg.periodicQuery();
             fastLeave = newCfg.fastLeave();
             pimSSmInterworking = newCfg.pimSsmInterworking();
@@ -925,8 +934,10 @@
             getSourceConnectPoint(newCfg);
 
             IgmpSender.getInstance().setIgmpCos(igmpCos);
+            IgmpSender.getInstance().setIgmpUniCos(igmpUniCos);
             IgmpSender.getInstance().setMaxResp(maxResp);
             IgmpSender.getInstance().setMvlan(mvlan);
+            IgmpSender.getInstance().setMvlanInner(mvlanInner);
             IgmpSender.getInstance().setWithRADownlink(withRADownlink);
             IgmpSender.getInstance().setWithRAUplink(withRAUplink);
         }
@@ -972,10 +983,22 @@
 
                     if (event.configClass().equals(MCAST_CONFIG_CLASS)) {
                         McastConfig config = networkConfig.getConfig(coreAppId, MCAST_CONFIG_CLASS);
-                        if (config != null && mvlan != config.egressVlan().toShort()) {
-                            mvlan = config.egressVlan().toShort();
-                            IgmpSender.getInstance().setMvlan(mvlan);
+                        boolean vlanConfigChanged = config != null && mvlan != config.egressVlan().toShort();
+                        boolean innerVlanConfigChanged = config != null &&
+                                mvlanInner != config.egressInnerVlan().toShort();
+
+                        if (vlanConfigChanged || innerVlanConfigChanged) {
+                            log.info("igmpproxy vlan config received. {}", config);
+                            //at least one of the vlan configs has changed. Call leave before setting new values
                             groupMemberStore.getAllGroupMembers().forEach(m -> leaveAction(m));
+                            if (vlanConfigChanged) {
+                                mvlan = config.egressVlan().toShort();
+                                IgmpSender.getInstance().setMvlan(mvlan);
+                            }
+                            if (innerVlanConfigChanged) {
+                                mvlanInner = config.egressInnerVlan().toShort();
+                                IgmpSender.getInstance().setMvlanInner(mvlanInner);
+                            }
                         }
                     }