Don't PNAT for DHCP packets

And don't call Neutron before the config is ready Change-Id: I921731468c65b9df7646525d32edddc69e46c371

Don't PNAT for DHCP packets
And don't call Neutron before the config is ready Change-Id: I921731468c65b9df7646525d32edddc69e46c371
Hyunsun Moon · Gerrit Code Review
Commit 0448ea086aaa212151d5f3af6389314347682f62 0448ea08 1 parent 5c999e2d
Showing 1 changed file with 8 additions and 1 deletions
apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java
--- a/apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java
View file @0448ea0
+++ b/apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java
View file @0448ea0
@@ -27,6 +27,7 @@ import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.MacAddress;
+ import org.onlab.packet.UDP;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.net.DeviceId;
@@ -112,7 +113,6 @@ public class OpenstackRoutingManager implements OpenstackRoutingService {
     protected void activate() {
         appId = coreService.registerApplication(APP_ID);
         packetService.addProcessor(internalPacketProcessor, PacketProcessor.director(1));
-         reloadInitL3Rules();
         log.info("onos-openstackrouting started");
     }
 
@@ -210,6 +210,13 @@ public class OpenstackRoutingManager implements OpenstackRoutingService {
                     case IPv4.PROTOCOL_ICMP:
                         icmpEventExecutorService.execute(new OpenstackIcmpHandler(rulePopulator, context));
                         break;
+                     case IPv4.PROTOCOL_UDP:
+                         // don't process DHCP
+                         UDP udpPacket = (UDP) iPacket.getPayload();
+                         if (udpPacket.getDestinationPort() == UDP.DHCP_SERVER_PORT &&
+                                 udpPacket.getSourcePort() == UDP.DHCP_CLIENT_PORT) {
+                             break;
+                         }
                     default:
                         int portNum = getPortNum(ethernet.getSourceMAC(), iPacket.getDestinationAddress());
                         Port port = getExternalPort(pkt.receivedFrom().deviceId(), EXTERNAL_INTERFACE_NAME);