[mobicents] r15542 committed - Update Issue 2157...

[mobicents]

Revision: 15542
Author: baranowb
Date: Mon Nov 29 05:17:43 2010
Log: Update Issue 2157
Another revert. Tested.
http://code.google.com/p/mobicents/source/detail?r=15542
Modified:
  
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java

=======================================
---  
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java	 
Mon Nov 29 03:44:16 2010
+++  
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java	 
Mon Nov 29 05:17:43 2010
@@ -37,7 +37,7 @@
 import org.mobicents.media.Server;
 import org.mobicents.media.server.impl.clock.LocalTask;
 import org.mobicents.media.server.spi.clock.Task;
-import org.mobicents.protocols.link.LinkState;
+import org.mobicents.protocols.link.LinkState;
 import org.mobicents.protocols.link.LinkStateListener;
 import org.mobicents.protocols.ss7.m3ua.M3UAChannel;
 import org.mobicents.protocols.ss7.m3ua.M3UAProvider;
@@ -67,8 +67,7 @@
     /** Destination point code */
     private int dpc;
     /** Sub-Service */
-    private int ni = Mtp3.DEFAULT_NI;//good as any, since 0 is valid  
value...
-    private int priority;
+    private int ssi = Mtp3.DEFAULT_SSI;//good as any, since 0 is valid  
value...
     /** physical channels */
     private List<Mtp1> channels;
     /** MTP layer 3 */
@@ -138,22 +137,19 @@
     public int getDpc() {
         return dpc;
     }
-    public int getNI() {
-               return ni ;
-       }
-
-       public void setNI(int ni) {
-               //prepare to be set. value can be used directly.
-               this.ni = (0x03 & ni) ;
-
-       }
-
-       public int getPriority() {
-               return priority;
-       }
-
-       public void setPriority(int priority) {
-               this.priority = (0x03 & priority);
+    /**
+     * Fetches Sub-Service part of SI octet.
+     * @return
+     */
+    public int getSsi() {
+               return ssi;
+       }
+    /**
+     * Sets Sub-Service part of SI octet to be used for communication.
+     * @param ssi
+     */
+       public void setSsi(int ssi) {
+               this.ssi = ssi;
        }

        public void setLocalAddress(String address) {
@@ -209,8 +205,7 @@
             mtp3 = new Mtp3(name);
             mtp3.setDpc(dpc);
             mtp3.setOpc(opc);
-            mtp3.setNI(ni);
-            mtp3.setPriority(priority);
+            mtp3.setSsi(ssi);
             mtp3.setLinks(linkset);
             mtp3.addMtp3Listener(this);
             logger.info("Point codes are configured");