package org.opendaylight.lispflowmapping.implementation.lisp;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
import org.opendaylight.lispflowmapping.interfaces.dao.SubscriberRLOC;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapRequestResultHandler;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4Afi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4PrefixAfi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv6Afi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv6PrefixAfi;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SourceDestKeyLcaf;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4BinaryAfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4PrefixBinaryAfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6BinaryAfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6PrefixBinaryAfi;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRequest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.list.EidItem;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord.Action;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapreplymessage.MapReplyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequest.ItrRloc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
public class MapResolver implements IMapResolverAsync {
protected static final Logger LOG = LoggerFactory.getLogger(MapResolver.class);
}
public void handleMapRequest(MapRequest request) {
+ // SMRs and RLOC probes are directed towards xTRs and we're a Map-Resolver here, so ignore them
+ if (request.isSmr() != null && request.isSmr()) {
+ LOG.debug("Map-Resolver ignoring incoming SMR control message.");
+ return;
+ }
+ if (request.isProbe() != null && request.isProbe()) {
+ LOG.debug("Map-Resolver ignoring incoming RLOC probe control message.");
+ return;
+ }
Eid srcEid = null;
if (request.getSourceEid() != null) {
srcEid = request.getSourceEid().getEid();
replyBuilder.setProbe(false);
replyBuilder.setSecurityEnabled(false);
replyBuilder.setNonce(request.getNonce());
- replyBuilder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
+ replyBuilder.setMappingRecordItem(new ArrayList<>());
+ List<ItrRloc> itrRlocs = request.getItrRloc();
+ final IpAddressBinary sourceRloc = request.getSourceRloc();
+
for (EidItem eidRecord : request.getEidItem()) {
MappingRecord mapping = (MappingRecord) mapService.getMapping(srcEid,
eidRecord.getEid());
if (mapping != null) {
- List<ItrRloc> itrRlocs = request.getItrRloc();
if (itrRlocs != null && itrRlocs.size() != 0) {
if (subscriptionService) {
- updateSubscribers(itrRlocs.get(0).getRloc(), eidRecord.getEid(), mapping.getEid(), srcEid);
+ final Rloc resolvedRloc = resolveRloc(itrRlocs, sourceRloc);
+ updateSubscribers(resolvedRloc, eidRecord.getEid(), mapping.getEid(), srcEid);
}
mapping = updateLocators(mapping, itrRlocs);
}
requestHandler.handleMapReply(replyBuilder.build());
}
+ private static boolean isEqualIpVersion(IpAddressBinary srcRloc, Rloc rloc) {
+ if (srcRloc.getIpv4AddressBinary() != null) {
+ if (rloc.getAddressType() == Ipv4Afi.class
+ || rloc.getAddressType() == Ipv4BinaryAfi.class
+ || rloc.getAddressType() == Ipv4PrefixAfi.class
+ || rloc.getAddressType() == Ipv4PrefixBinaryAfi.class) {
+ return true;
+ }
+ } else if (rloc.getAddressType() == Ipv6Afi.class
+ || rloc.getAddressType() == Ipv6BinaryAfi.class
+ || rloc.getAddressType() == Ipv6PrefixAfi.class
+ || rloc.getAddressType() == Ipv6PrefixBinaryAfi.class) {
+ return true;
+ }
+ return false;
+ }
+
+ private Rloc resolveRloc(List<ItrRloc> itrRlocList, IpAddressBinary srcRloc) {
+ if (srcRloc == null) {
+ return itrRlocList.get(0).getRloc();
+ }
+ byte[] srcRlocByte;
+ if (srcRloc.getIpv4AddressBinary() != null) {
+ srcRlocByte = srcRloc.getIpv4AddressBinary().getValue();
+ } else {
+ srcRlocByte = srcRloc.getIpv6AddressBinary().getValue();
+ }
+
+ Rloc equalIpvRloc = null;
+ for (ItrRloc itrRloc : itrRlocList) {
+ final Rloc rloc = itrRloc.getRloc();
+ final byte[] itrRlocByte = LispAddressUtil.ipAddressToByteArray(rloc.getAddress());
+
+ // return an Rloc equal to the source Rloc
+ if (itrRlocByte != null && LispAddressUtil.compareIpAddressByteArrays(srcRlocByte, itrRlocByte) == 0) {
+ return rloc;
+ }
+ // else lookup the first Rloc with identical Ip version
+ if (equalIpvRloc == null && isEqualIpVersion(srcRloc, rloc)) {
+ equalIpvRloc = rloc;
+ }
+ }
+ if (equalIpvRloc != null) {
+ return equalIpvRloc;
+ } else {
+ // if none of the above, return the first Rloc
+ return itrRlocList.get(0).getRloc();
+ }
+ }
+
private MappingRecord getNegativeMapping(Eid eid) {
MappingRecordBuilder recordBuilder = new MappingRecordBuilder();
recordBuilder.setAuthoritative(false);
recordBuilder.setMapVersion((short) 0);
- recordBuilder.setEid(eid);
+ if (eid.getAddressType().equals(Ipv4PrefixBinaryAfi.class)
+ || eid.getAddressType().equals(Ipv6PrefixBinaryAfi.class)) {
+ recordBuilder.setEid(mapService.getWidestNegativePrefix(eid));
+ } else {
+ recordBuilder.setEid(eid);
+ }
recordBuilder.setAction(Action.NativelyForward);
if (authenticate && mapService.getAuthenticationKey(eid) != null) {
recordBuilder.setRecordTtl(TTL_RLOC_TIMED_OUT);
// mapping will be pushed to dst as well (see sendSMRs in MapServer)
if (mapEid.getAddressType().equals(SourceDestKeyLcaf.class)
&& !reqEid.getAddressType().equals(SourceDestKeyLcaf.class)) {
- subscribedEid = SourceDestKeyHelper.getDst(mapEid);
+ subscribedEid = SourceDestKeyHelper.getDstBinary(mapEid);
}
Set<SubscriberRLOC> subscribers = getSubscribers(subscribedEid);
// timestamp
subscribers.remove(subscriberRloc);
}
- LOG.trace("Adding new subscriber: " + subscriberRloc.toString());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Adding new subscriber: " + LispAddressStringifier.getString(subscriberRloc.getSrcRloc()));
+ }
subscribers.add(subscriberRloc);
addSubscribers(subscribedEid, subscribers);
}
if (mapping.getEid().getAddress() instanceof SourceDestKey
&& !(dstEid.getAddress() instanceof SourceDestKey)) {
return new MappingRecordBuilder(mapping).setEid(
- SourceDestKeyHelper.getDst(mapping.getEid())).build();
+ SourceDestKeyHelper.getDstBinary(mapping.getEid())).build();
}
return mapping;
}
.setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight())
.setPriority(priority).setMulticastWeight(record.getMulticastWeight())
.setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted())
- .setRloc(LispAddressUtil.toRloc(nextHop)).setLocatorId(record.getLocatorId()).build());
+ .setRloc(LispAddressUtil.toRloc(nextHop))
+ .setLocatorId(record.getLocatorId()).build());
}
}
} catch (ClassCastException cce) {
Address hopAddress = LispAddressUtil.addressFromSimpleAddress(hop.getAddress());
for (ItrRloc itrRloc : itrRlocs) {
if (itrRloc.getRloc().getAddress().equals(hopAddress)) {
- int i = hops.indexOf(hop);
- if (i < hops.size() - 1) {
- nextHop = hops.get(i + 1).getAddress();
+ int iterator = hops.indexOf(hop);
+ if (iterator < hops.size() - 1) {
+ nextHop = hops.get(iterator + 1).getAddress();
return nextHop;
}
}
Code Review / lispflowmapping.git / blobdiff