Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-06-03 06:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code formatting and logging changes for networking

Browse Source
This commit is contained in:
Istvan Szabo 2021-05-27 09:03:18 +01:00
parent b64e52c0c0
commit 265d40f04a
3 changed files with 2023 additions and 1852 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/org/qortal/api/model/ConnectedPeer.java
View File

@ -1,61 +1,64 @@
package org.qortal.api.model; package org.qortal.api.model;
import javax.xml.bind.annotation.XmlAccessType; import io.swagger.v3.oas.annotations.media.Schema;
import javax.xml.bind.annotation.XmlAccessorType;
import org.qortal.data.network.PeerChainTipData; import org.qortal.data.network.PeerChainTipData;
import org.qortal.data.network.PeerData; import org.qortal.data.network.PeerData;
import org.qortal.network.Handshake; import org.qortal.network.Handshake;
import org.qortal.network.Peer; import org.qortal.network.Peer;
import io.swagger.v3.oas.annotations.media.Schema; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import java.util.UUID;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ConnectedPeer { public class ConnectedPeer {
public enum Direction { public enum Direction {
INBOUND, INBOUND,
OUTBOUND; OUTBOUND;
} }
public Direction direction;
public Handshake handshakeStatus;
public Long lastPing;
public Long connectedWhen;
public Long peersConnectedWhen;
public String address; public Direction direction;
public String version; public Handshake handshakeStatus;
public Long lastPing;
public Long connectedWhen;
public Long peersConnectedWhen;
public String nodeId; public String address;
public String version;
public Integer lastHeight; public String nodeId;
@Schema(example = "base58")
public byte[] lastBlockSignature;
public Long lastBlockTimestamp;
protected ConnectedPeer() { public Integer lastHeight;
} @Schema(example = "base58")
public byte[] lastBlockSignature;
public Long lastBlockTimestamp;
public UUID connectionId;
public ConnectedPeer(Peer peer) { protected ConnectedPeer() {
this.direction = peer.isOutbound() ? Direction.OUTBOUND : Direction.INBOUND; }
this.handshakeStatus = peer.getHandshakeStatus();
this.lastPing = peer.getLastPing();
PeerData peerData = peer.getPeerData(); public ConnectedPeer(Peer peer) {
this.connectedWhen = peer.getConnectionTimestamp(); this.direction = peer.isOutbound() ? Direction.OUTBOUND : Direction.INBOUND;
this.peersConnectedWhen = peer.getPeersConnectionTimestamp(); this.handshakeStatus = peer.getHandshakeStatus();
this.lastPing = peer.getLastPing();
this.address = peerData.getAddress().toString(); PeerData peerData = peer.getPeerData();
this.connectedWhen = peer.getConnectionTimestamp();
this.peersConnectedWhen = peer.getPeersConnectionTimestamp();
this.version = peer.getPeersVersionString(); this.address = peerData.getAddress().toString();
this.nodeId = peer.getPeersNodeId();
PeerChainTipData peerChainTipData = peer.getChainTipData(); this.version = peer.getPeersVersionString();
if (peerChainTipData != null) { this.nodeId = peer.getPeersNodeId();
this.lastHeight = peerChainTipData.getLastHeight(); this.connectionId = peer.getPeerConnectionId();
this.lastBlockSignature = peerChainTipData.getLastBlockSignature();
this.lastBlockTimestamp = peerChainTipData.getLastBlockTimestamp(); PeerChainTipData peerChainTipData = peer.getChainTipData();
} if (peerChainTipData != null) {
} this.lastHeight = peerChainTipData.getLastHeight();
this.lastBlockSignature = peerChainTipData.getLastBlockSignature();
this.lastBlockTimestamp = peerChainTipData.getLastBlockTimestamp();
}
}
} }

2340
src/main/java/org/qortal/network/Network.java
View File

File diff suppressed because it is too large Load Diff

1454
src/main/java/org/qortal/network/Peer.java
View File

File diff suppressed because it is too large Load Diff