홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
c19d8291 1 parent af734ff4

Ooops... missed a few comments when merging Aaron's change. Sorry about that. 

Change-Id: I9a4e2aac928b276f38777deeb144f80e68ff5fca
Inline Side-by-side
Showing 1 changed file with 5 additions and 10 deletions
...@@ -84,8 +84,7 @@ public class SdnIpReactiveRouting { ...@@ -84,8 +84,7 @@ public class SdnIpReactiveRouting {
84 @Activate 84 @Activate
85 public void activate() { 85 public void activate() {
86 appId = coreService.registerApplication(APP_NAME); 86 appId = coreService.registerApplication(APP_NAME);
87 - packetService.addProcessor(processor, 87 + packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
88 - PacketProcessor.ADVISOR_MAX + 2);
89 requestIntercepts(); 88 requestIntercepts();
90 log.info("SDN-IP Reactive Routing Started"); 89 log.info("SDN-IP Reactive Routing Started");
91 } 90 }
...@@ -105,11 +104,9 @@ public class SdnIpReactiveRouting { ...@@ -105,11 +104,9 @@ public class SdnIpReactiveRouting {
105 //TODO: to support IPv6 later 104 //TODO: to support IPv6 later
106 TrafficSelector.Builder selector = DefaultTrafficSelector.builder(); 105 TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
107 selector.matchEthType(TYPE_IPV4); 106 selector.matchEthType(TYPE_IPV4);
108 - packetService.requestPackets(selector.build(), 107 + packetService.requestPackets(selector.build(), REACTIVE, appId);
109 - REACTIVE, appId);
110 selector.matchEthType(TYPE_ARP); 108 selector.matchEthType(TYPE_ARP);
111 - packetService.requestPackets(selector.build(), 109 + packetService.requestPackets(selector.build(), REACTIVE, appId);
112 - REACTIVE, appId);
113 } 110 }
114 111
115 /** 112 /**
...@@ -118,12 +115,10 @@ public class SdnIpReactiveRouting { ...@@ -118,12 +115,10 @@ public class SdnIpReactiveRouting {
118 private void withdrawIntercepts() { 115 private void withdrawIntercepts() {
119 TrafficSelector.Builder selector = DefaultTrafficSelector.builder(); 116 TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
120 selector.matchEthType(TYPE_IPV4); 117 selector.matchEthType(TYPE_IPV4);
121 - packetService.requestPackets(selector.build(), 118 + packetService.cancelPackets(selector.build(), REACTIVE, appId);
122 - REACTIVE, appId);
123 selector = DefaultTrafficSelector.builder(); 119 selector = DefaultTrafficSelector.builder();
124 selector.matchEthType(TYPE_ARP); 120 selector.matchEthType(TYPE_ARP);
125 - packetService.requestPackets(selector.build(), 121 + packetService.cancelPackets(selector.build(), REACTIVE, appId);
126 - REACTIVE, appId);
127 } 122 }
128 123
129 private class ReactiveRoutingProcessor implements PacketProcessor { 124 private class ReactiveRoutingProcessor implements PacketProcessor {
......