diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2012-03-29 05:05:36 +0000 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2012-03-29 05:05:36 +0000 |
| commit | 932111062285ffdbb8f22a9c25e4946c893a6e71 (patch) | |
| tree | acf53913735aa661db12dd1f18e73a634606818c /src/org/traccar | |
| parent | d0de5245574e223384d9e89421850af16fb7a848 (diff) | |
| download | traccar-server-932111062285ffdbb8f22a9c25e4946c893a6e71.tar.gz traccar-server-932111062285ffdbb8f22a9c25e4946c893a6e71.tar.bz2 traccar-server-932111062285ffdbb8f22a9c25e4946c893a6e71.zip | |
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/Server.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/avl08/Avl08ProtocolDecoder.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java index 9f6d326c9..16c26b6d6 100644 --- a/src/org/traccar/Server.java +++ b/src/org/traccar/Server.java @@ -624,7 +624,7 @@ public class Server implements DataManager { if (serverCreator.isLoggerEnabled()) { pipeline.addLast("logger", new LoggingHandler("logger")); } - byte delimiter[] = { (byte) '$', (byte) '$' }; // probably use \r\n + byte delimiter[] = { (byte) '\r', (byte) '\n' }; pipeline.addLast("frameDecoder", new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); pipeline.addLast("stringDecoder", new StringDecoder()); diff --git a/src/org/traccar/protocol/avl08/Avl08ProtocolDecoder.java b/src/org/traccar/protocol/avl08/Avl08ProtocolDecoder.java index cc8a2efb7..382c9e998 100644 --- a/src/org/traccar/protocol/avl08/Avl08ProtocolDecoder.java +++ b/src/org/traccar/protocol/avl08/Avl08ProtocolDecoder.java @@ -24,6 +24,7 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.traccar.Position; import org.traccar.DataManager; +import org.traccar.Device; // DELME import org.traccar.GenericProtocolDecoder; /** @@ -42,7 +43,7 @@ public class Avl08ProtocolDecoder extends GenericProtocolDecoder { * Regular expressions pattern */ static private Pattern pattern = Pattern.compile( - ".{2}" + // Length + "\\$\\$.{2}" + // Length "(\\d{15})\\|" + // IMEI ".{2}" + // Alarm Type "\\$GPRMC," + |