diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:48:34 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:48:34 +1200 |
| commit | d1c4cd526845aad56c5b0a3e20454638bbc7fecc (patch) | |
| tree | 565ee245ea0e98b88674b775147fbc6d3e1933cb /src/org/traccar/protocol/CastelProtocolDecoder.java | |
| parent | 88b3f00f3855aa408c7859051efdcb5b37fe559f (diff) | |
| download | traccar-server-d1c4cd526845aad56c5b0a3e20454638bbc7fecc.tar.gz traccar-server-d1c4cd526845aad56c5b0a3e20454638bbc7fecc.tar.bz2 traccar-server-d1c4cd526845aad56c5b0a3e20454638bbc7fecc.zip | |
Merge commands implmentation (fix #1271)
Diffstat (limited to 'src/org/traccar/protocol/CastelProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/CastelProtocolDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/org/traccar/protocol/CastelProtocolDecoder.java index e82f837a7..8c2efb114 100644 --- a/src/org/traccar/protocol/CastelProtocolDecoder.java +++ b/src/org/traccar/protocol/CastelProtocolDecoder.java @@ -33,7 +33,7 @@ import org.traccar.model.Position; public class CastelProtocolDecoder extends BaseProtocolDecoder { - public CastelProtocolDecoder(String protocol) { + public CastelProtocolDecoder(CastelProtocol protocol) { super(protocol); } @@ -73,9 +73,9 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder { } else if (type == MSG_LOGIN || type == MSG_GPS) { Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); - if (!identify(id.toString(Charset.defaultCharset()).trim())) { + if (!identify(id.toString(Charset.defaultCharset()).trim(), channel, remoteAddress)) { return null; } else if (type == MSG_LOGIN) { |