aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/BasePipelineFactory.java11
-rw-r--r--src/org/traccar/BaseProtocol.java18
-rw-r--r--src/org/traccar/TrackerServer.java4
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java2
-rw-r--r--src/org/traccar/protocol/Gt06ProtocolDecoder.java7
-rw-r--r--src/org/traccar/protocol/MiniFinderProtocol.java2
-rw-r--r--src/org/traccar/protocol/MiniFinderProtocolEncoder.java38
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocolDecoder.java208
8 files changed, 143 insertions, 147 deletions
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index c166f47f4..6e350f61d 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -36,7 +36,7 @@ import java.net.InetSocketAddress;
public abstract class BasePipelineFactory implements ChannelPipelineFactory {
private final TrackerServer server;
- private final int resetDelay;
+ private int timeout;
private FilterHandler filterHandler;
private DistanceHandler distanceHandler;
@@ -95,7 +95,10 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
public BasePipelineFactory(TrackerServer server, String protocol) {
this.server = server;
- resetDelay = Context.getConfig().getInteger(protocol + ".resetDelay", 0);
+ timeout = Context.getConfig().getInteger(protocol + ".timeout", 0);
+ if (timeout == 0) {
+ timeout = Context.getConfig().getInteger(protocol + ".resetDelay", 0); // temporary
+ }
if (Context.getConfig().getBoolean("filter.enable")) {
filterHandler = new FilterHandler();
@@ -126,8 +129,8 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
@Override
public ChannelPipeline getPipeline() {
ChannelPipeline pipeline = Channels.pipeline();
- if (resetDelay != 0) {
- pipeline.addLast("idleHandler", new IdleStateHandler(GlobalTimer.getTimer(), resetDelay, 0, 0));
+ if (timeout > 0 && !server.isConnectionless()) {
+ pipeline.addLast("idleHandler", new IdleStateHandler(GlobalTimer.getTimer(), timeout, 0, 0));
}
pipeline.addLast("openHandler", new OpenChannelHandler(server));
if (Context.isLoggerEnabled()) {
diff --git a/src/org/traccar/BaseProtocol.java b/src/org/traccar/BaseProtocol.java
index c77e61a81..446f57d65 100644
--- a/src/org/traccar/BaseProtocol.java
+++ b/src/org/traccar/BaseProtocol.java
@@ -15,9 +15,12 @@
*/
package org.traccar;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.database.ActiveDevice;
import org.traccar.model.Command;
+import javax.xml.bind.DatatypeConverter;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
@@ -48,10 +51,19 @@ public abstract class BaseProtocol implements Protocol {
@Override
public void sendCommand(ActiveDevice activeDevice, Command command) {
- if (!supportedCommands.contains(command.getType())) {
- throw new RuntimeException("Command " + command.getType() + " is not supported in protocol " + getName());
+ if (command.getType().equals(Command.TYPE_CUSTOM)) {
+ String data = (String) command.getAttributes().get(Command.KEY_DATA);
+ if (activeDevice.getChannel().getPipeline().get(StringEncoder.class) != null) {
+ activeDevice.write(data);
+ } else {
+ activeDevice.write(ChannelBuffers.wrappedBuffer(DatatypeConverter.parseHexBinary(data)));
+ }
+ } else {
+ if (!supportedCommands.contains(command.getType())) {
+ throw new RuntimeException("Command " + command.getType() + " is not supported in protocol " + getName());
+ }
+ activeDevice.write(command);
}
- activeDevice.write(command);
}
}
diff --git a/src/org/traccar/TrackerServer.java b/src/org/traccar/TrackerServer.java
index ba1703e86..7bbab071d 100644
--- a/src/org/traccar/TrackerServer.java
+++ b/src/org/traccar/TrackerServer.java
@@ -37,6 +37,10 @@ public abstract class TrackerServer {
private final Bootstrap bootstrap;
private final String protocol;
+ public boolean isConnectionless() {
+ return bootstrap instanceof ConnectionlessBootstrap;
+ }
+
public String getProtocol() {
return protocol;
}
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index f2d2ba5ba..c1f0af42f 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -121,7 +121,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
}
// Send response #2
- if (Character.isDigit(sentence.charAt(0))) {
+ if (!sentence.isEmpty() && Character.isDigit(sentence.charAt(0))) {
if (channel != null) {
channel.write("ON", remoteAddress);
}
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index 18524fcfa..6dc382a04 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -214,9 +214,10 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
int commandLength = buf.readUnsignedByte();
- buf.readUnsignedByte(); // server flag (reserved)
-
- position.set("command", buf.readBytes(commandLength - 1).toString(StandardCharsets.US_ASCII));
+ if (commandLength > 0) {
+ buf.readUnsignedByte(); // server flag (reserved)
+ position.set("command", buf.readBytes(commandLength - 1).toString(StandardCharsets.US_ASCII));
+ }
buf.readUnsignedShort(); // language
diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java
index 9208af0e2..e9f6d4cde 100644
--- a/src/org/traccar/protocol/MiniFinderProtocol.java
+++ b/src/org/traccar/protocol/MiniFinderProtocol.java
@@ -30,7 +30,6 @@ public class MiniFinderProtocol extends BaseProtocol {
public MiniFinderProtocol() {
super("minifinder");
- setSupportedCommands(Command.TYPE_CUSTOM);
}
@Override
@@ -41,7 +40,6 @@ public class MiniFinderProtocol extends BaseProtocol {
pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, ';'));
pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
- pipeline.addLast("objectEncoder", new MiniFinderProtocolEncoder());
pipeline.addLast("objectDecoder", new MiniFinderProtocolDecoder(MiniFinderProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java
deleted file mode 100644
index e5762f5dd..000000000
--- a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.protocol;
-
-import org.traccar.StringProtocolEncoder;
-import org.traccar.helper.Log;
-import org.traccar.model.Command;
-
-public class MiniFinderProtocolEncoder extends StringProtocolEncoder {
-
- @Override
- protected Object encodeCommand(Command command) {
-
- switch (command.getType()) {
- case Command.TYPE_CUSTOM:
- return command.getAttributes().get("raw");
- default:
- Log.warning(new UnsupportedOperationException(command.getType()));
- break;
- }
-
- return null;
- }
-
-}
diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index f4c5c6932..4bf3678c0 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,141 +57,157 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
private static final int CODEC_FM4X00 = 0x08;
private static final int CODEC_12 = 0x0C;
- private List<Position> parseLocation(Channel channel, ChannelBuffer buf) {
- List<Position> positions = new LinkedList<>();
+ private void decodeSerial(Position position, ChannelBuffer buf) {
- buf.skipBytes(4); // marker
- buf.readUnsignedInt(); // data length
- int codec = buf.readUnsignedByte(); // codec
+ getLastLocation(position, null);
- if (codec == CODEC_12) {
- return null; // decode serial port data
- }
+ position.set(Event.KEY_TYPE, buf.readUnsignedByte());
- int count = buf.readUnsignedByte();
+ position.set("command", buf.readBytes(buf.readInt()).toString(StandardCharsets.US_ASCII));
- for (int i = 0; i < count; i++) {
- Position position = new Position();
- position.setProtocol(getProtocolName());
+ }
- position.setDeviceId(getDeviceId());
+ private void decodeLocation(Position position, ChannelBuffer buf, int codec) {
- int globalMask = 0x0f;
+ int globalMask = 0x0f;
- if (codec == CODEC_GH3000) {
+ if (codec == CODEC_GH3000) {
- long time = buf.readUnsignedInt() & 0x3fffffff;
- time += 1167609600; // 2007-01-01 00:00:00
+ long time = buf.readUnsignedInt() & 0x3fffffff;
+ time += 1167609600; // 2007-01-01 00:00:00
- globalMask = buf.readUnsignedByte();
- if (BitUtil.check(globalMask, 0)) {
+ globalMask = buf.readUnsignedByte();
+ if (BitUtil.check(globalMask, 0)) {
- position.setTime(new Date(time * 1000));
+ position.setTime(new Date(time * 1000));
- int locationMask = buf.readUnsignedByte();
+ int locationMask = buf.readUnsignedByte();
- if (BitUtil.check(locationMask, 0)) {
- position.setLatitude(buf.readFloat());
- position.setLongitude(buf.readFloat());
- }
+ if (BitUtil.check(locationMask, 0)) {
+ position.setLatitude(buf.readFloat());
+ position.setLongitude(buf.readFloat());
+ }
- if (BitUtil.check(locationMask, 1)) {
- position.setAltitude(buf.readUnsignedShort());
- }
+ if (BitUtil.check(locationMask, 1)) {
+ position.setAltitude(buf.readUnsignedShort());
+ }
- if (BitUtil.check(locationMask, 2)) {
- position.setCourse(buf.readUnsignedByte() * 360.0 / 256);
- }
+ if (BitUtil.check(locationMask, 2)) {
+ position.setCourse(buf.readUnsignedByte() * 360.0 / 256);
+ }
- if (BitUtil.check(locationMask, 3)) {
- position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
- }
+ if (BitUtil.check(locationMask, 3)) {
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+ }
- if (BitUtil.check(locationMask, 4)) {
- int satellites = buf.readUnsignedByte();
- position.set(Event.KEY_SATELLITES, satellites);
- position.setValid(satellites >= 3);
- }
+ if (BitUtil.check(locationMask, 4)) {
+ int satellites = buf.readUnsignedByte();
+ position.set(Event.KEY_SATELLITES, satellites);
+ position.setValid(satellites >= 3);
+ }
- if (BitUtil.check(locationMask, 5)) {
- position.set(Event.KEY_LAC, buf.readUnsignedShort());
- position.set(Event.KEY_CID, buf.readUnsignedShort());
- }
+ if (BitUtil.check(locationMask, 5)) {
+ position.set(Event.KEY_LAC, buf.readUnsignedShort());
+ position.set(Event.KEY_CID, buf.readUnsignedShort());
+ }
- if (BitUtil.check(locationMask, 6)) {
- position.set(Event.KEY_GSM, buf.readUnsignedByte());
- }
+ if (BitUtil.check(locationMask, 6)) {
+ position.set(Event.KEY_GSM, buf.readUnsignedByte());
+ }
- if (BitUtil.check(locationMask, 7)) {
- position.set("operator", buf.readUnsignedInt());
- }
+ if (BitUtil.check(locationMask, 7)) {
+ position.set("operator", buf.readUnsignedInt());
+ }
- } else {
+ } else {
- getLastLocation(position, new Date(time * 1000));
+ getLastLocation(position, new Date(time * 1000));
- }
+ }
- } else {
+ } else {
- position.setTime(new Date(buf.readLong()));
+ position.setTime(new Date(buf.readLong()));
- position.set("priority", buf.readUnsignedByte());
+ position.set("priority", buf.readUnsignedByte());
- position.setLongitude(buf.readInt() / 10000000.0);
- position.setLatitude(buf.readInt() / 10000000.0);
- position.setAltitude(buf.readShort());
- position.setCourse(buf.readUnsignedShort());
+ position.setLongitude(buf.readInt() / 10000000.0);
+ position.setLatitude(buf.readInt() / 10000000.0);
+ position.setAltitude(buf.readShort());
+ position.setCourse(buf.readUnsignedShort());
- int satellites = buf.readUnsignedByte();
- position.set(Event.KEY_SATELLITES, satellites);
+ int satellites = buf.readUnsignedByte();
+ position.set(Event.KEY_SATELLITES, satellites);
- position.setValid(satellites != 0);
+ position.setValid(satellites != 0);
- position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
- position.set(Event.KEY_EVENT, buf.readUnsignedByte());
+ position.set(Event.KEY_EVENT, buf.readUnsignedByte());
- buf.readUnsignedByte(); // total IO data records
+ buf.readUnsignedByte(); // total IO data records
- }
+ }
- // Read 1 byte data
- if (BitUtil.check(globalMask, 1)) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- int id = buf.readUnsignedByte();
- if (id == 1) {
- position.set(Event.KEY_POWER, buf.readUnsignedByte());
- } else {
- position.set(Event.PREFIX_IO + id, buf.readUnsignedByte());
- }
+ // Read 1 byte data
+ if (BitUtil.check(globalMask, 1)) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ int id = buf.readUnsignedByte();
+ if (id == 1) {
+ position.set(Event.KEY_POWER, buf.readUnsignedByte());
+ } else {
+ position.set(Event.PREFIX_IO + id, buf.readUnsignedByte());
}
}
+ }
- // Read 2 byte data
- if (BitUtil.check(globalMask, 2)) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort());
- }
+ // Read 2 byte data
+ if (BitUtil.check(globalMask, 2)) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort());
}
+ }
- // Read 4 byte data
- if (BitUtil.check(globalMask, 3)) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt());
- }
+ // Read 4 byte data
+ if (BitUtil.check(globalMask, 3)) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt());
}
+ }
- // Read 8 byte data
- if (codec == CODEC_FM4X00) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readLong());
- }
+ // Read 8 byte data
+ if (codec == CODEC_FM4X00) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readLong());
+ }
+ }
+
+ }
+
+ private List<Position> parseData(Channel channel, ChannelBuffer buf) {
+ List<Position> positions = new LinkedList<>();
+
+ buf.skipBytes(4); // marker
+ buf.readUnsignedInt(); // data length
+ int codec = buf.readUnsignedByte();
+ int count = buf.readUnsignedByte();
+
+ for (int i = 0; i < count; i++) {
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+
+ position.setDeviceId(getDeviceId());
+
+ if (codec == CODEC_12) {
+ decodeSerial(position, buf);
+ } else {
+ decodeLocation(position, buf, codec);
}
+
positions.add(position);
}
@@ -213,7 +229,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
if (buf.getUnsignedShort(0) > 0) {
parseIdentification(channel, remoteAddress, buf);
} else {
- return parseLocation(channel, buf);
+ return parseData(channel, buf);
}
return null;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 13:39:52 +0000