Fix connection's expect cid.

Replace combination of generator using cid and other peers support cid by the fixed expect cid. Signed-off-by: Achim Kraus <achim.kraus@bosch.io>
eclipse-californium · Feb 27, 2021 · 5789725 · 5789725
1 parent e00f9c7
commit 5789725
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/scandium-core/src/main/java/org/eclipse/californium/scandium/DTLSConnector.java b/scandium-core/src/main/java/org/eclipse/californium/scandium/DTLSConnector.java
@@ -1461,7 +1461,6 @@ public void processRecord(Record record, Connection connection) {
 				return;
 			}
 
-			boolean useCid = connectionIdGenerator != null && connectionIdGenerator.useConnectionId();
 			if (record.getType() == ContentType.TLS12_CID) {
 				// !useCid already dropped in Record.fromByteArray
 				if (epoch == 0) {
@@ -1472,7 +1471,7 @@ public void processRecord(Record record, Connection connection) {
 					}
 					return;
 				}
-			} else if (epoch > 0 && useCid && connection.expectCid()) {
+			} else if (epoch > 0 && connection.expectCid()) {
 				DROP_LOGGER.debug("Discarding record received from peer [{}], CID required!", record.getPeerAddress());
 				if (health != null) {
 					health.receivingRecord(true);

diff --git a/scandium-core/src/main/java/org/eclipse/californium/scandium/dtls/Connection.java b/scandium-core/src/main/java/org/eclipse/californium/scandium/dtls/Connection.java
@@ -271,7 +271,7 @@ public SessionTicket getSessionTicket() {
 	 */
 	public boolean expectCid() {
 		DTLSSession session = getSession();
-		return session != null && session.getWriteConnectionId() != null;
+		return session != null && session.getReadConnectionId() != null && !session.getReadConnectionId().isEmpty();
 	}
 
 	/**