Revision: 8a48c2b50932
Author: Sergey Vetyutnev <[email protected]>
Date: Wed Sep 4 06:25:52 2013 UTC
Log: SS7 Simulator update - adding support for m3ua loadsharing
http://code.google.com/p/jss7/source/detail?r=8a48c2b50932
Modified:
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaConfigurationData.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaMan.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaManMBean.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaManStandardMBean.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/management/TesterHost.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/M3uaForm.java
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/TestingForm.java
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/tests/sms/TestSmsServerParamForm.java
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaConfigurationData.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaConfigurationData.java
Wed Sep 4 06:25:52 2013 UTC
@@ -42,9 +42,13 @@
protected static final String STORE_PCAP_TRACE = "storePcapTrace";
protected static final String IS_SCTP_SERVER = "isSctpServer";
protected static final String LOCAL_HOST = "localHost";
+ protected static final String LOCAL_HOST_2 = "localHost2";
protected static final String LOCAL_PORT = "localPort";
+ protected static final String LOCAL_PORT_2 = "localPort2";
protected static final String REMOTE_HOST = "remoteHost";
+ protected static final String REMOTE_HOST_2 = "remoteHost2";
protected static final String REMOTE_PORT = "remotePort";
+ protected static final String REMOTE_PORT_2 = "remotePort2";
protected static final String IP_CHANNEL_TYPE = "ipChannelType";
protected static final String EXTRA_HOST_ADDRESSES
= "extraHostAddresses";
@@ -52,7 +56,9 @@
protected static final String M3UA_EXCHANGE_TYPE = "m3uaExchangeType";
protected static final String M3UA_IPSPType = "m3uaIPSPType";
protected static final String DPC = "dpc";
+ protected static final String DPC_2 = "dpc2";
protected static final String OPC = "opc";
+ protected static final String OPC_2 = "opc2";
protected static final String SI = "si";
protected static final String ROUTING_CONTEXT = "routingConext";
protected static final String NETWORK_APPEARANCE = "networkAppearance";
@@ -63,10 +69,16 @@
private int localPort;
private String remoteHost;
private int remotePort;
+ private String localHost2;
+ private int localPort2;
+ private String remoteHost2;
+ private int remotePort2;
private IpChannelType ipChannelType = IpChannelType.TCP;
private String[] extraHostAddresses = new String[0];
private int dpc = 0;
private int opc = -1;
+ private int dpc2 = 0;
+ private int opc2 = 0;
private int si = -1;
private long routingContext = 101;
private long networkAppearance = 102;
@@ -94,34 +106,66 @@
public String getLocalHost() {
return localHost;
}
+
+ public String getLocalHost2() {
+ return localHost2;
+ }
public void setLocalHost(String val) {
localHost = val;
}
+
+ public void setLocalHost2(String val) {
+ localHost2 = val;
+ }
public int getLocalPort() {
return localPort;
}
+
+ public int getLocalPort2() {
+ return localPort2;
+ }
public void setLocalPort(int val) {
localPort = val;
}
+
+ public void setLocalPort2(int val) {
+ localPort2 = val;
+ }
public String getRemoteHost() {
return remoteHost;
}
+
+ public String getRemoteHost2() {
+ return remoteHost2;
+ }
public void setRemoteHost(String val) {
remoteHost = val;
}
+
+ public void setRemoteHost2(String val) {
+ remoteHost2 = val;
+ }
public int getRemotePort() {
return remotePort;
}
+
+ public int getRemotePort2() {
+ return remotePort2;
+ }
public void setRemotePort(int val) {
remotePort = val;
}
+
+ public void setRemotePort2(int val) {
+ remotePort2 = val;
+ }
public IpChannelType getIpChannelType() {
return ipChannelType;
@@ -172,18 +216,34 @@
public int getDpc() {
return dpc;
}
+
+ public int getDpc2() {
+ return dpc2;
+ }
public void setDpc(int val) {
dpc = val;
}
+
+ public void setDpc2(int val) {
+ dpc2 = val;
+ }
public int getOpc() {
return opc;
}
+
+ public int getOpc2() {
+ return opc2;
+ }
public void setOpc(int val) {
opc = val;
}
+
+ public void setOpc2(int val) {
+ opc2 = val;
+ }
public int getSi() {
return si;
@@ -240,10 +300,14 @@
xml.setAttribute(STORE_PCAP_TRACE, m3ua.storePcapTrace);
xml.setAttribute(IS_SCTP_SERVER, m3ua.isSctpServer);
xml.setAttribute(LOCAL_PORT, m3ua.localPort);
+ xml.setAttribute(LOCAL_PORT_2, m3ua.localPort2);
xml.setAttribute(REMOTE_PORT, m3ua.remotePort);
+ xml.setAttribute(REMOTE_PORT_2, m3ua.remotePort2);
xml.setAttribute(IP_CHANNEL_TYPE,
m3ua.ipChannelType.toString());
xml.setAttribute(DPC, m3ua.dpc);
+ xml.setAttribute(DPC_2, m3ua.dpc2);
xml.setAttribute(OPC, m3ua.opc);
+ xml.setAttribute(OPC_2, m3ua.opc2);
xml.setAttribute(SI, m3ua.si);
xml.setAttribute(ROUTING_CONTEXT, m3ua.routingContext);
xml.setAttribute(NETWORK_APPEARANCE, m3ua.networkAppearance);
@@ -252,7 +316,9 @@
xml.setAttribute(M3UA_IPSPType, m3ua.m3uaIPSPType.toString());
xml.add(m3ua.localHost, LOCAL_HOST, String.class);
+ xml.add(m3ua.localHost2, LOCAL_HOST_2, String.class);
xml.add(m3ua.remoteHost, REMOTE_HOST, String.class);
+ xml.add(m3ua.remoteHost2, REMOTE_HOST_2, String.class);
if (m3ua.getSctpExtraHostAddresses() != null
&& !m3ua.getSctpExtraHostAddresses().equals("")) {
xml.add(m3ua.getSctpExtraHostAddresses(),
EXTRA_HOST_ADDRESSES, String.class);
}
@@ -264,12 +330,28 @@
m3ua.storePcapTrace = ca.toBoolean();
m3ua.isSctpServer =
xml.getAttribute(IS_SCTP_SERVER).toBoolean();
+
m3ua.localPort = xml.getAttribute(LOCAL_PORT).toInt();
+ ca = xml.getAttribute(LOCAL_PORT_2);
+ if (ca != null)
+ m3ua.localPort2 = ca.toInt();
m3ua.remotePort = xml.getAttribute(REMOTE_PORT).toInt();
+ ca = xml.getAttribute(REMOTE_PORT_2);
+ if (ca != null)
+ m3ua.remotePort2 = ca.toInt();
+
String str = xml.getAttribute(IP_CHANNEL_TYPE).toString();
m3ua.ipChannelType = IpChannelType.valueOf(str);
+
m3ua.dpc = xml.getAttribute(DPC).toInt();
+ ca = xml.getAttribute(DPC_2);
+ if (ca != null)
+ m3ua.dpc2 = ca.toInt();
m3ua.opc = xml.getAttribute(OPC).toInt();
+ ca = xml.getAttribute(OPC_2);
+ if (ca != null)
+ m3ua.opc2 = ca.toInt();
+
m3ua.si = xml.getAttribute(SI).toInt();
m3ua.routingContext =
xml.getAttribute(ROUTING_CONTEXT).toInt();
m3ua.networkAppearance =
xml.getAttribute(NETWORK_APPEARANCE).toInt();
@@ -281,7 +363,9 @@
m3ua.m3uaIPSPType = IPSPType.valueOf(str);
m3ua.localHost = (String) xml.get(LOCAL_HOST, String.class);
+ m3ua.localHost2 = (String) xml.get(LOCAL_HOST_2, String.class);
m3ua.remoteHost = (String) xml.get(REMOTE_HOST, String.class);
+ m3ua.remoteHost2 = (String) xml.get(REMOTE_HOST_2,
String.class);
m3ua.setSctpExtraHostAddresses((String)
xml.get(EXTRA_HOST_ADDRESSES, String.class));
}
};
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaMan.java
Wed Aug 14 19:25:13 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaMan.java
Wed Sep 4 06:25:52 2013 UTC
@@ -61,12 +61,18 @@
private ParameterFactoryImpl factory = new ParameterFactoryImpl();
private M3UAManagementProxyImpl m3uaMgmt;
private boolean isSctpConnectionUp = false;
+ private boolean isSctpConnectionUp2 = false;
private boolean isM3uaConnectionActive = false;
+ private boolean isM3uaConnectionActive2 = false;
private Association assoc;
+ private Association assoc2;
private As localAs;
+ private As localAs2;
private AspFactory localAspFactory;
+ private AspFactory localAspFactory2;
private Asp localAsp;
+ private Asp localAsp2;
public M3uaMan() {
this.name = "???";
@@ -90,6 +96,17 @@
this.testerHost.getConfigurationData().getM3uaConfigurationData().setLocalHost(val);
this.testerHost.markStore();
}
+
+ @Override
+ public String getSctpLocalHost2() {
+ return
this.testerHost.getConfigurationData().getM3uaConfigurationData().getLocalHost2();
+ }
+
+ @Override
+ public void setSctpLocalHost2(String val) {
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().setLocalHost2(val);
+ this.testerHost.markStore();
+ }
@Override
public int getSctpLocalPort() {
@@ -101,6 +118,17 @@
this.testerHost.getConfigurationData().getM3uaConfigurationData().setLocalPort(val);
this.testerHost.markStore();
}
+
+ @Override
+ public int getSctpLocalPort2() {
+ return
this.testerHost.getConfigurationData().getM3uaConfigurationData().getLocalPort2();
+ }
+
+ @Override
+ public void setSctpLocalPort2(int val) {
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().setLocalPort2(val);
+ this.testerHost.markStore();
+ }
@Override
public String getSctpRemoteHost() {
@@ -112,6 +140,17 @@
this.testerHost.getConfigurationData().getM3uaConfigurationData().setRemoteHost(val);
this.testerHost.markStore();
}
+
+ @Override
+ public String getSctpRemoteHost2() {
+ return
this.testerHost.getConfigurationData().getM3uaConfigurationData().getRemoteHost2();
+ }
+
+ @Override
+ public void setSctpRemoteHost2(String val) {
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().setRemoteHost2(val);
+ this.testerHost.markStore();
+ }
@Override
public int getSctpRemotePort() {
@@ -123,6 +162,17 @@
this.testerHost.getConfigurationData().getM3uaConfigurationData().setRemotePort(val);
this.testerHost.markStore();
}
+
+ @Override
+ public int getSctpRemotePort2() {
+ return
this.testerHost.getConfigurationData().getM3uaConfigurationData().getRemotePort2();
+ }
+
+ @Override
+ public void setSctpRemotePort2(int val) {
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().setRemotePort2(val);
+ this.testerHost.markStore();
+ }
@Override
public String getSctpExtraHostAddresses() {
@@ -266,6 +316,17 @@
this.testerHost.getConfigurationData().getM3uaConfigurationData().setDpc(val);
this.testerHost.markStore();
}
+
+ @Override
+ public int getM3uaDpc2() {
+ return
this.testerHost.getConfigurationData().getM3uaConfigurationData().getDpc2();
+ }
+
+ @Override
+ public void setM3uaDpc2(int val) {
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().setDpc2(val);
+ this.testerHost.markStore();
+ }
@Override
public int getM3uaOpc() {
@@ -277,6 +338,17 @@
this.testerHost.getConfigurationData().getM3uaConfigurationData().setOpc(val);
this.testerHost.markStore();
}
+
+ @Override
+ public int getM3uaOpc2() {
+ return
this.testerHost.getConfigurationData().getM3uaConfigurationData().getOpc2();
+ }
+
+ @Override
+ public void setM3uaOpc2(int val) {
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().setOpc2(val);
+ this.testerHost.markStore();
+ }
@Override
public int getM3uaSi() {
@@ -316,6 +388,8 @@
StringBuilder sb = new StringBuilder();
sb.append("SCTP: ");
sb.append(this.isSctpConnectionUp ? "Connected" : "Disconnected");
+ if (this.assoc2 != null)
+
sb.append(this.isSctpConnectionUp2 ? "/Connected" : "/Disconnected");
sb.append(" M3UA:");
this.m3uaMgmt.getAppServers();
@@ -392,13 +466,18 @@
public boolean start() {
try {
this.isSctpConnectionUp = false;
+ this.isSctpConnectionUp2 = false;
this.isM3uaConnectionActive = false;
+ this.isM3uaConnectionActive2 = false;
this.initM3ua(this.testerHost.getConfigurationData().getM3uaConfigurationData().getStorePcapTrace(),
this.testerHost.getConfigurationData()
.getM3uaConfigurationData().getIsSctpServer(),
this.testerHost.getConfigurationData().getM3uaConfigurationData().getLocalHost(),
this.testerHost.getConfigurationData().getM3uaConfigurationData().getLocalPort(),
this.testerHost.getConfigurationData()
.getM3uaConfigurationData().getRemoteHost(),
this.testerHost.getConfigurationData().getM3uaConfigurationData().getRemotePort(),
-
this.testerHost.getConfigurationData().getM3uaConfigurationData().getIpChannelType(),
this.testerHost.getConfigurationData()
- .getM3uaConfigurationData().getSctpExtraHostAddressesArray(),
this.testerHost.getPersistDir());
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().getLocalHost2(),
this.testerHost.getConfigurationData()
+ .getM3uaConfigurationData().getLocalPort2(),
this.testerHost.getConfigurationData().getM3uaConfigurationData().getRemoteHost2(),
+
this.testerHost.getConfigurationData().getM3uaConfigurationData().getRemotePort2(),
this.testerHost.getConfigurationData()
+ .getM3uaConfigurationData().getIpChannelType(),
this.testerHost.getConfigurationData().getM3uaConfigurationData()
+ .getSctpExtraHostAddressesArray(),
this.testerHost.getPersistDir());
this.testerHost.sendNotif(SOURCE_NAME, "M3UA has been
started", "", Level.INFO);
return true;
} catch (Throwable e) {
@@ -426,6 +505,14 @@
Level.INFO);
}
}
+ if (this.assoc2 != null) {
+ boolean conn = this.assoc2.isConnected();
+ if (this.isSctpConnectionUp2 != conn) {
+ this.isSctpConnectionUp2 = conn;
+ this.testerHost.sendNotif(SOURCE_NAME, "Sctp2 connection
is " + (conn ? "up" : "down"), this.assoc2.getName(),
+ Level.INFO);
+ }
+ }
if (this.m3uaMgmt != null) {
boolean active = false;
List<As> lstAs = this.m3uaMgmt.getAppServers();
@@ -446,11 +533,16 @@
this.testerHost.sendNotif(SOURCE_NAME, "M3ua connection
is " + (active ? "active" : "not active"),
this.assoc.getName(), Level.INFO);
}
+ if (this.isM3uaConnectionActive2 != active) {
+ this.isM3uaConnectionActive2 = active;
+ this.testerHost.sendNotif(SOURCE_NAME, "M3ua connection2
is " + (active ? "active" : "not active"),
+ this.assoc2.getName(), Level.INFO);
+ }
}
}
- private void initM3ua(boolean storePcapTrace, boolean isSctpServer,
String localHost, int localPort, String remoteHost,
- int remotePort, IpChannelType ipChannelType, String[]
extraHostAddresses, String persistDir) throws Exception {
+ private void initM3ua(boolean storePcapTrace, boolean isSctpServer,
String localHost, int localPort, String remoteHost, int remotePort, String
localHost2,
+ int localPort2, String remoteHost2, int remotePort2,
IpChannelType ipChannelType, String[] extraHostAddresses, String
persistDir) throws Exception {
this.stopM3ua();
@@ -475,17 +567,26 @@
// starting pcap trace storing if it is configured
if (storePcapTrace) {
- this.m3uaMgmt.startPcapTrace("MsgLog_" + name + ".pcap");
+ String s1 = "";
+ if (persistDir != null)
+ s1 = persistDir + "/";
+ this.m3uaMgmt.startPcapTrace(s1 + "MsgLog_" + name + ".pcap");
}
// configure SCTP stack
String SERVER_NAME = "Server_" + name;
+ String SERVER_NAME_2 = "Server_" + name + "_2";
String SERVER_ASSOCIATION_NAME = "ServerAss_" + name;
+ String SERVER_ASSOCIATION_NAME_2 = "ServerAss_" + name + "_2";
String ASSOCIATION_NAME = "Ass_" + name;
+ String ASSOCIATION_NAME_2 = "Ass_" + name + "_2";
String assName;
+ String assName2 = null;
if (isSctpServer) {
+ // String localHost2, int localPort2, String remoteHost2, int
remotePort2
+
// 1. Create SCTP Server
sctpManagement.addServer(SERVER_NAME, localHost, localPort,
ipChannelType, extraHostAddresses);
@@ -496,6 +597,21 @@
// 3. Start Server
sctpManagement.startServer(SERVER_NAME);
+
+ if (localHost2 != null && !localHost2.equals("") &&
remoteHost2 != null && !remoteHost2.equals("")) {
+ // a second link is defined
+
+ // 1. Create SCTP Server
+ sctpManagement.addServer(SERVER_NAME_2, localHost2,
localPort2, ipChannelType, null);
+
+ // 2. Create SCTP Server Association
+ sctpManagement.addServerAssociation(remoteHost2,
remotePort2, SERVER_NAME_2, SERVER_ASSOCIATION_NAME_2, ipChannelType);
+ this.assoc2 =
sctpManagement.getAssociation(SERVER_ASSOCIATION_NAME_2);
+ assName2 = SERVER_ASSOCIATION_NAME_2;
+
+ // 3. Start Server
+ sctpManagement.startServer(SERVER_NAME_2);
+ }
} else {
// 1. Create SCTP Association
@@ -503,6 +619,15 @@
extraHostAddresses);
this.assoc = sctpManagement.getAssociation(ASSOCIATION_NAME);
assName = ASSOCIATION_NAME;
+
+ if (localHost2 != null && !localHost2.equals("") &&
remoteHost2 != null && !remoteHost2.equals("")) {
+ // a second link is defined
+
+ // 1. Create SCTP Association
+ sctpManagement.addAssociation(localHost2, localPort2,
remoteHost2, remotePort2, ASSOCIATION_NAME_2, ipChannelType, null);
+ this.assoc2 =
sctpManagement.getAssociation(ASSOCIATION_NAME_2);
+ assName2 = ASSOCIATION_NAME_2;
+ }
}
// configure M3UA stack
@@ -510,8 +635,9 @@
RoutingContext rc = factory.createRoutingContext(new long[] {
this.testerHost.getConfigurationData()
.getM3uaConfigurationData().getRoutingContext() });
TrafficModeType trafficModeType =
factory.createTrafficModeType(TrafficModeType.Loadshare);
- NetworkAppearance na =
factory.createNetworkAppearance(this.testerHost.getConfigurationData()
- .getM3uaConfigurationData().getNetworkAppearance());
+ NetworkAppearance na = null;
+ if
(this.testerHost.getConfigurationData().getM3uaConfigurationData().getNetworkAppearance() !=
0)
+ na =
factory.createNetworkAppearance(this.testerHost.getConfigurationData().getM3uaConfigurationData().getNetworkAppearance());
localAs = m3uaMgmt.createAs("testas",
this.testerHost.getConfigurationData().getM3uaConfigurationData()
.getM3uaFunctionality(),
this.testerHost.getConfigurationData().getM3uaConfigurationData()
.getM3uaExchangeType(),
this.testerHost.getConfigurationData().getM3uaConfigurationData().getM3uaIPSPType(),
@@ -529,13 +655,31 @@
.getConfigurationData().getM3uaConfigurationData().getOpc(),
this.testerHost.getConfigurationData()
.getM3uaConfigurationData().getSi(), "testas");
- // starting resources
- // 1. Start Association
- // sctpManagement.startAssociation(assName);
-
// 2. Start ASP
m3uaMgmt.startAsp("testasp");
+ if(assName2!=null){
+ // 1. Create AS
+ localAs2 = m3uaMgmt.createAs("testas2",
this.testerHost.getConfigurationData().getM3uaConfigurationData().getM3uaFunctionality(),
this.testerHost
+ .getConfigurationData().getM3uaConfigurationData().getM3uaExchangeType(),
this.testerHost.getConfigurationData().getM3uaConfigurationData()
+ .getM3uaIPSPType(), rc, trafficModeType, 1, na);
+
+ // 2. Create ASP
+ localAspFactory2 = m3uaMgmt.createAspFactory("testasp2",
assName2);
+
+ // 3. Assign ASP to AS
+ localAsp2 = m3uaMgmt.assignAspToAs("testas2", "testasp2");
+
+ // 4. Define Route
+ // Define Route
+
m3uaMgmt.addRoute(this.testerHost.getConfigurationData().getM3uaConfigurationData().getDpc2(),
this.testerHost
+ .getConfigurationData().getM3uaConfigurationData().getOpc2(),
this.testerHost.getConfigurationData()
+ .getM3uaConfigurationData().getSi(), "testas2");
+
+ // 2. Start ASP
+ m3uaMgmt.startAsp("testasp2");
+ }
+
}
private void stopM3ua() throws Exception {
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaManMBean.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaManMBean.java
Wed Sep 4 06:25:52 2013 UTC
@@ -37,18 +37,34 @@
void setSctpLocalHost(String val);
+ String getSctpLocalHost2();
+
+ void setSctpLocalHost2(String val);
+
int getSctpLocalPort();
void setSctpLocalPort(int val);
+ int getSctpLocalPort2();
+
+ void setSctpLocalPort2(int val);
+
String getSctpRemoteHost();
void setSctpRemoteHost(String val);
+ String getSctpRemoteHost2();
+
+ void setSctpRemoteHost2(String val);
+
int getSctpRemotePort();
void setSctpRemotePort(int val);
+ int getSctpRemotePort2();
+
+ void setSctpRemotePort2(int val);
+
String getSctpExtraHostAddresses();
void setSctpExtraHostAddresses(String val);
@@ -85,10 +101,18 @@
void setM3uaDpc(int val);
+ int getM3uaDpc2();
+
+ void setM3uaDpc2(int val);
+
int getM3uaOpc();
void setM3uaOpc(int val);
+ int getM3uaOpc2();
+
+ void setM3uaOpc2(int val);
+
int getM3uaSi();
void setM3uaSi(int val);
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaManStandardMBean.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level1/M3uaManStandardMBean.java
Wed Sep 4 06:25:52 2013 UTC
@@ -47,9 +47,13 @@
new MBeanAttributeInfo("StorePcapTrace",
boolean.class.getName(),
"Storing all transmitted/received data into
MsgLog_*.pcap file", true, true, true),
new MBeanAttributeInfo("SctpLocalHost",
String.class.getName(), "Local host IP address", true, true, false),
+ new MBeanAttributeInfo("SctpLocalHost2",
String.class.getName(), "Local host 2 IP address", true, true, false),
new MBeanAttributeInfo("SctpLocalPort",
int.class.getName(), "Local port number", true, true, false),
+ new MBeanAttributeInfo("SctpLocalPort2",
int.class.getName(), "Local port 2 number", true, true, false),
new MBeanAttributeInfo("SctpRemoteHost",
String.class.getName(), "Remote host IP address", true, true, false),
+ new MBeanAttributeInfo("SctpRemoteHost2",
String.class.getName(), "Remote host 2 IP address", true, true, false),
new MBeanAttributeInfo("SctpRemotePort",
int.class.getName(), "Remote port number", true, true, false),
+ new MBeanAttributeInfo("SctpRemotePort2",
int.class.getName(), "Remote port 2 number", true, true, false),
new MBeanAttributeInfo(
"SctpExtraHostAddresses",
String.class.getName(),
@@ -69,11 +73,12 @@
new MBeanAttributeInfo("M3uaIPSPType",
M3uaIPSPType.class.getName(), "M3ua IPSP type: CLIENT or SERVER", true,
true, false),
new MBeanAttributeInfo("M3uaIPSPType_Value",
String.class.getName(), "M3ua IPSP type", true, false, false),
- new MBeanAttributeInfo("M3uaExchangeType",
M3uaExchangeType.class.getName(), "M3ua exchange type: SE or DE",
- true, true, false),
- new MBeanAttributeInfo("M3uaExchangeType_Value",
String.class.getName(), "M3ua exchange type", true, false,
- false), new MBeanAttributeInfo("M3uaDpc",
int.class.getName(), "Dpc", true, true, false),
+ new MBeanAttributeInfo("M3uaExchangeType",
M3uaExchangeType.class.getName(), "M3ua exchange type: SE or DE", true,
true, false),
+ new MBeanAttributeInfo("M3uaExchangeType_Value",
String.class.getName(), "M3ua exchange type", true, false, false),
+ new MBeanAttributeInfo("M3uaDpc",
int.class.getName(), "Dpc", true, true, false),
+ new MBeanAttributeInfo("M3uaDpc2",
int.class.getName(), "Dpc2", true, true, false),
new MBeanAttributeInfo("M3uaOpc",
int.class.getName(), "Opc: may be -1", true, true, false),
+ new MBeanAttributeInfo("M3uaOpc2",
int.class.getName(), "Opc2", true, true, false),
new MBeanAttributeInfo("M3uaSi",
int.class.getName(), "Service indicator: may be -1", true, true, false),
new MBeanAttributeInfo("M3uaRoutingContext",
long.class.getName(), "Routing context", true, true, false),
new MBeanAttributeInfo("M3uaNetworkAppearance",
long.class.getName(), "Network appearance", true, true, false), };
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java
Wed Aug 14 19:25:13 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java
Wed Sep 4 06:25:52 2013 UTC
@@ -353,32 +353,12 @@
SccpAddress pattern = new
SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, 0,
this.createGlobalTitle("*"), 0);
String mask = "K";
- // ((RouterImpl)this.router).addRule(1, RuleType.Solitary,
null, null, pattern, mask, 1, -1, null);
((RouterImpl) this.router).addRule(1, RuleType.Solitary, null,
OriginationType.LocalOriginated, pattern, mask, 1,
-1, null);
- // int id, RuleType ruleType, LoadSharingAlgorithm algo,
OriginationType originationType, SccpAddress pattern,
- // String mask,
- // int pAddressId, int sAddressId, Integer
newCallingPartyAddressAddressId
-
- // pattern = new
SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, 0,
- // this.createGlobalTitle(callingPartyAddressDigits), 0);
pattern = new
SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, 0,
this.createGlobalTitle("*"), 0);
mask = "R";
((RouterImpl) this.router).addRule(2, RuleType.Solitary, null,
OriginationType.RemoteOriginated, pattern, mask, 2,
-1, null);
-
- // if (extraLocalAddressDigits != null
&& !extraLocalAddressDigits.equals("")) {
- // String[] ss = extraLocalAddressDigits.split(",");
- //
- // int ruleNum = 3;
- // for (String s : ss) {
- // s = s.trim();
- // pattern = new
SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, 0,
this.createGlobalTitle(s), 0);
- // mask = "R";
- // ((RouterImpl)this.router).addRule(ruleNum,
RuleType.Solitary, null, null, pattern, mask, 2, -1, null);
- // ruleNum++;
- // }
- // }
}
}
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/management/TesterHost.java
Wed Aug 14 19:25:13 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/management/TesterHost.java
Wed Sep 4 06:25:52 2013 UTC
@@ -289,7 +289,9 @@
this.doSendNotif(source, msg, userData);
- logger.log(logLevel, msg);
+ logger.log(Level.INFO, msg + "\n" + userData);
+// logger.log(logLevel, msg + "\n" + userData);
+
// if (showInConsole) {
// logger.warn(msg);
// } else {
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java
Thu Aug 22 12:26:45 2013 UTC
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java
Wed Sep 4 06:25:52 2013 UTC
@@ -473,6 +473,10 @@
curDialog.addSendRoutingInfoForSMRequest(msisdn, true,
serviceCentreAddress, null, this.testerHost.getConfigurationData()
.getTestSmsServerConfigurationData().isGprsSupportIndicator(),
null,
null, null);
+
+ // this cap helps us give SCCP error if any
+ // curDialog.setReturnMessageOnError(true);
+
curDialog.send();
String sriData = createSriData(curDialog.getLocalDialogId(),
destIsdnNumber, serviceCentreAddr);
@@ -1054,7 +1058,6 @@
null,
this.mapMan.createDestAddress(curDestIsdnNumber,
this.testerHost.getConfigurationData().getTestSmsServerConfigurationData()
.getHlrSsn()), null);
- curDestIsdnNumber = null;
ISDNAddressString msisdn =
mapProvider.getMAPParameterFactory().createISDNAddressString(
this.testerHost.getConfigurationData().getTestSmsServerConfigurationData().getAddressNature(),
@@ -1062,6 +1065,7 @@
AddressString serviceCentreAddress =
mapProvider.getMAPParameterFactory().createAddressString(
this.testerHost.getConfigurationData().getTestSmsServerConfigurationData().getAddressNature(),
this.testerHost.getConfigurationData().getTestSmsServerConfigurationData().getNumberingPlan(),
this.getServiceCenterAddress());
+ curDestIsdnNumber = null;
SMDeliveryOutcome sMDeliveryOutcome = null;
if (vers.getVersion() >= 2) {
=======================================
---
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/M3uaForm.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/M3uaForm.java
Wed Sep 4 06:25:52 2013 UTC
@@ -70,13 +70,19 @@
private JComboBox cbM3uaExchangeType;
private JComboBox cbM3uaIPSPType;
private JCheckBox cbStorePcapTrace;
+ private JTextField tbLocalHost2;
+ private JTextField tbRemoteHost2;
+ private JTextField tbLocalPort2;
+ private JTextField tbRemotePort2;
+ private JTextField tbM3uaDpc2;
+ private JTextField tbM3uaOpc2;
public M3uaForm(JFrame owner) {
super(owner, true);
setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
setResizable(false);
- setBounds(100, 100, 534, 586);
+ setBounds(100, 100, 662, 586);
setTitle("M3UA settings");
JPanel panel = new JPanel();
@@ -263,6 +269,36 @@
cbStorePcapTrace = new JCheckBox("Storing all transmitted/received
data into MsgLog_*.pcap file");
cbStorePcapTrace.setBounds(10, 444, 508, 25);
panel.add(cbStorePcapTrace);
+
+ tbLocalHost2 = new JTextField();
+ tbLocalHost2.setColumns(10);
+ tbLocalHost2.setBounds(431, 72, 212, 20);
+ panel.add(tbLocalHost2);
+
+ tbRemoteHost2 = new JTextField();
+ tbRemoteHost2.setColumns(10);
+ tbRemoteHost2.setBounds(431, 134, 212, 20);
+ panel.add(tbRemoteHost2);
+
+ tbLocalPort2 = new JTextField();
+ tbLocalPort2.setColumns(10);
+ tbLocalPort2.setBounds(431, 103, 129, 20);
+ panel.add(tbLocalPort2);
+
+ tbRemotePort2 = new JTextField();
+ tbRemotePort2.setColumns(10);
+ tbRemotePort2.setBounds(431, 165, 129, 20);
+ panel.add(tbRemotePort2);
+
+ tbM3uaDpc2 = new JTextField();
+ tbM3uaDpc2.setColumns(10);
+ tbM3uaDpc2.setBounds(431, 305, 129, 20);
+ panel.add(tbM3uaDpc2);
+
+ tbM3uaOpc2 = new JTextField();
+ tbM3uaOpc2.setColumns(10);
+ tbM3uaOpc2.setBounds(431, 333, 129, 20);
+ panel.add(tbM3uaOpc2);
}
public void setData(M3uaManMBean m3ua) {
@@ -290,6 +326,10 @@
tbLocalPort.setText(((Integer)
this.m3ua.getSctpLocalPort()).toString());
tbRemoteHost.setText(this.m3ua.getSctpRemoteHost());
tbRemotePort.setText(((Integer)
this.m3ua.getSctpRemotePort()).toString());
+ tbLocalHost2.setText(this.m3ua.getSctpLocalHost2());
+ tbLocalPort2.setText(((Integer)
this.m3ua.getSctpLocalPort2()).toString());
+ tbRemoteHost2.setText(this.m3ua.getSctpRemoteHost2());
+ tbRemotePort2.setText(((Integer)
this.m3ua.getSctpRemotePort2()).toString());
tbSctpExtraHostAddresses.setText(this.m3ua.getSctpExtraHostAddresses());
setEnumeratedBaseComboBox(cbM3uaFunctionality,
this.m3ua.getM3uaFunctionality());
@@ -297,6 +337,8 @@
setEnumeratedBaseComboBox(cbM3uaExchangeType,
this.m3ua.getM3uaExchangeType());
tbM3uaDpc.setText(((Integer) this.m3ua.getM3uaDpc()).toString());
tbM3uaOpc.setText(((Integer) this.m3ua.getM3uaOpc()).toString());
+ tbM3uaDpc2.setText(((Integer) this.m3ua.getM3uaDpc2()).toString());
+ tbM3uaOpc2.setText(((Integer) this.m3ua.getM3uaOpc2()).toString());
tbM3uaSi.setText(((Integer) this.m3ua.getM3uaSi()).toString());
tbM3uaRoutingContext.setText(((Long)
this.m3ua.getM3uaRoutingContext()).toString());
tbM3uaNetworkAppearance.setText(((Long)
this.m3ua.getM3uaNetworkAppearance()).toString());
@@ -316,6 +358,10 @@
tbLocalPort.setText("8011");
tbRemoteHost.setText("127.0.0.1");
tbRemotePort.setText("8012");
+ tbLocalHost2.setText("");
+ tbLocalPort2.setText("0");
+ tbRemoteHost2.setText("");
+ tbRemotePort2.setText("0");
tbSctpExtraHostAddresses.setText("");
setEnumeratedBaseComboBox(cbM3uaFunctionality, new
M3uaFunctionality(M3uaFunctionality.VAL_IPSP));
@@ -323,6 +369,8 @@
setEnumeratedBaseComboBox(cbM3uaExchangeType, new
M3uaExchangeType(M3uaExchangeType.VAL_SE));
tbM3uaDpc.setText("2");
tbM3uaOpc.setText("1");
+ tbM3uaDpc2.setText("0");
+ tbM3uaOpc2.setText("0");
tbM3uaSi.setText("3");
tbM3uaRoutingContext.setText("101");
tbM3uaNetworkAppearance.setText("102");
@@ -342,6 +390,10 @@
tbLocalPort.setText("8012");
tbRemoteHost.setText("127.0.0.1");
tbRemotePort.setText("8011");
+ tbLocalHost2.setText("");
+ tbLocalPort2.setText("0");
+ tbRemoteHost2.setText("");
+ tbRemotePort2.setText("0");
tbSctpExtraHostAddresses.setText("");
setEnumeratedBaseComboBox(cbM3uaFunctionality, new
M3uaFunctionality(M3uaFunctionality.VAL_IPSP));
@@ -349,6 +401,8 @@
setEnumeratedBaseComboBox(cbM3uaExchangeType, new
M3uaExchangeType(M3uaExchangeType.VAL_SE));
tbM3uaDpc.setText("1");
tbM3uaOpc.setText("2");
+ tbM3uaDpc2.setText("0");
+ tbM3uaOpc2.setText("0");
tbM3uaSi.setText("3");
tbM3uaRoutingContext.setText("101");
tbM3uaNetworkAppearance.setText("102");
@@ -360,8 +414,12 @@
int localPort = 0;
int remotePort = 0;
+ int localPort2 = 0;
+ int remotePort2 = 0;
int dpc = 0;
int opc = 0;
+ int dpc2 = 0;
+ int opc2 = 0;
int si = 0;
long routingContext = 0;
long networkAppearance = 0;
@@ -371,24 +429,48 @@
JOptionPane.showMessageDialog(this, "Exception when parsing
Local port value: " + e.toString());
return false;
}
+ try {
+ localPort2 = Integer.parseInt(tbLocalPort2.getText());
+ } catch (Exception e) {
+ JOptionPane.showMessageDialog(this, "Exception when parsing
Local port 2 value: " + e.toString());
+ return false;
+ }
try {
remotePort = Integer.parseInt(tbRemotePort.getText());
} catch (Exception e) {
JOptionPane.showMessageDialog(this, "Exception when parsing
Remote port value: " + e.toString());
return false;
}
+ try {
+ remotePort2 = Integer.parseInt(tbRemotePort2.getText());
+ } catch (Exception e) {
+ JOptionPane.showMessageDialog(this, "Exception when parsing
Remote port 2 value: " + e.toString());
+ return false;
+ }
try {
dpc = Integer.parseInt(tbM3uaDpc.getText());
} catch (Exception e) {
JOptionPane.showMessageDialog(this, "Exception when parsing
Dpc value: " + e.toString());
return false;
}
+ try {
+ dpc2 = Integer.parseInt(tbM3uaDpc2.getText());
+ } catch (Exception e) {
+ JOptionPane.showMessageDialog(this, "Exception when parsing
Dpc 2 value: " + e.toString());
+ return false;
+ }
try {
opc = Integer.parseInt(tbM3uaOpc.getText());
} catch (Exception e) {
JOptionPane.showMessageDialog(this, "Exception when parsing
Opc value: " + e.toString());
return false;
}
+ try {
+ opc2 = Integer.parseInt(tbM3uaOpc2.getText());
+ } catch (Exception e) {
+ JOptionPane.showMessageDialog(this, "Exception when parsing
Opc 2 value: " + e.toString());
+ return false;
+ }
try {
si = Integer.parseInt(tbM3uaSi.getText());
} catch (Exception e) {
@@ -419,6 +501,10 @@
this.m3ua.setSctpLocalPort(localPort);
this.m3ua.setSctpRemoteHost(tbRemoteHost.getText());
this.m3ua.setSctpRemotePort(remotePort);
+ this.m3ua.setSctpLocalHost2(tbLocalHost2.getText());
+ this.m3ua.setSctpLocalPort2(localPort2);
+ this.m3ua.setSctpRemoteHost2(tbRemoteHost2.getText());
+ this.m3ua.setSctpRemotePort2(remotePort2);
this.m3ua.setSctpExtraHostAddresses(tbSctpExtraHostAddresses.getText());
this.m3ua.setM3uaFunctionality((M3uaFunctionality)
cbM3uaFunctionality.getSelectedItem());
@@ -427,6 +513,8 @@
this.m3ua.setM3uaDpc(dpc);
this.m3ua.setM3uaOpc(opc);
+ this.m3ua.setM3uaDpc2(dpc2);
+ this.m3ua.setM3uaOpc2(opc2);
this.m3ua.setM3uaSi(si);
this.m3ua.setM3uaRoutingContext(routingContext);
this.m3ua.setM3uaNetworkAppearance(networkAppearance);
=======================================
---
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/TestingForm.java
Mon May 20 20:09:00 2013 UTC
+++
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/TestingForm.java
Wed Sep 4 06:25:52 2013 UTC
@@ -54,6 +54,7 @@
import javax.swing.event.TableModelEvent;
import javax.swing.table.DefaultTableModel;
+import org.mobicents.protocols.ss7.tools.simulator.management.TesterHost;
import
org.mobicents.protocols.ss7.tools.simulator.management.TesterHostMBean;
/**
@@ -341,6 +342,11 @@
public void refreshState() {
+ if (this.host instanceof TesterHost) {
+ TesterHost thost = (TesterHost)host;
+ thost.execute();
+ }
+
tbL1State.setText(this.host.getL1State());
tbL2State.setText(this.host.getL2State());
tbL3State.setText(this.host.getL3State());
=======================================
---
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/tests/sms/TestSmsServerParamForm.java
Thu Aug 22 12:26:45 2013 UTC
+++
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/tests/sms/TestSmsServerParamForm.java
Wed Sep 4 06:25:52 2013 UTC
@@ -230,7 +230,7 @@
cbSendSrsmdsIfError = new JCheckBox("Send reportSM-DeliveryStatus
if error");
cbSendSrsmdsIfError.setBounds(8, 367, 513, 25);
panel.add(cbSendSrsmdsIfError);
-
+
cbGprsSupportIndicator = new JCheckBox("Send GprsSupportIndicator
in SRI request");
cbGprsSupportIndicator.setBounds(8, 397, 513, 25);
panel.add(cbGprsSupportIndicator);
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.