Rebuild with new TCT3 (06138be7) · Commits · ITS - Intelligent Transport Systems / ITS

javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java

+17 −3

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public class PcapMultiplexer implements Runnable {


		int r = Pcap.findAllDevs(alldevs, errbuf);
		if (r == Pcap.NOT_OK \|\| alldevs.isEmpty()) {
		if (r != Pcap.OK \|\| alldevs.isEmpty()) {
		TERFactory.getInstance().logError("Can't read list of devices, error is %s" + errbuf.toString());
		return;
		}
		@@ -102,8 +102,22 @@ public class PcapMultiplexer implements Runnable {
		int flags = Pcap.MODE_PROMISCUOUS; // capture all packets
		int timeout = 10; // 10 millis
		pcap = Pcap.openLive(device.getName(), snaplen, flags, timeout, errbuf);
		if (pcap == null) { // Check result
		TERFactory.getInstance().logError("Error while opening device for capture: " + errbuf.toString());
		return;
		}
		captureThread = new Thread(this);
		captureThread.start();
		filter = "";
		} else { // Open file
		pcap = Pcap.openOffline(file, errbuf);
		if (pcap == null) { // Check result
		TERFactory.getInstance().logError("Error while opening device for capture: " + errbuf.toString());
		return;
		}
		captureThread = new Thread(this);
		captureThread.start();
		filter = "";
		}
		if (pcap == null) { // Check result
		TERFactory.getInstance().logError("Error while opening device for capture: " + errbuf.toString());
		@@ -253,11 +267,11 @@ public class PcapMultiplexer implements Runnable {
		int optimize = 0; // 1 means true, 0 means false
		int netmask = 0;
		int r = pcap.compile(bpfFilter, filter, optimize, netmask);
		if (r == Pcap.NOT_OK) {
		if (r != Pcap.OK) {
		TERFactory.getInstance().logError("Filter error: " + pcap.getErr());
		} else {
		r = pcap. setFilter(bpfFilter);
		if (r == Pcap.NOT_OK) {
		if (r != Pcap.OK) {
		TERFactory.getInstance().logError("Filter error: " + pcap.getErr());
		}
		}

javasrc/adapter/org/etsi/its/adapter/TestAdapter.java

+24 −11

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import org.etsi.its.adapter.ports.PortEvent;
		import org.etsi.its.adapter.ports.ProtocolPortFactory;
		import org.etsi.its.adapter.ports.UpperTesterPort;
		import org.etsi.ttcn.tci.CharstringValue;
		import org.etsi.ttcn.tri.TriActionTemplate;
		import org.etsi.ttcn.tri.TriAddress;
		import org.etsi.ttcn.tri.TriAddressList;
		import org.etsi.ttcn.tri.TriCommunicationSA;
		@@ -74,7 +73,6 @@ public class TestAdapter implements TriCommunicationSA, Observer {
		/* (non-Javadoc)
		* @see org.etsi.ttcn.tri.TriCommunicationSA#triExecuteTestcase(org.etsi.ttcn.tri.TriTestCaseId, org.etsi.ttcn.tri.TriPortIdList)
		*/
		@Override
		public TriStatus triExecuteTestcase(final TriTestCaseId tcId, final TriPortIdList portList) {
		return required.getTriStatus(TriStatus.TRI_OK);
		}
		@@ -302,15 +300,6 @@ public class TestAdapter implements TriCommunicationSA, Observer {
		return required.getTriStatus(TriStatus.TRI_ERROR, "triSutActionInformal not implemented");
		}

		/**
		* triSutActionTemplate not implemented
		* @see org.etsi.ttcn.tri.TriCommunicationSA#triSutActionTemplate(org.etsi.ttcn.tri.TriActionTemplate)
		*/
		@Override
		public TriStatus triSutActionTemplate(TriActionTemplate templateValue) {
		return required.getTriStatus(TriStatus.TRI_ERROR, "triSutActionTemplate not implemented");
		}

		/**
		* triMapParam not implemented
		* @see org.etsi.ttcn.tri.TriCommunicationSA#triMapParam(org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriParameterList)
		@@ -328,4 +317,28 @@ public class TestAdapter implements TriCommunicationSA, Observer {
		public TriStatus triUnmapParam(TriPortId compPortId, TriPortId tsiPortId, TriParameterList paramList) {
		return required.getTriStatus(TriStatus.TRI_ERROR, "triUnmapParam not implemented");
		}

		@Override
		public TriStatus triExecuteTestCase(TriTestCaseId arg0, TriPortIdList arg1) {
		// TODO Auto-generated method stub
		return triExecuteTestcase(arg0, arg1);
		}

		@Override
		public TriStatus triGetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
		// TODO Auto-generated method stub
		return null;
		}

		@Override
		public TriStatus triSetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
		// TODO Auto-generated method stub
		return null;
		}

		@Override
		public TriStatus triStaticMap(TriPortId arg0, TriPortId arg1) {
		// TODO Auto-generated method stub
		return null;
		}
		}

javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable {

		@Override
		public boolean send(final byte[] message) {
		if (/true or /_offlineMode.equals("true")) { /* FIXME: For debug only. Uncomment if no UT - Do not forget the return true below*/
		if (true /or _offlineMode.equals("true")/) { /* FIXME: For debug only. Uncomment if no UT - Do not forget the return true below*/
		try {
		Thread.sleep(500);
		} catch (InterruptedException e) {
		@@ -201,9 +201,9 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable {
		}
		notifyObservers(new PortEvent(rsp, getPortName(), getComponentName()));
		}
		/* FIXME: For debug only if(true)
		/* FIXME: For debug only */if(true)
		return true;
		*/
		/**/
		try {
		ByteArrayOutputStream dataToSent = new ByteArrayOutputStream();
		dataToSent.write(message);

javasrc/tool/org/etsi/its/tool/elvior/BuiltInCodec.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ import org.elvior.ttcn.tritci.TriProvider;
		import org.etsi.common.ByteHelper;
		import org.etsi.ttcn.tci.RecordValue;
		import org.etsi.ttcn.tci.TciCDProvided;
		import org.etsi.ttcn.tci.TciDecodingResult;
		import org.etsi.ttcn.tci.Type;
		import org.etsi.ttcn.tci.Value;
		import org.etsi.ttcn.tri.TriMessage;
		@@ -166,4 +167,16 @@ public class BuiltInCodec implements TciCDProvided {
		return asnOriginalType;
		} // End of method getTypeForName

		@Override
		public TciDecodingResult decodeValue(TriMessage arg0, Type arg1, String arg2) {
		// TODO Auto-generated method stub
		return null;
		}

		@Override
		public TriMessage encodeValue(Value arg0, String arg1) {
		// TODO Auto-generated method stub
		return null;
		}

		} // End of class BuiltInCodec

javasrc/tool/org/etsi/its/tool/elvior/Its_CodecProvider.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ import org.etsi.codec.TciCDWrapperFactory;
		import org.etsi.tool.elvior.TciCDWrapper;
		import org.etsi.ttcn.codec.CodecFactory;
		import org.etsi.ttcn.tci.TciCDProvided;
		import org.etsi.ttcn.tci.TciDecodingResult;
		import org.etsi.ttcn.tci.Type;
		import org.etsi.ttcn.tci.Value;
		import org.etsi.ttcn.tri.TriMessage;
		@@ -232,6 +233,26 @@ public class Its_CodecProvider implements TciCDProvided, ChannelEventHandler, IT
		}
		return m;
		}

		@Override
		public TciDecodingResult decodeValue(TriMessage message, Type decodingHypothesis, String arg2) {
		return TciProvider.getInstance().getTciFactory().createDecodingResult(0, decode(message, decodingHypothesis));
		}

		@Override
		public TriMessage encodeValue(Value value, String arg1) {
		return encode(value);
		}
		}

		@Override
		public TciDecodingResult decodeValue(TriMessage message, Type decodingHypothesis, String arg2) {
		return TciProvider.getInstance().getTciFactory().createDecodingResult(0, decode(message, decodingHypothesis));
		}

		@Override
		public TriMessage encodeValue(Value value, String arg1) {
		return encode(value);
		}

		} // End of class Its_CodecProvider