SSU2: Don't send our RI after outbound handshake, it's in the handshake already

This commit is contained in:
zzz
2022-04-05 07:49:43 -04:00
parent 9d49dc7af7
commit e43810f182

View File

@@ -257,6 +257,9 @@ class OutboundEstablishState {
if (m.getType() == DatabaseStoreMessage.MESSAGE_TYPE) { if (m.getType() == DatabaseStoreMessage.MESSAGE_TYPE) {
DatabaseStoreMessage dsm = (DatabaseStoreMessage) m; DatabaseStoreMessage dsm = (DatabaseStoreMessage) m;
if (dsm.getKey().equals(_context.routerHash())) { if (dsm.getKey().equals(_context.routerHash())) {
// version 2 sends our RI in handshake
if (getVersion() > 1)
return;
_isFirstMessageOurDSM = true; _isFirstMessageOurDSM = true;
} }
} }
@@ -609,8 +612,8 @@ class OutboundEstablishState {
} }
_confirmedSentCount++; _confirmedSentCount++;
_nextSend = _lastSend + delay; _nextSend = _lastSend + delay;
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldDebug())
_log.debug("Send confirm packets, nextSend in " + delay); _log.debug("Send confirm packets, nextSend in " + delay + " on " + this);
if (_currentState == OutboundState.OB_STATE_UNKNOWN || if (_currentState == OutboundState.OB_STATE_UNKNOWN ||
_currentState == OutboundState.OB_STATE_PENDING_INTRO || _currentState == OutboundState.OB_STATE_PENDING_INTRO ||
_currentState == OutboundState.OB_STATE_INTRODUCED || _currentState == OutboundState.OB_STATE_INTRODUCED ||