Revision: 22769
Author: [email protected]
Date: Wed Jul 18 08:28:12 2012
Log: Added Blocked and Reset Event
http://code.google.com/p/mobicents/source/detail?r=22769
Added:
/trunk/servers/jain-slee/resources/isup/events/src/main/java/org/mobicents/slee/resources/ss7/isup/events/BlockedEvent.java
/trunk/servers/jain-slee/resources/isup/events/src/main/java/org/mobicents/slee/resources/ss7/isup/events/ResetEvent.java
Modified:
/trunk/servers/jain-slee/resources/isup/events/src/main/resources/META-INF/event-jar.xml
/trunk/servers/jain-slee/resources/isup/ra/src/main/java/org/mobicents/slee/resources/isup/ra/IsupResourceAdaptor.java
/trunk/servers/jain-slee/resources/isup/ratype/src/main/java/org/mobicents/slee/resources/ss7/isup/ratype/CircuitActivity.java
/trunk/servers/jain-slee/resources/isup/ratype/src/main/java/org/mobicents/slee/resources/ss7/isup/ratype/RAISUPProvider.java
/trunk/servers/jain-slee/resources/isup/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
=======================================
--- /dev/null
+++
/trunk/servers/jain-slee/resources/isup/events/src/main/java/org/mobicents/slee/resources/ss7/isup/events/BlockedEvent.java
Wed Jul 18 08:28:12 2012
@@ -0,0 +1,34 @@
+/**
+ *
+ */
+package org.mobicents.slee.resources.ss7.isup.events;
+
+import java.io.Serializable;
+
+/**
+ * @author Oifa Yulian
+ *
+ */
+public class BlockedEvent implements Serializable {
+
+ private int dpc;
+ private int cic;
+
+ public BlockedEvent(int CIC,int DPC) {
+ super();
+ this.cic = CIC;
+ this.dpc = DPC;
+ }
+ /**
+ * @return the dpc
+ */
+ public int getDPC() {
+ return dpc;
+ }
+ /**
+ * @return the cic
+ */
+ public int getCIC() {
+ return cic;
+ }
+}
=======================================
--- /dev/null
+++
/trunk/servers/jain-slee/resources/isup/events/src/main/java/org/mobicents/slee/resources/ss7/isup/events/ResetEvent.java
Wed Jul 18 08:28:12 2012
@@ -0,0 +1,34 @@
+/**
+ *
+ */
+package org.mobicents.slee.resources.ss7.isup.events;
+
+import java.io.Serializable;
+
+/**
+ * @author Oifa Yulian
+ *
+ */
+public class ResetEvent implements Serializable {
+
+ private int dpc;
+ private int cic;
+
+ public ResetEvent(int CIC,int DPC) {
+ super();
+ this.cic = CIC;
+ this.dpc = DPC;
+ }
+ /**
+ * @return the dpc
+ */
+ public int getDPC() {
+ return dpc;
+ }
+ /**
+ * @return the cic
+ */
+ public int getCIC() {
+ return cic;
+ }
+}
=======================================
---
/trunk/servers/jain-slee/resources/isup/events/src/main/resources/META-INF/event-jar.xml
Wed Jul 4 03:06:48 2012
+++
/trunk/servers/jain-slee/resources/isup/events/src/main/resources/META-INF/event-jar.xml
Wed Jul 18 08:28:12 2012
@@ -333,7 +333,7 @@
</event-definition>
- <!-- TERM EVENT -->
+ <!-- TIMEOUT EVENT -->
<event-definition>
<event-type-name>net.java.slee.resource.isup.TRANSACTION_TIMEOUT</event-type-name>
<event-type-vendor>net.java</event-type-vendor>
@@ -341,4 +341,19 @@
<event-class-name>org.mobicents.slee.resources.ss7.isup.events.TimeoutEvent</event-class-name>
</event-definition>
+ <!-- BLOCKED EVENT -->
+ <event-definition>
+
<event-type-name>net.java.slee.resource.isup.BLOCKED</event-type-name>
+ <event-type-vendor>net.java</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>org.mobicents.slee.resources.ss7.isup.events.BlockedEvent</event-class-name>
+ </event-definition>
+
+ <!-- RESET EVENT -->
+ <event-definition>
+
<event-type-name>net.java.slee.resource.isup.RESET</event-type-name>
+ <event-type-vendor>net.java</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+
<event-class-name>org.mobicents.slee.resources.ss7.isup.events.ResetEvent</event-class-name>
+ </event-definition>
</event-jar>
=======================================
---
/trunk/servers/jain-slee/resources/isup/ra/src/main/java/org/mobicents/slee/resources/isup/ra/IsupResourceAdaptor.java
Wed Jul 4 02:35:46 2012
+++
/trunk/servers/jain-slee/resources/isup/ra/src/main/java/org/mobicents/slee/resources/isup/ra/IsupResourceAdaptor.java
Wed Jul 18 08:28:12 2012
@@ -15,6 +15,9 @@
import java.util.Map;
import java.util.Properties;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.ConcurrentHashMap;
+
import javax.naming.InitialContext;
import javax.slee.Address;
import javax.slee.SLEEException;
@@ -60,6 +63,7 @@
import org.mobicents.protocols.ss7.isup.message.CircuitGroupResetMessage;
import
org.mobicents.protocols.ss7.isup.message.CircuitGroupUnblockingAckMessage;
import
org.mobicents.protocols.ss7.isup.message.CircuitGroupUnblockingMessage;
+import org.mobicents.protocols.ss7.isup.message.ConfusionMessage;
import org.mobicents.protocols.ss7.isup.message.ConnectMessage;
import
org.mobicents.protocols.ss7.isup.message.ContinuityCheckRequestMessage;
import org.mobicents.protocols.ss7.isup.message.ContinuityMessage;
@@ -89,10 +93,13 @@
import
org.mobicents.protocols.ss7.isup.message.User2UserInformationMessage;
import org.mobicents.protocols.ss7.isup.message.UserPartAvailableMessage;
import org.mobicents.protocols.ss7.isup.message.UserPartTestMessage;
+import org.mobicents.protocols.ss7.isup.message.parameter.CauseIndicators;
import org.mobicents.slee.resources.ss7.isup.events.TimeoutEvent;
+import org.mobicents.slee.resources.ss7.isup.events.BlockedEvent;
import org.mobicents.slee.resources.ss7.isup.ratype.RAISUPProvider;
import org.mobicents.slee.resources.ss7.isup.ratype.CircuitActivity;
+
/**
*
* @author kulikov
@@ -115,7 +122,7 @@
////////////
private static final int EVENT_FLAGS = getEventFlags();
private static final int ACTIVITY_FLAGS = getActivityFlags();
- private Map<ActivityHandle, CircuitActivity> activities = new
HashMap<ActivityHandle, CircuitActivity>();
+ private ConcurrentHashMap<ActivityHandle, CircuitActivity> activities
= new ConcurrentHashMap<ActivityHandle, CircuitActivity>();
/////////////////
// RA Provider //
@@ -191,7 +198,7 @@
} catch (Exception e) {
// TODO Auto-generated catch block
this.tracer.severe("Failed to activate ISUP RA ", e);
- }
+ }
}
public void raStopping() {
@@ -474,11 +481,27 @@
final FireableEventType eventType =
eventTypeCache.getEventType(eventLookupFacility, eventName);
//if there is no TX, lets create STX
- CircuitActivity ca = (CircuitActivity)getActivity(new
ISUPActivityHandle(CircuitActivity.generateTransactionKey(event.getMessage().getCircuitIdentificationCode().getCIC(),event.getDpc())));
+ long
tx=CircuitActivity.generateTransactionKey(event.getMessage().getCircuitIdentificationCode().getCIC(),event.getDpc());
+
+ CircuitActivity ca = (CircuitActivity)getActivity(new
ISUPActivityHandle(tx));
if(ca == null)
{
if (eventTypeFilter.filterInitialEvent(eventType)) {
- tracer.info("event " + eventName + " filtered");
+ tracer.info("event " + eventName + " filtered");
+
+ ConfusionMessage
cm=this.raProvider.getMessageFactory().createCNF(event.getMessage().getCircuitIdentificationCode().getCIC());
+ CauseIndicators
ci=this.raProvider.getParameterFactory().createCauseIndicators();
+
ci.setLocation(CauseIndicators._LOCATION_NETWORK_BEYOND_IP);
+
ci.setCauseValue(CauseIndicators._CV_INVALID_MESSAGE_UNSPECIFIED);
+ cm.setCauseIndicators(ci);
+
+ try
+ {
+ this.raProvider.sendMessage(cm,event.getDpc());
+ }
+ catch(Exception ex)
+ {}
+
return;
}
@@ -507,8 +530,23 @@
}
else
{
- if (eventTypeFilter.filterEvent(eventType)) {
- tracer.info("event " + eventName + " filtered");
+ //may be also initial event , for example for blocking
+ if (eventTypeFilter.filterEvent(eventType) &&
eventTypeFilter.filterInitialEvent(eventType)) {
+ tracer.info("event " + eventName + " filtered");
+
+ ConfusionMessage
cm=this.raProvider.getMessageFactory().createCNF(event.getMessage().getCircuitIdentificationCode().getCIC());
+ CauseIndicators
ci=this.raProvider.getParameterFactory().createCauseIndicators();
+
ci.setLocation(CauseIndicators._LOCATION_NETWORK_BEYOND_IP);
+
ci.setCauseValue(CauseIndicators._CV_INVALID_MESSAGE_UNSPECIFIED);
+ cm.setCauseIndicators(ci);
+
+ try
+ {
+ this.raProvider.sendMessage(cm,event.getDpc());
+ }
+ catch(Exception ex)
+ {}
+
return;
}
}
@@ -528,7 +566,7 @@
}
this.fireEvent(eventType, getActivity(handle), te);
}
- }
+ }
/* (non-Javadoc)
* @see org.mobicents.protocols.ss7.isup.ISUPListener#onTransportDown()
@@ -560,7 +598,7 @@
CircuitActivity activity = new
CircuitActivity(arg0,dpc,this);
handle = createActivityHandle(activity);
sleeEndpoint.startActivity(handle,
activity,ACTIVITY_FLAGS);
- activities.put(handle,activity);
+ activities.putIfAbsent(handle,activity);
return activity;
}
@@ -578,6 +616,36 @@
}
+ public void notifyBlockedChannel(int cic, int dpc)
+ {
+ ActivityHandle handle=new
ISUPActivityHandle(CircuitActivity.generateTransactionKey(cic,dpc));
+ if(activities.containsKey(handle))
+ {
+ BlockedEvent be = new BlockedEvent(cic,dpc);
+ final FireableEventType eventType =
eventTypeCache.getEventType(eventLookupFacility, "BLOCKED");
+ if (eventTypeFilter.filterEvent(eventType)) {
+ tracer.info("event BLOCKED filtered");
+ return;
+ }
+ fireEvent(eventType, getActivity(handle), be);
+ }
+ }
+
+ public void notifyResetChannel(int cic, int dpc)
+ {
+ ActivityHandle handle=new
ISUPActivityHandle(CircuitActivity.generateTransactionKey(cic,dpc));
+ if(activities.containsKey(handle))
+ {
+ BlockedEvent be = new BlockedEvent(cic,dpc);
+ final FireableEventType eventType =
eventTypeCache.getEventType(eventLookupFacility, "RESET");
+ if (eventTypeFilter.filterEvent(eventType)) {
+ tracer.info("event RESET filtered");
+ return;
+ }
+ fireEvent(eventType, getActivity(handle), be);
+ }
+ }
+
public void cancelTimer(int cic, int dpc, int timerId)
{
isupProvider.cancelTimer(cic,dpc,timerId);
=======================================
---
/trunk/servers/jain-slee/resources/isup/ratype/src/main/java/org/mobicents/slee/resources/ss7/isup/ratype/CircuitActivity.java
Wed Jul 4 01:56:49 2012
+++
/trunk/servers/jain-slee/resources/isup/ratype/src/main/java/org/mobicents/slee/resources/ss7/isup/ratype/CircuitActivity.java
Wed Jul 18 08:28:12 2012
@@ -56,14 +56,14 @@
public long getTransactionKey()
{
long currValue=dpc;
- currValue=currValue<<14 + cic;
+ currValue=(currValue<<14) + (long)cic;
return currValue;
}
public static long generateTransactionKey(int cic,int dpc)
{
long currValue=dpc;
- currValue=currValue<<14 + cic;
+ currValue=(currValue<<14) + (long)cic;
return currValue;
}
}
=======================================
---
/trunk/servers/jain-slee/resources/isup/ratype/src/main/java/org/mobicents/slee/resources/ss7/isup/ratype/RAISUPProvider.java
Wed Jul 4 01:56:49 2012
+++
/trunk/servers/jain-slee/resources/isup/ratype/src/main/java/org/mobicents/slee/resources/ss7/isup/ratype/RAISUPProvider.java
Wed Jul 18 08:28:12 2012
@@ -53,6 +53,18 @@
*/
public void cancelTimer(int cic, int dpc, int timerId);
+ /**
+ * Notify blocked channel
+ * @return
+ */
+ public void notifyBlockedChannel(int cic, int dpc);
+
+ /**
+ * Notify reset channel
+ * @return
+ */
+ public void notifyResetChannel(int cic, int dpc);
+
/**
* Ends circuit activity
* @return
=======================================
---
/trunk/servers/jain-slee/resources/isup/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Wed Jul 4 03:39:03 2012
+++
/trunk/servers/jain-slee/resources/isup/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Wed Jul 18 08:28:12 2012
@@ -263,7 +263,16 @@
<event-type-vendor>net.java</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
-
+ <event-type-ref>
+
<event-type-name>net.java.slee.resource.isup.BLOCKED</event-type-name>
+ <event-type-vendor>net.java</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+ <event-type-ref>
+
<event-type-name>net.java.slee.resource.isup.RESET</event-type-name>
+ <event-type-vendor>net.java</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
</resource-adaptor-type>
</resource-adaptor-type-jar>