commit 1125d93f1c9e225f8abac9a512fac5c07407f9ab
author Amit Ghosh <aghosh@radisys.com> Mon Sep 25 21:08:31 2017 +0100
committer Amit Ghosh <aghosh@radisys.com> Wed Sep 27 19:41:00 2017 +0100
tree e4dfdc63d5eac63bf33694592c982ca4d8a8c314
parent 19716393acdb6c936dbd7706d6e51832ad007ab7

VOL-434: Introduced configuration parameter to enable changing of src/dst MAC address

Change-Id: I2dbd584290347b85aa54f500041190afc172c632

src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java

diff --git a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
index ec4a726..8911a8f 100755
--- a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
+++ b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
@@ -155,6 +155,7 @@
     private ApplicationId appId;
 
     static Map<String, DhcpAllocationInfo> allocationMap = Maps.newConcurrentMap();
+    private boolean modifyClientPktsSrcDstMac = false;
 
     @Activate
     protected void activate(ComponentContext context) {
@@ -251,6 +252,7 @@
         }
 
         dhcpConnectPoints = Sets.newConcurrentHashSet(cfg.getDhcpServerConnectPoint());
+        modifyClientPktsSrcDstMac = cfg.getModifySrcDstMacAddresses();
 
         selectServerConnectPoint();
 
@@ -540,8 +542,10 @@
 
             ipv4Packet.setPayload(udpPacket);
             etherReply.setPayload(ipv4Packet);
-            etherReply.setSourceMacAddress(relayAgentMac);
-            etherReply.setDestinationMacAddress(dhcpConnectMac);
+            if (modifyClientPktsSrcDstMac) {
+                etherReply.setSourceMacAddress(relayAgentMac);
+                etherReply.setDestinationMacAddress(dhcpConnectMac);
+            }
 
             etherReply.setPriorityCode(ethernetPacket.getPriorityCode());
             etherReply.setVlanID(cTag(context).toShort());