import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Map.Entry;
+import java.util.Set;
import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.opendaylight.lispflowmapping.implementation.authentication.LispAuthenticationUtil;
import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
-import org.opendaylight.lispflowmapping.implementation.dao.HashMapDb;
import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceKeyUtil;
import org.opendaylight.lispflowmapping.implementation.util.DAOMappingUtil;
import org.opendaylight.lispflowmapping.implementation.util.LispAFIConvertor;
import org.opendaylight.lispflowmapping.implementation.util.MapNotifyBuilderHelper;
+import org.opendaylight.lispflowmapping.inmemorydb.HashMapDb;
+import org.opendaylight.lispflowmapping.implementation.util.MaskUtil;
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
import org.opendaylight.lispflowmapping.interfaces.dao.IMappingServiceKey;
import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapServerAsync;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.LispAFIAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.MapRegister;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.MapRequest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.eidrecords.EidRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.eidtolocatorrecords.EidToLocatorRecord;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.eidtolocatorrecords.EidToLocatorRecordBuilder;
return null;
}
- private static MapRequest buildSMR(EidToLocatorRecord eidRecord) {
+ private static MapRequestBuilder buildSMR(LispAddressContainer srcEid) {
MapRequestBuilder builder = new MapRequestBuilder();
builder.setAuthoritative(false);
builder.setMapDataPresent(false);
builder.setSmr(true);
builder.setSmrInvoked(false);
- builder.setEidRecord(new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.eidrecords.EidRecord>());
- LispAddressContainer container = eidRecord.getLispAddressContainer();
- builder.getEidRecord().add(new EidRecordBuilder().setMask((short) eidRecord.getMaskLength()).setLispAddressContainer(container).build());
-
+ builder.setSourceEid(new SourceEidBuilder().setLispAddressContainer(srcEid).build());
builder.setItrRloc(new ArrayList<ItrRloc>());
builder.getItrRloc().add(new ItrRlocBuilder().setLispAddressContainer(LispAFIConvertor.toContainer(getLocalAddress())).build());
-
builder.setMapReply(null);
builder.setNonce(new Random().nextLong());
- // XXX For now we set source EID to queried EID...
- builder.setSourceEid(new SourceEidBuilder().setLispAddressContainer(container).build());
- return builder.build();
+ return builder;
}
public void handleMapRegister(MapRegister mapRegister, boolean smr, IMapNotifyHandler callback) {
}
boolean mappingChanged = saveRlocs(eidRecord, smr);
if (smr && mappingChanged) {
- HashSet<MappingServiceSubscriberRLOC> subscribers = getSubscribers(eidRecord.getLispAddressContainer(),
- eidRecord.getMaskLength());
- handleSmr(eidRecord, subscribers, callback);
+ sendSmrs(eidRecord, callback);
}
}
if (!failed) {
}
rlocGroups.get(subkey).addRecord(locatorRecord);
}
+ } else {
+ rlocGroups.put(ADDRESS_SUBKEY, new MappingServiceRLOCGroup(eidRecord.getRecordTtl(), eidRecord.getAction(), eidRecord.isAuthoritative()));
}
List<MappingEntry<MappingServiceRLOCGroup>> entries = new ArrayList<>();
for (String subkey : rlocGroups.keySet()) {
srcDstDao.put(srcKey, entries.toArray(new MappingEntry[entries.size()]));
if (checkForChanges) {
newMapping = DAOMappingUtil.getMappingExact(srcAddr, dstAddr, srcMask, dstMask, dao);
- if (!newMapping.getValue().equals(oldMapping.getValue())) {
- return true;
- }
+ return (newMapping.getValue() == null) ? oldMapping.getValue() != null :
+ !newMapping.getValue().equals(oldMapping.getValue());
}
} else {
List<MappingServiceRLOCGroup> oldLocators = null, newLocators = null;
dao.put(key, entries.toArray(new MappingEntry[entries.size()]));
if (checkForChanges) {
newLocators = DAOMappingUtil.getLocatorsByEidToLocatorRecord(eidRecord, dao, shouldIterateMask());
- if (!newLocators.equals(oldLocators)) {
- return true;
- }
+ return (newLocators == null) ? oldLocators != null : !newLocators.equals(oldLocators);
}
}
return false;
mapping = DAOMappingUtil.getMappingForEid(LispAFIConvertor.toAFI(address), maskLen, db);
}
if (smr) {
- HashSet<MappingServiceSubscriberRLOC> subscribers = getSubscribers(address, maskLen);
// mapping is removed before first SMR is sent to avoid inconsistent replies
removeMappingRlocs(mapping, db);
- handleSmr(new EidToLocatorRecordBuilder().setLispAddressContainer(address).
- setMaskLength((short) maskLen).build(), subscribers, callback);
+ sendSmrs(new EidToLocatorRecordBuilder().setLispAddressContainer(address).
+ setMaskLength((short) maskLen).build(), callback);
db.removeSpecific(mapping.getKey(), SUBSCRIBERS_SUBKEY);
} else {
removeMappingRlocs(mapping, db);
}
private void removeMappingRlocs(Entry<IMappingServiceKey, List<MappingServiceRLOCGroup>> mapping, ILispDAO db) {
+ if (mapping == null || mapping.getValue() == null) {
+ return;
+ }
for (MappingServiceRLOCGroup group : mapping.getValue()) {
for (LocatorRecord record : group.getRecords()) {
db.removeSpecific(mapping.getKey(), getAddressKey(record.getLispAddressContainer().getAddress()));
}
}
- private void handleSmr(EidToLocatorRecord record, HashSet<MappingServiceSubscriberRLOC> subscribers,
+ private void sendSmrs(EidToLocatorRecord record, IMapNotifyHandler callback) {
+ LispAddressContainer eid = record.getLispAddressContainer();
+ Set<MappingServiceSubscriberRLOC> subscribers;
+
+ subscribers = getSubscribers(eid, record.getMaskLength());
+ handleSmr(record, subscribers, callback);
+
+ // For SrcDst LCAF also send SMRs to Dst prefix
+ if (eid.getAddress() instanceof LcafSourceDest) {
+ LispAddressContainer dstAddr = LispAFIConvertor.toContainer(getDstForLcafSrcDst(eid));
+ short dstMask = getDstMaskForLcafSrcDst(eid);
+ subscribers = getSubscribers(dstAddr, dstMask);
+ EidToLocatorRecord newRecord = new EidToLocatorRecordBuilder().setAction(record.getAction()).
+ setAuthoritative(record.isAuthoritative()).setLocatorRecord(record.getLocatorRecord()).
+ setMapVersion(record.getMapVersion()).setRecordTtl(record.getRecordTtl()).
+ setLispAddressContainer(dstAddr).setMaskLength(dstMask).build();
+ handleSmr(newRecord, subscribers, callback);
+ }
+ }
+
+ private void handleSmr(EidToLocatorRecord record, Set<MappingServiceSubscriberRLOC> subscribers,
IMapNotifyHandler callback) {
if (subscribers == null) {
return;
}
- MapRequest mapRequest = buildSMR(record);
- LOG.trace("Built SMR packet: " + mapRequest.toString());
- for (MappingServiceSubscriberRLOC rloc : subscribers) {
- if (rloc.timedOut()) {
- LOG.trace("Lazy removing expired subscriber entry " + rloc.toString());
- subscribers.remove(rloc);
+ MapRequestBuilder mrb = buildSMR(record.getLispAddressContainer());
+ LOG.trace("Built SMR packet: " + mrb.build().toString());
+ for (MappingServiceSubscriberRLOC subscriber : subscribers) {
+ if (subscriber.timedOut()) {
+ LOG.trace("Lazy removing expired subscriber entry " + subscriber.toString());
+ subscribers.remove(subscriber);
} else {
try {
- callback.handleSMR(mapRequest, rloc.getSrcRloc());
+ // The address stored in the SMR's EID record is used as Source EID in the SMR-invoked Map-Request. To
+ // ensure consistent behavior it is set to the value used to originally request a given mapping
+ mrb.setEidRecord(new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.eidrecords.EidRecord>());
+ mrb.getEidRecord().add(new EidRecordBuilder()
+ .setMask((short)MaskUtil.getMaxMask(LispAFIConvertor.toAFI(subscriber.getSrcEid())))
+ .setLispAddressContainer(subscriber.getSrcEid()).build());
+ callback.handleSMR(mrb.build(), subscriber.getSrcRloc());
} catch (Exception e) {
- LOG.error("Errors encountered while handling SMR:" + e.getStackTrace());
+ LOG.error("Errors encountered while handling SMR:" + ExceptionUtils.getStackTrace(e));
}
}
}
IMappingServiceKey key = MappingServiceKeyUtil.generateMappingServiceKey(record.getLispAddressContainer(),
record.getMaskLength());
- dao.put(key, new MappingEntry<HashSet<MappingServiceSubscriberRLOC>>(SUBSCRIBERS_SUBKEY, subscribers));
+ dao.put(key, new MappingEntry<Set<MappingServiceSubscriberRLOC>>(SUBSCRIBERS_SUBKEY, subscribers));
}
public boolean shouldOverwrite() {
Code Review / lispflowmapping.git / blobdiff