diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-08-03 23:16:11 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-08-03 23:16:11 -0700 |
commit | b5e9d84cfeb8d4e6a4e1133a2e0510652be1de6b (patch) | |
tree | 36f14a8a052163f2e1b0a770c65204ebc938eff0 | |
parent | 10da32b83608a882744212373e3ff4ff2716aadf (diff) | |
download | trackermap-server-b5e9d84cfeb8d4e6a4e1133a2e0510652be1de6b.tar.gz trackermap-server-b5e9d84cfeb8d4e6a4e1133a2e0510652be1de6b.tar.bz2 trackermap-server-b5e9d84cfeb8d4e6a4e1133a2e0510652be1de6b.zip |
Implement Naviset protocol
6 files changed, 205 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml index bddface92..c5046ae83 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -270,5 +270,6 @@ <entry key='mictrack.port'>5191</entry> <entry key='plugin.port'>5192</entry> <entry key='leafspy.port'>5193</entry> + <entry key='naviset.port'>5194</entry> </properties> diff --git a/src/main/java/org/traccar/protocol/NavisetFrameDecoder.java b/src/main/java/org/traccar/protocol/NavisetFrameDecoder.java new file mode 100644 index 000000000..e5e13b305 --- /dev/null +++ b/src/main/java/org/traccar/protocol/NavisetFrameDecoder.java @@ -0,0 +1,39 @@ +/* + * Copyright 2019 Anton Tananaev (anton@traccar.org) + * + * 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 io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; +import org.traccar.BaseFrameDecoder; +import org.traccar.helper.BitUtil; + +public class NavisetFrameDecoder extends BaseFrameDecoder { + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception { + + int length = 2 + BitUtil.to(buf.getUnsignedShortLE(buf.readerIndex()), 12) + 2; + + if (buf.readableBytes() >= length) { + return buf.readRetainedSlice(length); + } + + return null; + } + +} diff --git a/src/main/java/org/traccar/protocol/NavisetProtocol.java b/src/main/java/org/traccar/protocol/NavisetProtocol.java new file mode 100644 index 000000000..78755ea4d --- /dev/null +++ b/src/main/java/org/traccar/protocol/NavisetProtocol.java @@ -0,0 +1,34 @@ +/* + * Copyright 2019 Anton Tananaev (anton@traccar.org) + * + * 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.BaseProtocol; +import org.traccar.PipelineBuilder; +import org.traccar.TrackerServer; + +public class NavisetProtocol extends BaseProtocol { + + public NavisetProtocol() { + addServer(new TrackerServer(false, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new NavisetFrameDecoder()); + pipeline.addLast(new NavisetProtocolDecoder(NavisetProtocol.this)); + } + }); + } + +} diff --git a/src/main/java/org/traccar/protocol/NavisetProtocolDecoder.java b/src/main/java/org/traccar/protocol/NavisetProtocolDecoder.java new file mode 100644 index 000000000..36a060176 --- /dev/null +++ b/src/main/java/org/traccar/protocol/NavisetProtocolDecoder.java @@ -0,0 +1,94 @@ +/* + * Copyright 2019 Anton Tananaev (anton@traccar.org) + * + * 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 io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.NetworkMessage; +import org.traccar.Protocol; +import org.traccar.helper.BitUtil; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.nio.charset.StandardCharsets; +import java.util.Date; + +public class NavisetProtocolDecoder extends BaseProtocolDecoder { + + public NavisetProtocolDecoder(Protocol protocol) { + super(protocol); + } + + public static final int MSG_HEADER = 0b00; + public static final int MSG_DATA = 0b01; + public static final int MSG_RESPONSE = 0b10; + public static final int MSG_RESERVE = 0b11; + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + ByteBuf buf = (ByteBuf) msg; + + if (channel != null) { + ByteBuf response = Unpooled.buffer(); + response.writeByte(0x01); + response.writeShortLE(buf.getUnsignedShortLE(buf.writerIndex() - 2)); + channel.writeAndFlush(new NetworkMessage(response, channel.remoteAddress())); + } + + int length = buf.readUnsignedShortLE(); + BitUtil.between(length, 12, 14); // version + int type = BitUtil.between(length, 14, 16); + buf.readUnsignedShortLE(); // device number + + if (type == MSG_HEADER) { + + getDeviceSession(channel, remoteAddress, buf.readCharSequence(15, StandardCharsets.US_ASCII).toString()); + + } else if (type == MSG_DATA) { + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + buf.readUnsignedByte(); // mask + position.set(Position.KEY_INDEX, buf.readUnsignedShortLE()); + position.set(Position.KEY_STATUS, buf.readUnsignedByte()); + + position.setValid(true); + position.setTime(new Date(buf.readUnsignedIntLE() * 1000)); + position.setLatitude(buf.readUnsignedIntLE() * 0.000001); + position.setLongitude(buf.readUnsignedIntLE() * 0.000001); + position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShortLE() * 0.1)); + + // additional data + + return position; + } + + return null; + } + +} diff --git a/src/test/java/org/traccar/protocol/NavisetFrameDecoderTest.java b/src/test/java/org/traccar/protocol/NavisetFrameDecoderTest.java new file mode 100644 index 000000000..450f77144 --- /dev/null +++ b/src/test/java/org/traccar/protocol/NavisetFrameDecoderTest.java @@ -0,0 +1,19 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class NavisetFrameDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + NavisetFrameDecoder decoder = new NavisetFrameDecoder(); + + verifyFrame( + binary("1310e4073836383230343030353935383436362a060716"), + decoder.decode(null, null, binary("1310e4073836383230343030353935383436362a060716"))); + + } + +} diff --git a/src/test/java/org/traccar/protocol/NavisetProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NavisetProtocolDecoderTest.java new file mode 100644 index 000000000..a17f9d1e3 --- /dev/null +++ b/src/test/java/org/traccar/protocol/NavisetProtocolDecoderTest.java @@ -0,0 +1,18 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class NavisetProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + NavisetProtocolDecoder decoder = new NavisetProtocolDecoder(null); + + verifyNull(decoder, binary( + "1310e4073836383230343030353935383436362a060716")); + + } + +} |