master moved from 857f759a0d90 to d8d5fd5f4ed8
3 new revisions:
Revision: 14b22bb77fc7
Author: Sergey Vetyutnev <[email protected]>
Date: Tue Oct 22 15:58:58 2013 UTC
Log: Adding INAP ConnectRequest operation interfaces
http://code.google.com/p/jss7/source/detail?r=14b22bb77fc7
Revision: aba299ee8610
Author: Sergey Vetyutnev <[email protected]>
Date: Tue Oct 22 16:33:13 2013 UTC
Log: Adding Serializable interface into TCAP and TCAP-ANSI
http://code.google.com/p/jss7/source/detail?r=aba299ee8610
Revision: d8d5fd5f4ed8
Author: Sergey Vetyutnev <[email protected]>
Date: Sat Oct 26 19:36:10 2013 UTC
Log: Merge remote-tracking branch 'origin/cap50'
http://code.google.com/p/jss7/source/detail?r=d8d5fd5f4ed8
==============================================================================
Revision: 14b22bb77fc7
Author: Sergey Vetyutnev <[email protected]>
Date: Tue Oct 22 15:58:58 2013 UTC
Log: Adding INAP ConnectRequest operation interfaces
http://code.google.com/p/jss7/source/detail?r=14b22bb77fc7
Added:
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/isup/BackwardGVNSInap.java
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/isup/OriginalCalledPartyIDInap.java
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/ConnectRequest.java
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/DestinationRoutingAddress.java
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/DisplayInformation.java
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/RouteList.java
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/ScfID.java
Deleted:
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/isup/OriginalCalledNumberInap.java
Modified:
/inap/INAPMessagesImplemented.ods
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/InitialDPRequest.java
=======================================
--- /dev/null
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/isup/BackwardGVNSInap.java
Tue Oct 22 15:58:58 2013 UTC
@@ -0,0 +1,48 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.mobicents.protocols.ss7.inap.api.isup;
+
+import java.io.Serializable;
+
+import org.mobicents.protocols.ss7.isup.message.parameter.BackwardGVNS;
+
+/**
+*
+
+BackwardGVNS {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
+bound.&minBackwardGVNSLength..bound.&maxBackwardGVNSLength))
+-- Indicats the GVNS Backward information. Refer to Q.735, §6 for encoding.
+
+*
+* @author sergey vetyutnev
+*
+*/
+public interface BackwardGVNSInap extends Serializable {
+
+ byte[] getData();
+
+ BackwardGVNS getBackwardGVNS();
+
+ // TODO: Spec refers to "Q.735, §6", we refer to ISUP, what is
correct ?
+
+}
=======================================
--- /dev/null
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/isup/OriginalCalledPartyIDInap.java
Tue Oct 22 15:58:58 2013 UTC
@@ -0,0 +1,49 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.mobicents.protocols.ss7.inap.api.isup;
+
+import java.io.Serializable;
+
+import org.mobicents.protocols.ss7.inap.api.INAPException;
+import
org.mobicents.protocols.ss7.isup.message.parameter.OriginalCalledNumber;
+
+/**
+*
+OriginalCalledPartyID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
+bound.&minOriginalCalledPartyIDLength..bound.&maxOriginalCalledPartyIDLength))
+-- Indicates the original called number.
+-- Refer to the ITU-T Recommendation Q.763 Original Called Number for
encoding.
+
+minOriginalCalledPartyIDLength=1
+maxOriginalCalledPartyIDLength=5
+*
+* @author sergey vetyutnev
+*
+*/
+public interface OriginalCalledPartyIDInap extends Serializable {
+
+ byte[] getData();
+
+ OriginalCalledNumber getOriginalCalledNumber() throws INAPException;
+
+}
=======================================
--- /dev/null
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/ConnectRequest.java
Tue Oct 22 15:58:58 2013 UTC
@@ -0,0 +1,204 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall;
+
+import org.mobicents.protocols.ss7.inap.api.isup.BackwardGVNSInap;
+import org.mobicents.protocols.ss7.inap.api.isup.CallingPartyNumberInap;
+import org.mobicents.protocols.ss7.inap.api.isup.CallingPartysCategoryInap;
+import org.mobicents.protocols.ss7.inap.api.isup.Digits;
+import org.mobicents.protocols.ss7.inap.api.isup.ForwardCallIndicatorsInap;
+import org.mobicents.protocols.ss7.inap.api.isup.ForwardGVNSInap;
+import
org.mobicents.protocols.ss7.inap.api.isup.ISDNAccessRelatedInformationInap;
+import org.mobicents.protocols.ss7.inap.api.isup.LocationNumberInap;
+import org.mobicents.protocols.ss7.inap.api.isup.OriginalCalledPartyIDInap;
+import org.mobicents.protocols.ss7.inap.api.isup.RedirectingPartyIDInap;
+import
org.mobicents.protocols.ss7.inap.api.isup.RedirectionInformationInap;
+import org.mobicents.protocols.ss7.inap.api.primitives.BearerCapability;
+import org.mobicents.protocols.ss7.inap.api.primitives.INAPExtensions;
+import org.mobicents.protocols.ss7.inap.api.primitives.LegID;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.Carrier;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.DestinationRoutingAddress;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.DisplayInformation;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.Entry;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.GenericNumbers;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.RouteList;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.ScfID;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.ServiceInteractionIndicators;
+import
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive.ServiceInteractionIndicatorsTwo;
+import org.mobicents.protocols.ss7.map.api.primitives.AlertingPattern;
+
+/**
+*
+
+*** CS1: ***
+Connect ::= OPERATION
+ ARGUMENT ConnectArg
+ ERRORS { MissingParameter, SystemFailure, TaskRefused,
UnexpectedComponentSequence, UnexpectedDataValue, UnexpectedParameter}
+
+ConnectArg ::= SEQUENCE {
+ destinationRoutingAddress [0] DestinationRoutingAddress,
+ alertingPattern [1] AlertingPattern OPTIONAL,
+ correlationID [2] CorrelationID OPTIONAL,
+ cutAndPaste [3] CutAndPaste OPTIONAL,
+ originalCalledPartyID [6] OriginalCalledPartyID OPTIONAL,
+ routeList [7] RouteList OPTIONAL,
+ scfID [8] ScfID OPTIONAL,
+ extensions [10] SEQUENCE SIZE(1..numOfExtensions)
OF ExtensionField OPTIONAL,
+ serviceInteractionIndicators [26] ServiceInteractionIndicators
OPTIONAL,
+ callingPartyNumber [27] CallingPartyNumber OPTIONAL,
+ callingPartysCategory [28] CallingPartysCategory OPTIONAL,
+ redirectingPartyID [29] RedirectingPartyID OPTIONAL,
+ redirectionInformation [30] RedirectionInformation OPTIONAL
+ ...
+}
+-- For alerting pattern, OPTIONAL denotes that this parameter only applies
if SSF is the
+-- terminating local exchange for the subscriber.
+
+*** CS2: ***
+connect {PARAMETERS-BOUND : bound} OPERATION ::= {
+ ARGUMENT ConnectArg {bound}
+ RETURN RESULT FALSE
+ ERRORS {
+ missingParameter | parameterOutOfRange | systemFailure |
taskRefused | unexpectedComponentSequence | unexpectedDataValue |
unexpectedParameter
+ }
+ CODE opcode-connect
+}
+-- Direction: SCF -> SSF, Timer: Tcon
+-- This operation is used to request the SSF to perform the call
processing actions to route or
+-- forward a call to a specified destination. To do so, the SSF may or may
not use destination
+-- information from the calling party (e.g. dialed digits) and existing
call setup information
+-- (e.g. route index to a list of trunk groups), depending on the
information provided by the SCF.
+-- - When address information is only included in the Connect operation,
call processing resumes at
+-- the Analyzed_Information PIC in the O-BCSM.
+-- - When address information and routing information is included, call
processing resumes at the
+-- Select_Route PIC.
+
+ConnectArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
+ destinationRoutingAddress [0] DestinationRoutingAddress {bound},
+ alertingPattern [1] AlertingPattern OPTIONAL,
+ correlationID [2] CorrelationID {bound} OPTIONAL,
+ cutAndPaste [3] CutAndPaste OPTIONAL,
+ iSDNAccessRelatedInformation [5]
ISDNAccessRelatedInformation{bound} OPTIONAL,
+ originalCalledPartyID [6] OriginalCalledPartyID {bound}
OPTIONAL,
+ routeList [7] RouteList {bound} OPTIONAL,
+ scfID [8] ScfID {bound} OPTIONAL,
+ extensions [10] SEQUENCE
SIZE(1..bound.&numOfExtensions) OF ExtensionField {bound} OPTIONAL,
+ carrier [11] Carrier{bound} OPTIONAL,
+ serviceInteractionIndicators [26] ServiceInteractionIndicators
{bound} OPTIONAL,
+ callingPartyNumber [27] CallingPartyNumber {bound}
OPTIONAL,
+ callingPartysCategory [28] CallingPartysCategory OPTIONAL,
+ redirectingPartyID [29] RedirectingPartyID {bound}
OPTIONAL,
+ redirectionInformation [30] RedirectionInformation OPTIONAL,
+ displayInformation [12] DisplayInformation {bound}
OPTIONAL,
+ forwardCallIndicators [13] ForwardCallIndicators OPTIONAL,
+ genericNumbers [14] GenericNumbers {bound} OPTIONAL,
+ serviceInteractionIndicatorsTwo [15] ServiceInteractionIndicatorsTwo
OPTIONAL,
+ iNServiceCompatibilityResponse [16] INServiceCompatibilityResponse
OPTIONAL,
+ forwardGVNS [17] ForwardGVNS {bound} OPTIONAL,
+ backwardGVNS [18] BackwardGVNS {bound} OPTIONAL,
+ callSegmentID [20] CallSegmentID {bound} OPTIONAL,
+ legToBeCreated [21] LegID OPTIONAL,
+ locationNumber [50] LocationNumber {bound} OPTIONAL,
+ bearerCapability [51] BearerCapability {bound}
OPTIONAL,
+ suppressionOfAnnouncement [55] SuppressionOfAnnouncement
OPTIONAL,
+ oCSIApplicable [56] OCSIApplicable OPTIONAL,
+ ...
+}
+
+CorrelationID {PARAMETERS-BOUND : bound} ::= Digits {bound}
+-- used by SCF for correlation with a previous operation.
+-- Refer to clause 18 for a description of the procedures associated with
this parameter.
+
+CutAndPaste ::= INTEGER (0..22)
+-- Indicates the number of digits to be deleted.
+
+INServiceCompatibilityResponse ::= Entry
+
+CallSegmentID {PARAMETERS-BOUND : bound} ::= INTEGER (1..bound.&numOfCSs)
+
+SuppressionOfAnnouncement ::= NULL
+OCSIApplicable ::= NULL
+*
+*
+* @author sergey vetyutnev
+*
+*/
+public interface ConnectRequest {
+
+ DestinationRoutingAddress getDestinationRoutingAddress();
+
+ AlertingPattern getAlertingPattern();
+
+ Digits getCorrelationID();
+
+ Integer getCutAndPaste();
+
+ ISDNAccessRelatedInformationInap getISDNAccessRelatedInformation();
+
+ OriginalCalledPartyIDInap getOriginalCalledPartyID();
+
+ RouteList getRouteListID();
+
+ ScfID getScfID();
+
+ INAPExtensions getExtensions();
+
+ Carrier getCarrier();
+
+ ServiceInteractionIndicators getServiceInteractionIndicators();
+
+ CallingPartyNumberInap getCallingPartyNumber();
+
+ CallingPartysCategoryInap getCallingPartysCategory();
+
+ RedirectingPartyIDInap getRedirectingPartyID();
+
+ RedirectionInformationInap getRedirectionInformation();
+
+ DisplayInformation getDisplayInformation();
+
+ ForwardCallIndicatorsInap getForwardCallIndicators();
+
+ GenericNumbers getGenericNumbers();
+
+ ServiceInteractionIndicatorsTwo getServiceInteractionIndicatorsTwo();
+
+ Entry getINServiceCompatibilityResponse();
+
+ ForwardGVNSInap getForwardGVNS();
+
+ BackwardGVNSInap getBackwardGVNS();
+
+ Integer getCallSegmentID();
+
+ LegID getLegToBeCreated();
+
+ LocationNumberInap getLocationNumber();
+
+ BearerCapability getBearerCapability();
+
+ boolean getSuppressionOfAnnouncement();
+
+ boolean getOCSIApplicable();
+
+}
=======================================
--- /dev/null
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/DestinationRoutingAddress.java
Tue Oct 22 15:58:58 2013 UTC
@@ -0,0 +1,42 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive;
+
+import java.io.Serializable;
+
+import org.mobicents.protocols.ss7.inap.api.isup.CalledPartyNumberInap;
+
+/**
+*
+
+DestinationRoutingAddress {PARAMETERS-BOUND : bound} ::= SEQUENCE SIZE(1)
OF CalledPartyNumber {bound}
+
+*
+* @author sergey vetyutnev
+*
+*/
+public interface DestinationRoutingAddress extends Serializable {
+
+ public CalledPartyNumberInap getCalledPartyNumber();
+
+}
=======================================
--- /dev/null
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/DisplayInformation.java
Tue Oct 22 15:58:58 2013 UTC
@@ -0,0 +1,43 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive;
+
+import java.io.Serializable;
+
+/**
+*
+DisplayInformation {PARAMETERS-BOUND : bound} ::= IA5String
(SIZE(bound.&minDisplayInformationLength ..
+bound.&maxDisplayInformationLength))
+-- Indicates the display information.
+-- Delivery of DisplayInformation parameter to Private Networks cannot be
guaranteed
+-- due to signalling interworking problems, solutions are currently under
study.
+
+*
+* @author sergey vetyutnev
+*
+*/
+public interface DisplayInformation extends Serializable {
+
+ String getString();
+
+}
=======================================
--- /dev/null
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/RouteList.java
Tue Oct 22 15:58:58 2013 UTC
@@ -0,0 +1,42 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+/**
+*
+RouteList {PARAMETERS-BOUND : bound} ::= SEQUENCE SIZE(1..3) OF OCTET
STRING (
+SIZE (bound.&minRouteListLength..bound.&maxRouteListLength))
+-- Indicates a list of trunk groups or a route index. See Q.1224 for
additional information on this item.
+
+*
+* @author sergey vetyutnev
+*
+*/
+public interface RouteList extends Serializable {
+
+ ArrayList<byte[]> getDataList();
+
+}
=======================================
--- /dev/null
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/primitive/ScfID.java
Tue Oct 22 15:58:58 2013 UTC
@@ -0,0 +1,51 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package
org.mobicents.protocols.ss7.inap.api.service.circuitSwitchedCall.primitive;
+
+import java.io.Serializable;
+
+/**
+*
+
+ScfID {PARAMETERS-BOUND : bound} ::= OCTET STRING
(SIZE(bound.&minScfIDLength..bound.&maxScfIDLength))
+-- defined by network operator.
+-- Indicates the SCF identity.
+-- Used to derive the INAP address of the SCF to establish a connection
between a requesting FE
+-- and the specified SCF.
+-- When ScfID is used in an operation which may cross an internetwork
boundary, its encoding must
+-- be understood in both networks; this requires bilateral agreement on
the encoding.
+-- Refer to 3.5/ETS 300 009-1 "calling party address" parameter for
encoding. It indicates the SCCP
+address of the SCF.
+-- Other encoding schemes are also possible as an operator specific option.
+
+*
+* @author sergey vetyutnev
+*
+*/
+public interface ScfID extends Serializable {
+
+ byte[] getData();
+
+ // TODO: add "calling party address" parameter for encoding
+
+}
=======================================
---
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/isup/OriginalCalledNumberInap.java
Thu Sep 19 20:19:11 2013 UTC
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * TeleStax, Open Source Cloud Communications
- * Copyright 2012, Telestax Inc and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.mobicents.protocols.ss7.inap.api.isup;
-
-import java.io.Serializable;
-
-import org.mobicents.protocols.ss7.inap.api.INAPException;
-import
org.mobicents.protocols.ss7.isup.message.parameter.OriginalCalledNumber;
-
-/**
-*
-OriginalCalledPartyID {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
-bound.&minOriginalCalledPartyIDLength..bound.&maxOriginalCalledPartyIDLength))
--- Indicates the original called number.
--- Refer to the ITU-T Recommendation Q.763 Original Called Number for
encoding.
-
-minOriginalCalledPartyIDLength=1
-maxOriginalCalledPartyIDLength=5
-*
-* @author sergey vetyutnev
-*
-*/
-public interface OriginalCalledNumberInap extends Serializable {
-
- byte[] getData();
-
- OriginalCalledNumber getOriginalCalledNumber() throws INAPException;
-
-}
=======================================
--- /inap/INAPMessagesImplemented.ods Thu Sep 19 20:19:11 2013 UTC
+++ /inap/INAPMessagesImplemented.ods Tue Oct 22 15:58:58 2013 UTC
Binary file, no diff available.
=======================================
---
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/InitialDPRequest.java
Thu Sep 19 20:19:11 2013 UTC
+++
/inap/inap-api/src/main/java/org/mobicents/protocols/ss7/inap/api/service/circuitSwitchedCall/InitialDPRequest.java
Tue Oct 22 15:58:58 2013 UTC
@@ -32,7 +32,7 @@
import
org.mobicents.protocols.ss7.inap.api.isup.HighLayerCompatibilityInap;
import
org.mobicents.protocols.ss7.inap.api.isup.ISDNAccessRelatedInformationInap;
import org.mobicents.protocols.ss7.inap.api.isup.LocationNumberInap;
-import org.mobicents.protocols.ss7.inap.api.isup.OriginalCalledNumberInap;
+import org.mobicents.protocols.ss7.inap.api.isup.OriginalCalledPartyIDInap;
import org.mobicents.protocols.ss7.inap.api.isup.RedirectingPartyIDInap;
import
org.mobicents.protocols.ss7.inap.api.isup.RedirectionInformationInap;
import org.mobicents.protocols.ss7.inap.api.primitives.BearerCapability;
@@ -203,7 +203,7 @@
LocationNumberInap getLocationNumber();
- OriginalCalledNumberInap getOriginalCalledPartyID();
+ OriginalCalledPartyIDInap getOriginalCalledPartyID();
TerminalType getTerminalType();
==============================================================================
Revision: aba299ee8610
Author: Sergey Vetyutnev <[email protected]>
Date: Tue Oct 22 16:33:13 2013 UTC
Log: Adding Serializable interface into TCAP and TCAP-ANSI
http://code.google.com/p/jss7/source/detail?r=aba299ee8610
Modified:
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/asn/Encodable.java
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/Dialog.java
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/DialogIndication.java
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/DialogRequest.java
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/TCNoticeIndication.java
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/Dialog.java
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/DialogIndication.java
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/DialogRequest.java
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/TCNoticeIndication.java
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/asn/Encodable.java
=======================================
---
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/asn/Encodable.java
Sun Jul 7 15:39:29 2013 UTC
+++
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/asn/Encodable.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,6 +22,8 @@
package org.mobicents.protocols.ss7.tcapAnsi.api.asn;
+import java.io.Serializable;
+
import org.mobicents.protocols.asn.AsnInputStream;
import org.mobicents.protocols.asn.AsnOutputStream;
@@ -31,7 +33,7 @@
* @author baranowb
*
*/
-public interface Encodable {
+public interface Encodable extends Serializable {
void encode(AsnOutputStream aos) throws EncodeException;
=======================================
---
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/Dialog.java
Fri Jul 12 20:00:20 2013 UTC
+++
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/Dialog.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,6 +22,7 @@
package org.mobicents.protocols.ss7.tcapAnsi.api.tc.dialog;
+import java.io.Serializable;
import java.util.concurrent.locks.ReentrantLock;
import org.mobicents.protocols.ss7.sccp.parameter.SccpAddress;
@@ -44,7 +45,7 @@
* @author sergey vetyutnev
*
*/
-public interface Dialog {
+public interface Dialog extends Serializable {
/**
* returns this dialog ID. It MUST be unique at any given time in
local stack.
=======================================
---
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/DialogIndication.java
Sun Jul 7 15:39:29 2013 UTC
+++
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/DialogIndication.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,10 +22,12 @@
package org.mobicents.protocols.ss7.tcapAnsi.api.tc.dialog.events;
+import java.io.Serializable;
+
import org.mobicents.protocols.ss7.tcapAnsi.api.asn.comp.Component;
import org.mobicents.protocols.ss7.tcapAnsi.api.tc.dialog.Dialog;
-public interface DialogIndication {
+public interface DialogIndication extends Serializable {
/**
* Return dialog for this indication
=======================================
---
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/DialogRequest.java
Sun Jul 7 15:39:29 2013 UTC
+++
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/DialogRequest.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,13 +22,15 @@
package org.mobicents.protocols.ss7.tcapAnsi.api.tc.dialog.events;
+import java.io.Serializable;
+
import org.mobicents.protocols.ss7.tcapAnsi.api.tc.dialog.Dialog;
/**
* @author baranowb
*
*/
-public interface DialogRequest {
+public interface DialogRequest extends Serializable {
Dialog getDialog();
=======================================
---
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/TCNoticeIndication.java
Sun Jul 7 15:39:29 2013 UTC
+++
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/tc/dialog/events/TCNoticeIndication.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,6 +22,8 @@
package org.mobicents.protocols.ss7.tcapAnsi.api.tc.dialog.events;
+import java.io.Serializable;
+
import org.mobicents.protocols.ss7.sccp.parameter.ReturnCauseValue;
import org.mobicents.protocols.ss7.sccp.parameter.SccpAddress;
import org.mobicents.protocols.ss7.tcapAnsi.api.tc.dialog.Dialog;
@@ -32,7 +34,7 @@
* @author sergey vetyutnev
*
*/
-public interface TCNoticeIndication {
+public interface TCNoticeIndication extends Serializable {
SccpAddress getLocalAddress();
=======================================
---
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/Dialog.java
Mon May 20 20:09:00 2013 UTC
+++
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/Dialog.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,6 +22,7 @@
package org.mobicents.protocols.ss7.tcap.api.tc.dialog;
+import java.io.Serializable;
import java.util.concurrent.locks.ReentrantLock;
import org.mobicents.protocols.ss7.sccp.parameter.SccpAddress;
@@ -43,7 +44,7 @@
* @author sergey vetyutnev
*
*/
-public interface Dialog {
+public interface Dialog extends Serializable {
/**
* returns this dialog ID. It MUST be unique at any given time in
local stack.
=======================================
---
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/DialogIndication.java
Mon May 20 20:09:00 2013 UTC
+++
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/DialogIndication.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,10 +22,12 @@
package org.mobicents.protocols.ss7.tcap.api.tc.dialog.events;
+import java.io.Serializable;
+
import org.mobicents.protocols.ss7.tcap.api.tc.dialog.Dialog;
import org.mobicents.protocols.ss7.tcap.asn.comp.Component;
-public interface DialogIndication {
+public interface DialogIndication extends Serializable {
/**
* Return dialog for this indication
=======================================
---
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/DialogRequest.java
Mon May 20 20:09:00 2013 UTC
+++
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/DialogRequest.java
Tue Oct 22 16:33:13 2013 UTC
@@ -25,13 +25,15 @@
*/
package org.mobicents.protocols.ss7.tcap.api.tc.dialog.events;
+import java.io.Serializable;
+
import org.mobicents.protocols.ss7.tcap.api.tc.dialog.Dialog;
/**
* @author baranowb
*
*/
-public interface DialogRequest {
+public interface DialogRequest extends Serializable {
/**
* Return dialog for this indication
*
=======================================
---
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/TCNoticeIndication.java
Mon May 20 20:09:00 2013 UTC
+++
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/tc/dialog/events/TCNoticeIndication.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,6 +22,8 @@
package org.mobicents.protocols.ss7.tcap.api.tc.dialog.events;
+import java.io.Serializable;
+
import org.mobicents.protocols.ss7.sccp.parameter.ReturnCauseValue;
import org.mobicents.protocols.ss7.sccp.parameter.SccpAddress;
import org.mobicents.protocols.ss7.tcap.api.tc.dialog.Dialog;
@@ -32,7 +34,7 @@
* @author sergey vetyutnev
*
*/
-public interface TCNoticeIndication {
+public interface TCNoticeIndication extends Serializable {
SccpAddress getLocalAddress();
=======================================
---
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/asn/Encodable.java
Mon May 20 20:09:00 2013 UTC
+++
/tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/asn/Encodable.java
Tue Oct 22 16:33:13 2013 UTC
@@ -22,6 +22,8 @@
package org.mobicents.protocols.ss7.tcap.asn;
+import java.io.Serializable;
+
import org.mobicents.protocols.asn.AsnInputStream;
import org.mobicents.protocols.asn.AsnOutputStream;
@@ -31,7 +33,7 @@
* @author baranowb
*
*/
-public interface Encodable {
+public interface Encodable extends Serializable {
void encode(AsnOutputStream aos) throws EncodeException;
==============================================================================
Revision: d8d5fd5f4ed8
Author: Sergey Vetyutnev <[email protected]>
Date: Sat Oct 26 19:36:10 2013 UTC
Log: Merge remote-tracking branch 'origin/cap50'
http://code.google.com/p/jss7/source/detail?r=d8d5fd5f4ed8
--
---
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.