diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-11-30 10:02:26 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-11-30 10:03:09 +1300 |
| commit | a017cdabef201be45e96379b58154163d68fc00f (patch) | |
| tree | 608662393ad902a927acba90f9bf9571b12ada0f /src/org/traccar/protocol/T55ProtocolDecoder.java | |
| parent | dd943e107a9680948747fb0ab2132cc57d027352 (diff) | |
| download | trackermap-server-a017cdabef201be45e96379b58154163d68fc00f.tar.gz trackermap-server-a017cdabef201be45e96379b58154163d68fc00f.tar.bz2 trackermap-server-a017cdabef201be45e96379b58154163d68fc00f.zip | |
Always pass remote address to identify method
Diffstat (limited to 'src/org/traccar/protocol/T55ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/T55ProtocolDecoder.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java index d8b3eefe8..9c47d1ab0 100644 --- a/src/org/traccar/protocol/T55ProtocolDecoder.java +++ b/src/org/traccar/protocol/T55ProtocolDecoder.java @@ -206,25 +206,25 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { if (id.endsWith(",")) { id = id.substring(0, id.length() - 1); } - identify(id, channel); + identify(id, channel, remoteAddress); sentence = sentence.substring(index); } if (sentence.startsWith("$PGID")) { - identify(sentence.substring(6, sentence.length() - 3), channel); + identify(sentence.substring(6, sentence.length() - 3), channel, remoteAddress); } else if (sentence.startsWith("$PCPTI")) { - identify(sentence.substring(7, sentence.indexOf(",", 7)), channel); + identify(sentence.substring(7, sentence.indexOf(",", 7)), channel, remoteAddress); } else if (sentence.startsWith("IMEI")) { - identify(sentence.substring(5, sentence.length()), channel); + identify(sentence.substring(5, sentence.length()), channel, remoteAddress); } else if (sentence.startsWith("$GPFID")) { - if (identify(sentence.substring(6, sentence.length()), channel) && position != null) { + if (identify(sentence.substring(6, sentence.length()), channel, remoteAddress) && position != null) { Position position = this.position; position.setDeviceId(getDeviceId()); this.position = null; return position; } } else if (Character.isDigit(sentence.charAt(0)) && sentence.length() == 15) { - identify(sentence, channel); + identify(sentence, channel, remoteAddress); } else if (sentence.startsWith("$GPRMC")) { return decodeGprmc(sentence, channel); } else if (sentence.startsWith("$GPGGA") && hasDeviceId()) { |