Temporary fix to route withdrawl problem in Atrium 16A release branch.
ONOS FPM manager ignores FPM messages with protocols other than ZEBRA. This change accepts all protocols. Change-Id: I8173d4ddf02a594f81e86c36c823be98b468455a
Showing
1 changed file
with
4 additions
and
3 deletions
... | @@ -41,7 +41,8 @@ import org.onosproject.routing.fpm.protocol.RouteAttribute; | ... | @@ -41,7 +41,8 @@ import org.onosproject.routing.fpm.protocol.RouteAttribute; |
41 | import org.onosproject.routing.fpm.protocol.RouteAttributeDst; | 41 | import org.onosproject.routing.fpm.protocol.RouteAttributeDst; |
42 | import org.onosproject.routing.fpm.protocol.RouteAttributeGateway; | 42 | import org.onosproject.routing.fpm.protocol.RouteAttributeGateway; |
43 | import org.onosproject.routing.fpm.protocol.RtNetlink; | 43 | import org.onosproject.routing.fpm.protocol.RtNetlink; |
44 | -import org.onosproject.routing.fpm.protocol.RtProtocol; | 44 | +//import org.onosproject.routing.fpm.protocol.RtProtocol; |
45 | +//import org.osgi.service.component.ComponentContext; | ||
45 | import org.slf4j.Logger; | 46 | import org.slf4j.Logger; |
46 | import org.slf4j.LoggerFactory; | 47 | import org.slf4j.LoggerFactory; |
47 | 48 | ||
... | @@ -146,10 +147,10 @@ public class FpmManager implements RouteSourceService { | ... | @@ -146,10 +147,10 @@ public class FpmManager implements RouteSourceService { |
146 | log.trace("Received FPM message: {}", fpmMessage); | 147 | log.trace("Received FPM message: {}", fpmMessage); |
147 | } | 148 | } |
148 | 149 | ||
149 | - if (rtNetlink.protocol() != RtProtocol.ZEBRA) { | 150 | + /*if (rtNetlink.protocol() != RtProtocol.ZEBRA) { |
150 | log.trace("Ignoring non-zebra route"); | 151 | log.trace("Ignoring non-zebra route"); |
151 | return; | 152 | return; |
152 | - } | 153 | + }*/ |
153 | 154 | ||
154 | IpAddress dstAddress = null; | 155 | IpAddress dstAddress = null; |
155 | IpAddress gateway = null; | 156 | IpAddress gateway = null; | ... | ... |
-
Please register or login to post a comment