diff options
author | Iván Ávalos <avalos@disroot.org> | 2024-03-28 23:02:18 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2024-03-28 23:02:18 -0600 |
commit | 4dec2ef603f078ff3bd18d63d1fbd992537cbb88 (patch) | |
tree | 9c1f2886390447183a64a405fb885a9923412701 /src/main/java/org/traccar/model | |
parent | dec9993b2e1a7801bd69f1a9d92013f83e17f253 (diff) | |
parent | 13f6415ba0a8ca76d1a2cbb3d0ea199361295f1b (diff) | |
download | trackermap-server-4dec2ef603f078ff3bd18d63d1fbd992537cbb88.tar.gz trackermap-server-4dec2ef603f078ff3bd18d63d1fbd992537cbb88.tar.bz2 trackermap-server-4dec2ef603f078ff3bd18d63d1fbd992537cbb88.zip |
Merge branch 'upstream'trackermap-v0.1.4
Diffstat (limited to 'src/main/java/org/traccar/model')
-rw-r--r-- | src/main/java/org/traccar/model/LogRecord.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/model/LogRecord.java b/src/main/java/org/traccar/model/LogRecord.java index c19163af3..b04f51b32 100644 --- a/src/main/java/org/traccar/model/LogRecord.java +++ b/src/main/java/org/traccar/model/LogRecord.java @@ -1,5 +1,5 @@ /* - * Copyright 2023 Anton Tananaev (anton@traccar.org) + * Copyright 2023 - 2024 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,24 +16,33 @@ package org.traccar.model; import com.fasterxml.jackson.annotation.JsonIgnore; +import org.traccar.session.ConnectionKey; import java.net.InetSocketAddress; +import java.net.SocketAddress; public class LogRecord { - private InetSocketAddress address; + private final InetSocketAddress localAddress; + private final InetSocketAddress remoteAddress; - public void setAddress(InetSocketAddress address) { - this.address = address; + public LogRecord(SocketAddress localAddress, SocketAddress remoteAddress) { + this.localAddress = (InetSocketAddress) localAddress; + this.remoteAddress = (InetSocketAddress) remoteAddress; } @JsonIgnore public InetSocketAddress getAddress() { - return address; + return remoteAddress; + } + + @JsonIgnore + public ConnectionKey getConnectionKey() { + return new ConnectionKey(localAddress, remoteAddress); } public String getHost() { - return address.getHostString(); + return remoteAddress.getHostString(); } private String protocol; |