Revision: 15537
Author: baranowb
Date: Mon Nov 29 02:43:52 2010
Log: [SS7] Revert some changes that were ... bad.
http://code.google.com/p/mobicents/source/detail?r=15537
Modified:
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/MtpProvider.java
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/m3ua/Provider.java
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/MtpProvider.java
Fri Nov 26 04:10:47 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/MtpProvider.java
Mon Nov 29 02:43:52 2010
@@ -20,6 +20,30 @@
* @return
*/
public String getName();
+
+ /**
+ * Assigns originated point code
+ *
+ * @param opc the originated point code
+ */
+ public void setOriginalPointCode(int opc);
+
+ /**
+ * Assigns destination point code.
+ *
+ * @param dpc destination point code in decimal format.
+ */
+ public void setAdjacentPointCode(int dpc);
+
+ /**
+ * @return the dpc
+ */
+ public int getAdjacentPointCode();
+
+ /**
+ * @return the opc
+ */
+ public int getOriginalPointCode();
/**
* Sets listener for MTP callbacks. If null is passed internal refence
is
=======================================
---
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/m3ua/Provider.java
Fri Nov 26 04:10:47 2010
+++
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/provider/m3ua/Provider.java
Mon Nov 29 02:43:52 2010
@@ -56,6 +56,9 @@
public static final String PROPERTY_LADDRESS = "mtp.address.local";
public static final String PROPERTY_RADDRESS = "mtp.address.remote";
+ public static final String PROPERTY_APC = "mtp.apc";
+ public static final String PROPERTY_OPC = "mtp.opc";
+
protected SocketAddress localAddress = new
InetSocketAddress("127.0.0.1", 8998);;
protected SocketAddress remoteAddress = new
InetSocketAddress("127.0.0.1", 1345);
@@ -75,7 +78,9 @@
private ReentrantLock lock = new ReentrantLock();
private Condition sendCompleted = lock.newCondition();
-
+
+ private int opc;
+ private int apc;
/**
*
@@ -120,6 +125,20 @@
this.remoteAddress = parseStringAddress(s);
}
+ //opc/dpc
+ s = p.getProperty(PROPERTY_APC);
+ if(s == null)
+ {
+ throw new ConfigurationException("APC must be specified
with: "+PROPERTY_APC+" property.");
+ }
+ this.apc = Integer.parseInt(s);
+
+ s = p.getProperty(PROPERTY_OPC);
+ if(s == null)
+ {
+ throw new ConfigurationException("OPC must be specified
with: "+PROPERTY_OPC+" property.");
+ }
+ this.opc = Integer.parseInt(s);
} catch (Exception e) {
throw new ConfigurationException(e);
}
@@ -178,6 +197,22 @@
throw new StartFailedException(e);
}
}
+
+ public void setOriginalPointCode(int opc) {
+ this.opc = opc;
+ }
+
+ public void setAdjacentPointCode(int apc) {
+ this.apc = apc;
+ }
+
+ public int getAdjacentPointCode() {
+ return apc;
+ }
+
+ public int getOriginalPointCode() {
+ return opc;
+ }
public void setMtpListener(MtpListener listener) {
this.listener = listener;