From a017cdabef201be45e96379b58154163d68fc00f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 30 Nov 2015 10:02:26 +1300 Subject: Always pass remote address to identify method --- src/org/traccar/protocol/NavisProtocolDecoder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/protocol/NavisProtocolDecoder.java') diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java index c5dc9fbdc..0d740298d 100644 --- a/src/org/traccar/protocol/NavisProtocolDecoder.java +++ b/src/org/traccar/protocol/NavisProtocolDecoder.java @@ -217,9 +217,9 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder { return positions; } - private Object processHandshake(Channel channel, ChannelBuffer buf) { + private Object processHandshake(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) { buf.readByte(); // semicolon symbol - if (identify(buf.toString(Charset.defaultCharset()), channel)) { + if (identify(buf.toString(Charset.defaultCharset()), channel, remoteAddress)) { sendReply(channel, ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "*A": return processArray(channel, buf); case "*>S": - return processHandshake(channel, buf); + return processHandshake(channel, remoteAddress, buf); default: Log.warning(new UnsupportedOperationException(type)); break; -- cgit v1.2.3