diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-20 10:01:06 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-20 10:01:06 +1300 |
| commit | aac5af7aa0c2449459c88282dfcab5bee7785a6a (patch) | |
| tree | a9c07ab339357a37e681ee5615e0f6377fc4c1dc /src/org/traccar/protocol | |
| parent | de9a600541738bd14608e740b495693f79bc97a1 (diff) | |
| download | traccar-server-aac5af7aa0c2449459c88282dfcab5bee7785a6a.tar.gz traccar-server-aac5af7aa0c2449459c88282dfcab5bee7785a6a.tar.bz2 traccar-server-aac5af7aa0c2449459c88282dfcab5bee7785a6a.zip | |
Add support for GT300 message format
Diffstat (limited to 'src/org/traccar/protocol')
| -rw-r--r-- | src/org/traccar/protocol/Gl100Protocol.java | 9 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gl100ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gl200Protocol.java | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Gl100Protocol.java b/src/org/traccar/protocol/Gl100Protocol.java index 9867c653a..cc2c826ab 100644 --- a/src/org/traccar/protocol/Gl100Protocol.java +++ b/src/org/traccar/protocol/Gl100Protocol.java @@ -15,6 +15,7 @@ */ package org.traccar.protocol; +import org.jboss.netty.bootstrap.ConnectionlessBootstrap; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.string.StringDecoder; @@ -42,6 +43,14 @@ public class Gl100Protocol extends BaseProtocol { pipeline.addLast("objectDecoder", new Gl100ProtocolDecoder(Gl100Protocol.this)); } }); + serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("objectDecoder", new Gl100ProtocolDecoder(Gl100Protocol.this)); + } + }); } } diff --git a/src/org/traccar/protocol/Gl100ProtocolDecoder.java b/src/org/traccar/protocol/Gl100ProtocolDecoder.java index 1a144ae27..db5e60838 100644 --- a/src/org/traccar/protocol/Gl100ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl100ProtocolDecoder.java @@ -37,7 +37,7 @@ public class Gl100ProtocolDecoder extends BaseProtocolDecoder { .groupBegin() .number("d+,") // number .number("d,") // reserved / geofence id - .number("d") // reserved / geofence alert + .number("d+") // reserved / geofence alert // battery .or() .number("[^,]*") // calling number .groupEnd(",") diff --git a/src/org/traccar/protocol/Gl200Protocol.java b/src/org/traccar/protocol/Gl200Protocol.java index f007001c0..4162b0fc2 100644 --- a/src/org/traccar/protocol/Gl200Protocol.java +++ b/src/org/traccar/protocol/Gl200Protocol.java @@ -46,7 +46,6 @@ public class Gl200Protocol extends BaseProtocol { serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("stringDecoder", new StringDecoder()); pipeline.addLast("stringEncoder", new StringEncoder()); pipeline.addLast("objectDecoder", new Gl200ProtocolDecoder(Gl200Protocol.this)); |