diff options
| -rw-r--r-- | default.cfg | 4 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 12 | ||||
| -rw-r--r-- | src/org/traccar/protocol/NoranProtocolDecoder.java | 129 | ||||
| -rw-r--r-- | test/org/traccar/protocol/NoranProtocolDecoderTest.java | 21 |
4 files changed, 166 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg index 446e861a5..af81dd865 100644 --- a/default.cfg +++ b/default.cfg @@ -274,4 +274,8 @@ <entry key='gator.enable'>true</entry> <entry key='gator.port'>5052</entry> + <!-- Noran and UniGuard server configuration --> + <entry key='noran.enable'>true</entry> + <entry key='noran.port'>5053</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 2f07e2b50..f5130816f 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -148,6 +148,7 @@ public class ServerManager { initGotopServer("gotop"); initTotemServer("totem"); initGatorServer("gator"); + initNoranServer("noran"); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { @@ -956,4 +957,15 @@ public class ServerManager { } } + private void initNoranServer(String protocol) throws SQLException { + if (isProtocolEnabled(properties, protocol)) { + serverList.add(new TrackerServer(this, new ConnectionlessBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("objectDecoder", new NoranProtocolDecoder(ServerManager.this)); + } + }); + } + } + } diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java new file mode 100644 index 000000000..cc8c91876 --- /dev/null +++ b/src/org/traccar/protocol/NoranProtocolDecoder.java @@ -0,0 +1,129 @@ +/* + * Copyright 2013 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 java.nio.charset.Charset; +import java.util.Calendar; +import java.util.TimeZone; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.BaseProtocolDecoder; +import org.traccar.ServerManager; +import org.traccar.helper.Log; +import org.traccar.model.ExtendedInfoFormatter; +import org.traccar.model.Position; + +public class NoranProtocolDecoder extends BaseProtocolDecoder { + + public NoranProtocolDecoder(ServerManager serverManager) { + super(serverManager); + } + + private String readImei(ChannelBuffer buf) { + int b = buf.readUnsignedByte(); + StringBuilder imei = new StringBuilder(); + imei.append(b & 0x0F); + for (int i = 0; i < 7; i++) { + b = buf.readUnsignedByte(); + imei.append((b & 0xF0) >> 4); + imei.append(b & 0x0F); + } + return imei.toString(); + } + + private static final int MSG_UPLOAD_POSITION = 0x0008; + private static final int MSG_CONTROL_RESPONSE = 0x8009; + private static final int MSG_ALARM = 0x0003; + private static final int MSG_SHAKE_HAND = 0x0000; + private static final int MSG_IMAGE_SIZE = 0x0200; + private static final int MSG_IMAGE_PACKET = 0x0201; + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + ChannelBuffer buf = (ChannelBuffer) msg; + + buf.readUnsignedShort(); // length + int type = buf.readUnsignedShort(); + + if (type == MSG_SHAKE_HAND) { + // TODO send response + } + + else if (type == MSG_UPLOAD_POSITION || + type == MSG_CONTROL_RESPONSE || + type == MSG_ALARM) { + + // Create new position + Position position = new Position(); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("noran"); + + if (type == MSG_CONTROL_RESPONSE) { + buf.readUnsignedInt(); // GIS ip + buf.readUnsignedInt(); // GIS port + } + + // Flags + int flags = buf.readUnsignedByte(); + position.setValid((flags & 0x01) != 0); + + // Alarm type + extendedInfo.set("alarm", buf.readUnsignedByte()); + + // Location + position.setSpeed((double) buf.readUnsignedByte()); + position.setCourse((double) buf.readUnsignedShort()); + position.setLongitude((double) buf.readFloat()); + position.setLatitude((double) buf.readFloat()); + + // Time + long timeValue = buf.readUnsignedInt(); + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.YEAR, 2000 + (int) (timeValue >> 26)); + time.set(Calendar.MONTH, (int) (timeValue >> 22 & 0x0f) - 1); + time.set(Calendar.DAY_OF_MONTH, (int) (timeValue >> 17 & 0x1f)); + time.set(Calendar.HOUR, (int) (timeValue >> 12 & 0x1f)); + time.set(Calendar.MINUTE, (int) (timeValue >> 6 & 0x3f)); + time.set(Calendar.SECOND, (int) (timeValue & 0x3f)); + position.setTime(time.getTime()); + + // Identification + String id = buf.readBytes(11).toString(Charset.defaultCharset()); + try { + position.setDeviceId(getDataManager().getDeviceByImei(id).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + id); + } + + // IO status + extendedInfo.set("io", buf.readUnsignedByte()); + + // Fuel + extendedInfo.set("fuel", buf.readUnsignedByte()); + + position.setExtendedInfo(extendedInfo.toString()); + return position; + } + + return null; + } + +} diff --git a/test/org/traccar/protocol/NoranProtocolDecoderTest.java b/test/org/traccar/protocol/NoranProtocolDecoderTest.java new file mode 100644 index 000000000..74c6c9817 --- /dev/null +++ b/test/org/traccar/protocol/NoranProtocolDecoderTest.java @@ -0,0 +1,21 @@ +package org.traccar.protocol; + +import org.jboss.netty.buffer.ChannelBuffers; +import static org.junit.Assert.assertNotNull; +import org.junit.Test; +import org.traccar.helper.ChannelBufferTools; + +public class NoranProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + NoranProtocolDecoder decoder = new NoranProtocolDecoder(null); + decoder.setDataManager(new TestDataManager()); + + //int[] buf1 = {0x00}; + //assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf1)))); + + } + +} |