[CORD-2198] Incorrect packet requests for dhcpv6 relay

Change-Id: I235387925ee1be66ff106365a6c883855d1cc68b
This commit is contained in:
Yi Tseng 2017-11-02 15:21:10 -07:00
parent 3e7f145b90
commit 41dde70050

View File

@ -1390,6 +1390,20 @@ public class Dhcp6HandlerImpl implements DhcpHandler, HostProvider {
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,
@ -1406,6 +1420,20 @@ public class Dhcp6HandlerImpl implements DhcpHandler, HostProvider {
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,