Commit e8ef5e9e authored by garciay's avatar garciay
Browse files

Merge STF455 staff

parent dc910ff4

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

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


package org.etsi.its.adapter;



import org.etsi.its.adapter.ports.FsapPort;

import org.etsi.its.adapter.ports.GnPort;



/**
@@ -27,6 +28,12 @@ public interface IManagementLayers { 
	 */

	public void registerGnPort(GnPort gnPort);



	/**

	 * Registers a FSAP port

	 * @param The FSAP port to register 

	 */

	public void registerFsapPort(final FsapPort fntpPort); 



	/**

	 * Gets the GeoNetworking beaconing interval

	 * @return GeoNetworking beaconing interval in ms

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

+11 −0
Original line number Diff line number Diff line
@@ -55,4 +55,15 @@ public interface IManagementTA { 
	 */

	public byte[] getLongPositionVector(byte[] targetGnAddress);

	

	/**

	 * Requests Test Adapter to trigger a Service Provider InSapPrimitiveUp/SAM message sending 

	 * @param sam The SAM message to transmit 

	 */

	public void startSamTransmission(final byte[] sam); 

	

	/**

	 * Requests Test Adapter to stop a Service Provider InSapPrimitiveUp/SAM message sending 

	 * @param sam The SAM message to transmit 

	 */

	public void stopSamTransmission(); 

}

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

+29 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import org.etsi.adapter.TERFactory; 
import org.etsi.common.ByteHelper;

import org.etsi.common.ITuple;

import org.etsi.common.Tuple;

import org.etsi.its.adapter.ports.FsapPort;

import org.etsi.its.adapter.ports.GnPort;

import org.etsi.ttcn.tci.CharstringValue;
@@ -68,6 +69,11 @@ public class Management implements IManagementTA, IManagementLayers { 
	 */

	private GnPort gnPort = null;

	

	/**

     * Registered FSAP Port

     */

    private FsapPort fsapPort = null; // FIXME Enhance this using Fsap.send() method

    

    /**

     * Private constructor (Multiton pattern)

     */
@@ -281,4 +287,27 @@ public class Management implements IManagementTA, IManagementLayers { 
        enqueueBeacon = null;

    }



    /**

     * Registers a FSAP port

     * @param The FSAP port to register 

     */

    @Override

    public void registerFsapPort(final FsapPort fsapPort) {

        this.fsapPort = fsapPort;

    }



    @Override

    public void startSamTransmission(final byte[] sam) {

        if(fsapPort != null) {

            fsapPort.startSamTransmission(sam);

        }

    }

    

    @Override

    public void stopSamTransmission() {

        if(fsapPort != null) {

            fsapPort.stopSamTransmission();

        }

    }

    

}

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

+7 −2
Original line number Diff line number Diff line
@@ -46,8 +46,13 @@ public class PcapMultiplexer implements Runnable { 
        // Obtain the list of network interfaces

        List<PcapIf> alldevs = new ArrayList<PcapIf>(); // Will be filled with NICs  

        

                          

        int r = Pcap.findAllDevs(alldevs, errbuf);  

        int r;

        try {

            r = Pcap.findAllDevs(alldevs, errbuf);  

        } catch (java.lang.UnsatisfiedLinkError e) {

            e.printStackTrace(); 

            return;

        }

        if (r == Pcap.NOT_OK || alldevs.isEmpty()) {  

          System.err.printf("Can't read list of devices, error is %s", errbuf.toString());  

          return;

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

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import java.util.Observer; 
import org.etsi.adapter.ITERequired;

import org.etsi.adapter.TERFactory;

import org.etsi.its.adapter.ports.AdapterControlPort;

import org.etsi.its.adapter.ports.ConfigTesterPort;

import org.etsi.its.adapter.ports.IPort;

import org.etsi.its.adapter.ports.PortEvent;

import org.etsi.its.adapter.ports.ProtocolPortFactory;
@@ -92,6 +93,8 @@ public class TestAdapter implements TriCommunicationSA, Observer { 
			port = new AdapterControlPort(portName, ComponentId);

		} else if (tsiPortId.getPortName().equals("utPort")) {

			port = new UpperTesterPort(portName, ComponentId);

        } else if (tsiPortId.getPortName().equals("cfPort")) {

            port = new ConfigTesterPort(portName, ComponentId);

		} else {

			String componentName = compPortId.getComponent().getComponentName();
@@ -293,7 +296,8 @@ public class TestAdapter implements TriCommunicationSA, Observer { 
	 */

	@Override

	public TriStatus triSutActionInformal(String description) {

		return required.getTriStatus(TriStatus.TRI_ERROR, "triSutActionInformal not implemented");	

        javax.swing.JOptionPane.showMessageDialog(null, description); 

        return required.getTriStatus(TriStatus.TRI_OK, "");

	}



	/**