commit 3f2119b533f6cf5fd44751f1d4e83dcd062fdfc2
author Yi Tseng <yi@opennetworking.org> Thu Nov 02 15:21:10 2017 -0700
committer Yi Tseng <yi@opennetworking.org> Sat Nov 04 04:50:42 2017 +0000
tree 980497a73833420c955fb06481a8e63aebba181f
parent c60c7e26b0f7ee487b56e3fc609b01ecb6f81ba9

[CORD-2198] Incorrect packet requests for dhcpv6 relay

Change-Id: I235387925ee1be66ff106365a6c883855d1cc68b

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
index 46386dd..7f35e82 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -1377,6 +1377,20 @@
         packetService.cancelPackets(indirectClientSelector,
                                     PacketPriority.CONTROL,
                                     appId);
+        indirectClientSelector =
+                DefaultTrafficSelector.builder(SERVER_RELAY_SELECTOR)
+                        .matchIPv6Dst(Ip6Address.ALL_DHCP_RELAY_AGENTS_AND_SERVERS.toIpPrefix())
+                        .build();
+        packetService.cancelPackets(indirectClientSelector,
+                                    PacketPriority.CONTROL,
+                                    appId);
+        indirectClientSelector =
+                DefaultTrafficSelector.builder(SERVER_RELAY_SELECTOR)
+                        .matchIPv6Dst(Ip6Address.ALL_DHCP_SERVERS.toIpPrefix())
+                        .build();
+        packetService.cancelPackets(indirectClientSelector,
+                                    PacketPriority.CONTROL,
+                                    appId);
 
         // Packet comes from client
         packetService.cancelPackets(CLIENT_SERVER_SELECTOR,
@@ -1393,6 +1407,20 @@
         packetService.requestPackets(indirectClientSelector,
                                      PacketPriority.CONTROL,
                                      appId);
+        indirectClientSelector =
+                DefaultTrafficSelector.builder(SERVER_RELAY_SELECTOR)
+                        .matchIPv6Dst(Ip6Address.ALL_DHCP_RELAY_AGENTS_AND_SERVERS.toIpPrefix())
+                        .build();
+        packetService.requestPackets(indirectClientSelector,
+                                     PacketPriority.CONTROL,
+                                     appId);
+        indirectClientSelector =
+                DefaultTrafficSelector.builder(SERVER_RELAY_SELECTOR)
+                        .matchIPv6Dst(Ip6Address.ALL_DHCP_SERVERS.toIpPrefix())
+                        .build();
+        packetService.requestPackets(indirectClientSelector,
+                                     PacketPriority.CONTROL,
+                                     appId);
 
         // Packet comes from client
         packetService.requestPackets(CLIENT_SERVER_SELECTOR,