2 new revisions:
Revision: a565510a8fad
Author: Sergey Vetyutnev <[email protected]>
Date: Sat Jan 12 10:35:13 2013
Log: Simulator : using a new SCCP Rule.OriginationType property for
Simulat...
http://code.google.com/p/jss7/source/detail?r=a565510a8fad
Revision: 850a112b9c8f
Author: Sergey Vetyutnev <[email protected]>
Date: Sat Jan 12 10:38:44 2013
Log: Merge remote-tracking branch 'origin/simulator1'
http://code.google.com/p/jss7/source/detail?r=850a112b9c8f
==============================================================================
Revision: a565510a8fad
Author: Sergey Vetyutnev <[email protected]>
Date: Sat Jan 12 10:35:13 2013
Log: Simulator : using a new SCCP Rule.OriginationType property for
Simulator
messageflow
http://code.google.com/p/jss7/source/detail?r=a565510a8fad
Modified:
/docs/sources/src/main/resources/en-US/Chapter-Simulator.xml
/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/level2/SccpManMBean.java
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpManStandardMBean.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/TestSmsClientMan.java
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/SccpForm.java
=======================================
--- /docs/sources/src/main/resources/en-US/Chapter-Simulator.xml Wed Aug 8
23:45:38 2012
+++ /docs/sources/src/main/resources/en-US/Chapter-Simulator.xml Sat Jan 12
10:35:13 2013
@@ -352,20 +352,14 @@
<para>
CallingPartyAddress digits
</para>
- </listitem>
- <listitem>
- <para>
- Extra local addresses (used for routing rules). We can define here
several addresses
- separated by comma. "?" and "*"
characters can also be used here.
- </para>
</listitem>
</itemizedlist>
</para>
<para>
- If "Route on GlobalTitle" mode is used, several rules for routing are
created when SCCP layer starting.
- Addresses that are equal CallingPartyAddress or Extra local addresses
are routed to the local
- SCCP user. All other addresses are routed to the Remote
SPC/Remote SSN.
+ If "Route on GlobalTitle" mode is used, two rules for routing are
created when SCCP layer starting.
+ All remore originated messages will be routed to a local user,
+ all local originated messages will be routed to a remote user (to a peer
with "Remote SPC" address).
</para>
<para>
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java
Mon Dec 10 03:30:26 2012
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java
Sat Jan 12 10:35:13 2013
@@ -32,7 +32,6 @@
import org.mobicents.protocols.ss7.indicator.NumberingPlan;
import org.mobicents.protocols.ss7.indicator.RoutingIndicator;
import org.mobicents.protocols.ss7.mtp.Mtp3UserPart;
-import org.mobicents.protocols.ss7.sccp.LoadSharingAlgorithm;
import org.mobicents.protocols.ss7.sccp.OriginationType;
import org.mobicents.protocols.ss7.sccp.RemoteSignalingPointCode;
import org.mobicents.protocols.ss7.sccp.RemoteSubSystem;
@@ -85,7 +84,7 @@
private NumberingPlan numberingPlan = NumberingPlan.ISDN_MOBILE;
private int translationType = 0;
private String callingPartyAddressDigits = "";
- private String extraLocalAddressDigits = "";
+// private String extraLocalAddressDigits = "";
private SccpStackImpl sccpStack;
private SccpProvider sccpProvider;
@@ -261,16 +260,16 @@
this.testerHost.markStore();
}
- @Override
- public String getExtraLocalAddressDigits() {
- return extraLocalAddressDigits;
- }
-
- @Override
- public void setExtraLocalAddressDigits(String val) {
- extraLocalAddressDigits = val;
- this.testerHost.markStore();
- }
+// @Override
+// public String getExtraLocalAddressDigits() {
+// return extraLocalAddressDigits;
+// }
+//
+// @Override
+// public void setExtraLocalAddressDigits(String val) {
+// extraLocalAddressDigits = val;
+// this.testerHost.markStore();
+// }
@Override
public void putGlobalTitleType(String val) {
@@ -308,8 +307,7 @@
try {
this.isRspcUp = true;
this.isRssUp = true;
- this.initSccp(this.mtp3UserPart, this.remoteSsn, this.localSsn,
this.remoteSpc, this.localSpc, this.ni, this.callingPartyAddressDigits,
- this.extraLocalAddressDigits);
+ this.initSccp(this.mtp3UserPart, this.remoteSsn, this.localSsn,
this.remoteSpc, this.localSpc, this.ni, this.callingPartyAddressDigits);
this.testerHost.sendNotif(SOURCE_NAME, "SCCP has been started", "",
Level.INFO);
return true;
} catch (Throwable e) {
@@ -351,8 +349,7 @@
}
}
- private void initSccp(Mtp3UserPart mtp3UserPart, int remoteSsn, int
localSsn, int dpc, int opc, int ni, String callingPartyAddressDigits,
- String extraLocalAddressDigits) throws Exception {
+ private void initSccp(Mtp3UserPart mtp3UserPart, int remoteSsn, int
localSsn, int dpc, int opc, int ni, String callingPartyAddressDigits)
throws Exception {
this.sccpStack = new SccpStackImpl("TestingSccp");
@@ -380,26 +377,28 @@
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, 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(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, null,
pattern, mask, 2, -1, null);
+ ((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++;
- }
- }
+// 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++;
+// }
+// }
}
}
@@ -468,7 +467,7 @@
xml.add(sccp.natureOfAddress.toString(),
ADDRESS_NATURE);
xml.add(sccp.numberingPlan.toString(), NUMBERING_PLAN);
xml.add(sccp.callingPartyAddressDigits,
CALLING_PARTY_ADDRESS_DIGITS);
- xml.add(sccp.extraLocalAddressDigits,
EXTRA_LOCAL_ADDRESS_DIGITS);
+// xml.add(sccp.extraLocalAddressDigits,
EXTRA_LOCAL_ADDRESS_DIGITS);
}
public void read(InputElement xml, SccpMan sccp) throws
XMLStreamException {
@@ -487,7 +486,8 @@
String np = (String) xml.get(NUMBERING_PLAN,
String.class);
sccp.numberingPlan = NumberingPlan.valueOf(np);
sccp.callingPartyAddressDigits = (String)
xml.get(CALLING_PARTY_ADDRESS_DIGITS, String.class);
- sccp.extraLocalAddressDigits = (String)
xml.get(EXTRA_LOCAL_ADDRESS_DIGITS, String.class);
+ // for skipping previous data
+ String extraLocalAddressDigits = (String)
xml.get(EXTRA_LOCAL_ADDRESS_DIGITS, String.class);
}
};
}
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpManMBean.java
Wed Jun 6 06:02:46 2012
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpManMBean.java
Sat Jan 12 10:35:13 2013
@@ -80,9 +80,9 @@
public void setCallingPartyAddressDigits(String val);
- public String getExtraLocalAddressDigits();
-
- public void setExtraLocalAddressDigits(String val);
+// public String getExtraLocalAddressDigits();
+//
+// public void setExtraLocalAddressDigits(String val);
public void putGlobalTitleType(String val);
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpManStandardMBean.java
Wed Jun 6 06:02:46 2012
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpManStandardMBean.java
Sat Jan 12 10:35:13 2013
@@ -63,9 +63,9 @@
new MBeanAttributeInfo("CallingPartyAddressDigits",
String.class.getName(),
"CallingPartyAddress digits for
RouteOnGt mode",
true, true, false),
- new MBeanAttributeInfo("ExtraLocalAddressDigits",
String.class.getName(),
- "Extra local addresses, for example:
\"7222111111,7222199??\"",
- true, true, false),
+// new MBeanAttributeInfo("ExtraLocalAddressDigits",
String.class.getName(),
+// "Extra local addresses, for example:
\"7222111111,7222199??\"",
+// true, true, false),
};
MBeanParameterInfo[] signString = new MBeanParameterInfo[] { new
MBeanParameterInfo("val", String.class.getName(), "Index number or value")
};
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/management/TesterHost.java
Thu Aug 2 06:16:13 2012
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/management/TesterHost.java
Sat Jan 12 10:35:13 2013
@@ -705,7 +705,7 @@
this.sccp.setNumberingPlan(_sccp.getNumberingPlan());
this.sccp.setTranslationType(_sccp.getTranslationType());
this.sccp.setCallingPartyAddressDigits(_sccp.getCallingPartyAddressDigits());
-
this.sccp.setExtraLocalAddressDigits(_sccp.getExtraLocalAddressDigits());
+//
this.sccp.setExtraLocalAddressDigits(_sccp.getExtraLocalAddressDigits());
MapMan _tcap = reader.read(MAP, MapMan.class);
this.map.setLocalSsn(_tcap.getLocalSsn());
=======================================
---
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsClientMan.java
Mon Dec 10 03:30:26 2012
+++
/tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsClientMan.java
Sat Jan 12 10:35:13 2013
@@ -630,7 +630,7 @@
this.onMtRequest(da, oa, si, curDialog);
try {
- curDialog.addForwardShortMessageResponse(invokeId);
+ curDialog.addMtForwardShortMessageResponse(invokeId,
null, null);
this.needSendClose = true;
this.countMtFsmResp++;
=======================================
---
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/SccpForm.java
Wed Jun 6 06:02:46 2012
+++
/tools/simulator/gui/src/main/java/org/mobicents/protocols/ss7/tools/simulatorgui/SccpForm.java
Sat Jan 12 10:35:13 2013
@@ -73,7 +73,6 @@
private JRadioButton rbRouteGt;
private final ButtonGroup buttonGroup = new ButtonGroup();
private JPanel panel_1;
- private JTextField tbExtraLocalAddressDigits;
public SccpForm(JFrame owner) {
super(owner, true);
@@ -81,7 +80,7 @@
setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
setResizable(false);
setTitle("SCCP settings");
- setBounds(100, 100, 590, 692);
+ setBounds(100, 100, 590, 651);
JPanel panel = new JPanel();
getContentPane().add(panel, BorderLayout.CENTER);
@@ -129,7 +128,7 @@
loadDataA();
}
});
- button.setBounds(10, 596, 245, 23);
+ button.setBounds(10, 555, 245, 23);
panel.add(button);
JButton button_1 = new JButton("Load default values for side
B");
@@ -138,7 +137,7 @@
loadDataB();
}
});
- button_1.setBounds(265, 596, 234, 23);
+ button_1.setBounds(265, 555, 234, 23);
panel.add(button_1);
JButton button_2 = new JButton("Reload");
@@ -147,7 +146,7 @@
reloadData();
}
});
- button_2.setBounds(10, 630, 144, 23);
+ button_2.setBounds(10, 589, 144, 23);
panel.add(button_2);
JButton button_3 = new JButton("Save");
@@ -158,7 +157,7 @@
}
}
});
- button_3.setBounds(255, 630, 117, 23);
+ button_3.setBounds(255, 589, 117, 23);
panel.add(button_3);
JButton button_4 = new JButton("Cancel");
@@ -167,7 +166,7 @@
getJFrame().dispose();
}
});
- button_4.setBounds(382, 630, 117, 23);
+ button_4.setBounds(382, 589, 117, 23);
panel.add(button_4);
tbLocalSsn = new JTextField();
@@ -182,7 +181,7 @@
panel_1 = new JPanel();
panel_1.setBorder(new LineBorder(new Color(0, 0, 0)));
panel_1.setLayout(null);
- panel_1.setBounds(10, 366, 564, 219);
+ panel_1.setBounds(10, 366, 564, 178);
panel.add(panel_1);
JLabel lblParametersForCreating = new JLabel("Parameters for creating
SccpAddress (when routing on GT)");
@@ -231,19 +230,6 @@
tbCallingPartyAddressDigits.setBounds(219, 147, 231, 20);
panel_1.add(tbCallingPartyAddressDigits);
- tbExtraLocalAddressDigits = new JTextField();
- tbExtraLocalAddressDigits.setColumns(10);
- tbExtraLocalAddressDigits.setBounds(219, 177, 335, 20);
- panel_1.add(tbExtraLocalAddressDigits);
-
- JLabel lblExtraLocalAddresses = new JLabel("Extra local
addresses");
- lblExtraLocalAddresses.setBounds(10, 180, 199, 14);
- panel_1.add(lblExtraLocalAddresses);
-
- JLabel lblSeveralAddressesCan = new JLabel("Several addresses can be
inserted here for example: \"7222111111,7222199??\"");
- lblSeveralAddressesCan.setBounds(10, 198, 544, 14);
- panel_1.add(lblSeveralAddressesCan);
-
rbRouteDpcSsn = new JRadioButton("Route on DPC and SSN mode");
buttonGroup.add(rbRouteDpcSsn);
rbRouteDpcSsn.setBounds(6, 164, 332, 23);
@@ -301,7 +287,7 @@
tbTranslationType.setText(((Integer)
this.sccp.getTranslationType()).toString());
tbCallingPartyAddressDigits.setText(this.sccp.getCallingPartyAddressDigits());
-
tbExtraLocalAddressDigits.setText(this.sccp.getExtraLocalAddressDigits());
+//
tbExtraLocalAddressDigits.setText(this.sccp.getExtraLocalAddressDigits());
}
private void loadDataA() {
@@ -320,7 +306,7 @@
tbTranslationType.setText("0");
tbCallingPartyAddressDigits.setText("");
- tbExtraLocalAddressDigits.setText("");
+// tbExtraLocalAddressDigits.setText("");
}
private void loadDataB() {
@@ -339,7 +325,7 @@
tbTranslationType.setText("0");
tbCallingPartyAddressDigits.setText("");
- tbExtraLocalAddressDigits.setText("");
+// tbExtraLocalAddressDigits.setText("");
}
private boolean saveData() {
@@ -400,7 +386,7 @@
this.sccp.setNumberingPlan((NumberingPlanType)
cbNumberingPlan.getSelectedItem());
this.sccp.setCallingPartyAddressDigits(tbCallingPartyAddressDigits.getText());
-
this.sccp.setExtraLocalAddressDigits(tbExtraLocalAddressDigits.getText());
+//
this.sccp.setExtraLocalAddressDigits(tbExtraLocalAddressDigits.getText());
return true;
}
@@ -411,7 +397,7 @@
this.cbNumberingPlan.setEnabled(val);
this.tbTranslationType.setEnabled(val);
this.tbCallingPartyAddressDigits.setEnabled(val);
- this.tbExtraLocalAddressDigits.setEnabled(val);
+// this.tbExtraLocalAddressDigits.setEnabled(val);
}
}
==============================================================================
Revision: 850a112b9c8f
Author: Sergey Vetyutnev <[email protected]>
Date: Sat Jan 12 10:38:44 2013
Log: Merge remote-tracking branch 'origin/simulator1'
http://code.google.com/p/jss7/source/detail?r=850a112b9c8f
