Skip to content
GitLab
Commit 06138be7 authored by garciay's avatar garciay
Browse files

Rebuild with new TCT3

parent 102b4e0c
Hide whitespace changes
Inline Side-by-side
javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java
View file @ 06138be7
......@@ -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
View file @ 06138be7
......@@ -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
View file @ 06138be7
......@@ -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
View file @ 06138be7
......@@ -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;
......@@ -165,5 +166,17 @@ public class BuiltInCodec implements TciCDProvided {
_logger.exiting("BuiltInCodec", "getTypeForName", asnOriginalType.getName());
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
View file @ 06138be7
......@@ -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
javasrc/tool/org/etsi/its/tool/elvior/LibIts_asn1.java
View file @ 06138be7
......@@ -10,6 +10,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.TciTypeClass;
import org.etsi.ttcn.tci.Type;
import org.etsi.ttcn.tci.Value;
......@@ -175,5 +176,17 @@ public class LibIts_asn1 implements TciCDProvided {
//_logger.exiting("LibIts_asn1", "getTypeForName", (asnOriginalType != null) ? asnOriginalType.getName() : "(null)");
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 LibIts_asn1
javasrc/tool/org/etsi/tool/elvior/TeRequiredImpl.java
View file @ 06138be7
......@@ -14,6 +14,9 @@ import org.etsi.adapter.ITERequired;
import org.etsi.its.tool.elvior.MainTA;
import org.etsi.its.tool.elvior.PluginAdapter;
import org.etsi.ttcn.tci.CharstringValue;
import org.etsi.ttcn.tci.LengthRestriction;
import org.etsi.ttcn.tci.MatchingMechanism;
import org.etsi.ttcn.tci.RangeBoundary;
import org.etsi.ttcn.tci.Type;
import org.etsi.ttcn.tci.Value;
import org.etsi.ttcn.tri.TriAddress;
......@@ -103,6 +106,90 @@ public class TeRequiredImpl implements ITERequired {
public char getChar(int index) {
return _value.charAt(index);
}
@Override
public LengthRestriction getLengthRestriction() {
// TODO Auto-generated method stub
return null;
}
@Override
public RangeBoundary getLowerTypeBoundary() {
// TODO Auto-generated method stub
return null;
}
@Override
public LengthRestriction getTypeLengthRestriction() {
// TODO Auto-generated method stub
return null;
}
@Override
public MatchingMechanism getTypeMatchingMechanism() {
// TODO Auto-generated method stub
return null;
}
@Override
public RangeBoundary getUpperTypeBoundary() {
// TODO Auto-generated method stub
return null;
}
@Override
public boolean isEvaluated() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isFuzzy() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isIfPresentEnabled() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isLazy() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isMatchingSymbol() {
// TODO Auto-generated method stub
return false;
}
@Override
public LengthRestriction newLengthRestriction() {
// TODO Auto-generated method stub
return null;
}
@Override
public void setIfPresentEnabled(boolean arg0) {
// TODO Auto-generated method stub
}
@Override
public void setLengthRestriction(LengthRestriction arg0) {
// TODO Auto-generated method stub
}
@Override
public String valueToString() {
// TODO Auto-generated method stub
return null;
}
};
string.setString(_properties.getProperty(param, ""));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment