Revision: 16103
Author: [email protected]
Date: Wed Dec 29 10:39:39 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16103

Modified:
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/Channel.java /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java

=======================================
--- /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/Channel.java Mon Dec 27 04:35:56 2010 +++ /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/Channel.java Wed Dec 29 10:39:39 2010
@@ -25,6 +25,8 @@
 import org.mobicents.protocols.stream.api.StreamSelector;

 /**
+ * Implementation for {...@link org.mobicents.protocols.ss7.mtp.Mtp1}. Opens the
+ * channel (JNI) and works with underlying dahdi link
  *
  * @author kulikov
  * @author baranowb
@@ -32,179 +34,179 @@
  */
 public class Channel implements Mtp1 {

-       private final static String LIB_NAME = "mobicents-dahdi-linux";
-
-       static {
-               try {
-                        System.loadLibrary(LIB_NAME);
-                        System.out.println("Loaded library 
mobicents-dahdi-linux");
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       private int span;
-       private int channelID;
-       private int code;
-       private String linkName;
-       private int ioBufferSize = 32; // lets default to 32, it seems optimal.
-       protected int fd;
-
-       private Object link;
-
-       protected SelectorKey selectorKey;
-
-       public Channel() {
-       }
-
-       public int getSpan() {
-               return span;
-       }
-
-       public void setSpan(int span) {
-               this.span = span;
-       }
-
-       public int getChannelID() {
-               return channelID;
-       }
-
-       public void setChannelID(int channelID) {
-               this.channelID = channelID;
-       }
-
-       public void setCode(int code) {
-               this.code = code;
-       }
-
-       public int getCode() {
-               return code;
-       }
-
-       public void setLinkName(String linkName) {
-               this.linkName = linkName;
-       }
-
-       public String getLinkName() {
-               return linkName;
-       }
-
-       public int getIOBufferSize() {
-               return ioBufferSize;
-       }
-
-       public void setIOBufferSize(int bufferSize) {
-               this.ioBufferSize = bufferSize;
-       }
-
-       public void open() {
-               int zapid = 31 * (span - 1) + channelID;
-               fd = openChannel(zapid, ioBufferSize);
-       }
-
-       /**
-        * Opens this channel and prepares it for reading.
-        *
-        * @param id
-        *            - id of zap device, its appended at the end of path, for
-        *            instance: /dev/dahdi/${id}
-        * @param bufferSize
-        *            - size of buffer to be used for I/O ops.
-        */
-       public native int openChannel(int id, int bufferSize);
-
-       /**
-        * Reads data from this pipe.
-        *
-        * @param buffer
-        *            the byte buffer to read data.
-        * @return the number of bytes actualy read.
-        */
-       public int read(byte[] buffer) throws IOException {
-               return readData(fd, buffer);
-       }
-
-       public native int readData(int fd, byte[] buffer);
-
-       /**
-        * Writes specified data to the pipe.
-        *
-        * @param buffer
-        *            the buffer with data to write
-        * @param len
-        *            the length of the buffer.
-        */
-       public int write(byte[] buffer) throws IOException {
-               writeData(fd, buffer, buffer.length);
-               return  buffer.length; //?
-       }
-
-       public native void writeData(int fd, byte[] buffer, int len);
-
-       /**
-        * Registers pipe for polling.
-        *
-        * @param fd
-        *            the file descriptor.
-        */
-       public native void doRegister(int fd);
-
-       /**
-        * Unregisters pipe from polling.
-        *
-        * @param fd
-        *            the file descriptor.
-        */
-       public native void doUnregister(int fd);
-
-       public void close() {
-               closeChannel(fd);
-       }
-
-       /**
-        * Closes this pipe.
-        */
-       public native void closeChannel(int fd);
-
-       @Override
-       public String toString() {
-               return Integer.toString(channelID);
-       }
-
-       public void setLink(Object link) {
-               this.link = link;
-       }
-
-       public Object getLink() {
-               return this.link;
-       }
-
-       protected void doRegister(StreamSelector selector) {
-               doRegister(fd);
-       }
-
-       protected void doUnregister(StreamSelector selector) {
-               doUnregister(fd);
-       }
-
-       public boolean isReadable() {
-               throw new UnsupportedOperationException("Not supported yet.");
-       }
-
-       public boolean isWriteable() {
-               throw new UnsupportedOperationException("Not supported yet.");
-       }
-
-       public SelectorProvider provider() {
-               throw new UnsupportedOperationException("Not supported yet.");
-       }
-
-       public SelectorKey register(StreamSelector selector) throws IOException 
{
-               return ((Selector) selector).register(this);
-       }
-
-       public void write(byte[] data, int len) throws IOException {
-               this.writeData(fd, data, len);
-       }
+    private final static String LIB_NAME = "mobicents-dahdi-linux";
+
+    static {
+        try {
+            System.loadLibrary(LIB_NAME);
+            System.out.println("Loaded library mobicents-dahdi-linux");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private int span;
+    private int channelID;
+    private int code;
+    private String linkName;
+    private int ioBufferSize = 32; // lets default to 32, it seems optimal.
+    protected int fd;
+
+    private Object link;
+
+    protected SelectorKey selectorKey;
+
+    public Channel() {
+    }
+
+    public int getSpan() {
+        return span;
+    }
+
+    public void setSpan(int span) {
+        this.span = span;
+    }
+
+    public int getChannelID() {
+        return channelID;
+    }
+
+    public void setChannelID(int channelID) {
+        this.channelID = channelID;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setLinkName(String linkName) {
+        this.linkName = linkName;
+    }
+
+    public String getLinkName() {
+        return linkName;
+    }
+
+    public int getIOBufferSize() {
+        return ioBufferSize;
+    }
+
+    public void setIOBufferSize(int bufferSize) {
+        this.ioBufferSize = bufferSize;
+    }
+
+    public void open() {
+        int zapid = 31 * (span - 1) + channelID;
+        fd = openChannel(zapid, ioBufferSize);
+    }
+
+    /**
+     * Opens this channel and prepares it for reading.
+     *
+     * @param id -
+     *            id of zap device, its appended at the end of path, for
+     *            instance: /dev/dahdi/${id}
+     * @param bufferSize -
+     *            size of buffer to be used for I/O ops.
+     */
+    public native int openChannel(int id, int bufferSize);
+
+    /**
+     * Reads data from this pipe.
+     *
+     * @param buffer
+     *            the byte buffer to read data.
+     * @return the number of bytes actualy read.
+     */
+    public int read(byte[] buffer) throws IOException {
+        return readData(fd, buffer);
+    }
+
+    public native int readData(int fd, byte[] buffer);
+
+    /**
+     * Writes specified data to the pipe.
+     *
+     * @param buffer
+     *            the buffer with data to write
+     * @param len
+     *            the length of the buffer.
+     */
+    public int write(byte[] buffer) throws IOException {
+        writeData(fd, buffer, buffer.length);
+        return buffer.length; // ?
+    }
+
+    public native void writeData(int fd, byte[] buffer, int len);
+
+    /**
+     * Registers pipe for polling.
+     *
+     * @param fd
+     *            the file descriptor.
+     */
+    public native void doRegister(int fd);
+
+    /**
+     * Unregisters pipe from polling.
+     *
+     * @param fd
+     *            the file descriptor.
+     */
+    public native void doUnregister(int fd);
+
+    public void close() {
+        closeChannel(fd);
+    }
+
+    /**
+     * Closes this pipe.
+     */
+    public native void closeChannel(int fd);
+
+    @Override
+    public String toString() {
+        return Integer.toString(channelID);
+    }
+
+    public void setLink(Object link) {
+        this.link = link;
+    }
+
+    public Object getLink() {
+        return this.link;
+    }
+
+    protected void doRegister(StreamSelector selector) {
+        doRegister(fd);
+    }
+
+    protected void doUnregister(StreamSelector selector) {
+        doUnregister(fd);
+    }
+
+    public boolean isReadable() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public boolean isWriteable() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public SelectorProvider provider() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+ public SelectorKey register(StreamSelector selector) throws IOException {
+        return ((Selector) selector).register(this);
+    }
+
+    public void write(byte[] data, int len) throws IOException {
+        this.writeData(fd, data, len);
+    }

 }
=======================================
--- /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java Tue Dec 28 07:05:48 2010 +++ /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java Wed Dec 29 10:39:39 2010
@@ -46,7 +46,7 @@
     }

     @Override
-    protected void init() throws Exception {
+    protected void configure() throws Exception {

         if (this.mode == LinkMode.CONFIGURED) {
             if (this.channel == null) {
@@ -109,7 +109,7 @@

         this.mode = LinkMode.CONFIGURED;

-        this.init();
+        this.configure();

         this.state = LinkState.UNAVAILABLE;
     }
@@ -144,7 +144,7 @@
             link.ioBufferSize = xml.getAttribute(LINK_IO_BUFFER_SIZE, 32);

             try {
-                link.init();
+                link.configure();
             } catch (Exception e) {
                 logger.error("Failed to initialize dahdi link", e);
             }

Reply via email to