import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionStatistics;
import org.opendaylight.protocol.bgp.rib.impl.spi.RIB;
import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContext;
-import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer;
import org.opendaylight.protocol.bgp.rib.spi.BGPSession;
+import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
import org.opendaylight.protocol.bgp.rib.spi.BGPTerminationReason;
import org.opendaylight.protocol.bgp.rib.spi.Peer;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
* Class representing a peer. We have a single instance for each peer, which provides translation from BGP events into
* RIB actions.
*/
-public class BGPPeer implements ReusableBGPPeer, Peer, AutoCloseable, BGPPeerRuntimeMXBean, TransactionChainListener {
+public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeerRuntimeMXBean, TransactionChainListener {
private static final Logger LOG = LoggerFactory.getLogger(BGPPeer.class);
private BGPPeerRuntimeRegistrator registrator;
private BGPPeerRuntimeRegistration runtimeReg;
private long sessionEstablishedCounter = 0L;
+ private final Set<AdjRibOutListener> adjRibOutListenerSet = new HashSet<>();
public BGPPeer(final String name, final RIB rib) {
this(name, rib, PeerRole.Ibgp);
@Override
public synchronized void close() {
- dropConnection();
+ releaseConnection();
this.chain.close();
- // TODO should this perform cleanup ?
}
@Override
// update AdjRibs
final Attributes attrs = message.getAttributes();
MpReachNlri mpReach = null;
- if (message.getNlri() != null) {
+ final boolean isAnyNlriAnnounced = message.getNlri() != null;
+ if (isAnyNlriAnnounced) {
mpReach = prefixesToMpReach(message);
} else if (attrs != null && attrs.getAugmentation(Attributes1.class) != null) {
mpReach = attrs.getAugmentation(Attributes1.class).getMpReachNlri();
}
MpUnreachNlri mpUnreach = null;
if (message.getWithdrawnRoutes() != null) {
- mpUnreach = prefixesToMpUnreach(message);
+ mpUnreach = prefixesToMpUnreach(message, isAnyNlriAnnounced);
} else if (attrs != null && attrs.getAugmentation(Attributes2.class) != null) {
mpUnreach = attrs.getAugmentation(Attributes2.class).getMpUnreachNlri();
}
* Create MPUnreach for the prefixes to be handled in the same way as linkstate routes
*
* @param message Update message containing withdrawn routes
+ * @param isAnyNlriAnnounced
* @return MpUnreachNlri with prefixes from the withdrawn routes field
*/
- private static MpUnreachNlri prefixesToMpUnreach(final Update message) {
+ private static MpUnreachNlri prefixesToMpUnreach(final Update message, final boolean isAnyNlriAnnounced) {
final List<Ipv4Prefixes> prefixes = new ArrayList<>();
for (final Ipv4Prefix p : message.getWithdrawnRoutes().getWithdrawnRoutes()) {
- prefixes.add(new Ipv4PrefixesBuilder().setPrefix(p).build());
+ boolean nlriAnounced = false;
+ if(isAnyNlriAnnounced) {
+ nlriAnounced = message.getNlri().getNlri().contains(p);
+ }
+
+ if(!nlriAnounced) {
+ prefixes.add(new Ipv4PrefixesBuilder().setPrefix(p).build());
+ }
}
return new MpUnreachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class).setWithdrawnRoutes(
new WithdrawnRoutesBuilder().setDestinationType(
this.session = session;
this.rawIdentifier = InetAddresses.forString(session.getBgpId().getValue()).getAddress();
final PeerId peerId = RouterIds.createPeerId(session.getBgpId());
- TablesKey key = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
- this.tables.add(key);
- createAdjRibOutListener(peerId, key, false);
+ createAdjRibOutListener(peerId);
+
+ this.ribWriter = this.ribWriter.transform(peerId, this.rib.getRibSupportContext(), this.tables, false);
+ this.sessionEstablishedCounter++;
+ if (this.registrator != null) {
+ this.runtimeReg = this.registrator.register(this);
+ }
+ }
+ private void createAdjRibOutListener(final PeerId peerId) {
for (final BgpTableType t : session.getAdvertisedTableTypes()) {
- key = new TablesKey(t.getAfi(), t.getSafi());
+ final TablesKey key = new TablesKey(t.getAfi(), t.getSafi());
if (this.tables.add(key)) {
createAdjRibOutListener(peerId, key, true);
}
}
- this.ribWriter = this.ribWriter.transform(peerId, this.rib.getRibSupportContext(), this.tables, false);
- this.sessionEstablishedCounter++;
- if (this.registrator != null) {
- this.runtimeReg = this.registrator.register(this);
+ addBgp4Support(peerId);
+ }
+
+ //try to add a support for old-school BGP-4, if peer did not advertise IPv4-Unicast MP capability
+ private void addBgp4Support(final PeerId peerId) {
+ final TablesKey key = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
+ if (this.tables.add(key)) {
+ createAdjRibOutListener(peerId, key, false);
}
}
// not particularly nice
if (context != null && this.session instanceof BGPSessionImpl) {
- AdjRibOutListener.create(peerId, key, this.rib.getYangRibId(), this.rib.getCodecsRegistry(), context.getRibSupport(), ((RIBImpl) this.rib).getService(),
- ((BGPSessionImpl) this.session).getLimiter(), mpSupport);
+ this.adjRibOutListenerSet.add(AdjRibOutListener.create(peerId, key, this.rib.getYangRibId(), this.rib.getCodecsRegistry(),
+ context.getRibSupport(), ((RIBImpl) this.rib).getService(), ((BGPSessionImpl) this.session).getLimiter(), mpSupport));
}
}
private synchronized void cleanup() {
- // FIXME: BUG-196: support graceful restart
- this.ribWriter.cleanTables(this.tables);
+ // FIXME: BUG-196: support graceful
+ for (final AdjRibOutListener adjRibOutListener : this.adjRibOutListenerSet) {
+ adjRibOutListener.close();
+ }
+ this.adjRibOutListenerSet.clear();
+ this.ribWriter.removePeer();
this.tables.clear();
}
@Override
public void onSessionDown(final BGPSession session, final Exception e) {
- LOG.info("Session with peer {} went down", this.name, e);
+ if(e.getMessage().equals(BGPSessionImpl.END_OF_INPUT)) {
+ LOG.info("Session with peer {} went down", this.name);
+ } else {
+ LOG.info("Session with peer {} went down", this.name, e);
+ }
releaseConnection();
}
@Override
public void releaseConnection() {
- dropConnection();
+ addPeerToDisconnectedSharedList();
cleanup();
+ dropConnection();
+ }
+
+ private void addPeerToDisconnectedSharedList() {
+ if(this.session != null) {
+ this.rib.getCacheDisconnectedPeers().insertDesconectedPeer(this.session.getBgpId());
+ }
}
@GuardedBy("this")
@Override
public void onTransactionChainFailed(final TransactionChain<?, ?> chain, final AsyncTransaction<?, ?> transaction, final Throwable cause) {
LOG.error("Transaction chain failed.", cause);
- dropConnection();
+ releaseConnection();
this.chain.close();
this.chain = this.rib.createPeerChain(this);
}
Code Review / bgpcep.git / blobdiff