Revision: 6edfc71e97f0
Author:   [email protected] <[email protected]>
Date:     Sat Jul  7 10:32:42 2012
Log:      Issue 17:     SMSC sending deliver_sm on a bind_transmit connection
http://code.google.com/p/smscgateway/source/detail?r=6edfc71e97f0

Deleted:
 /core/smpp/src/main/java/org/mobicents/smsc/smpp/AddressNPIType.java
 /core/smpp/src/main/java/org/mobicents/smsc/smpp/AddressTONType.java
Modified:
 /core/oam/cli/pom.xml
/core/slee/services/rxsmppserversbb/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionImpl.java /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionsImpl.java /core/slee/smpp-server-ra/ratype/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSession.java /core/slee/smpp-server-ra/ratype/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessions.java /core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java
 /core/smpp/src/main/java/org/mobicents/smsc/smpp/Esme.java
 /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java
 /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
 /core/smpp/src/main/java/org/mobicents/smsc/smpp/SmscManagement.java

=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/AddressNPIType.java Sat Apr 28 23:38:02 2012
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.mobicents.smsc.smpp;
-
-public enum AddressNPIType {
-                       UNKNOWN("0"), ISDN("1"), DATA("3"), TELEX("4"), 
LANDMOBILE("6"),
-                       NATIONAL("8"), PRIVATE("9"), ERMES("10"), IP("14"), 
WAPCLIENTID("18");
-
-               private static final String TYPE_UNKNOWN = "0";
-               private static final String TYPE_ISDN = "1";
-               private static final String TYPE_TELEX = "3";
-               private static final String TYPE_LANDMOBILE = "4";
-               private static final String TYPE_NATIONAL = "6";
-               private static final String TYPE_PRIVATE = "8";
-               private static final String TYPE_ERMES = "9";
-               private static final String TYPE_IP = "14";
-               private static final String TYPE_WAPCLIENTID = "18";
-
-               private String type = null;
-
-               private AddressNPIType(String type) {
-                       this.type = type;
-               }
-
-               public static AddressNPIType getAddressNPIType(String type) {
-                       if (TYPE_UNKNOWN.equals(type)) {
-                               return UNKNOWN;
-                       } else if (TYPE_ISDN.equals(type)) {
-                               return ISDN;
-                       } else if (TYPE_TELEX.equals(type)) {
-                               return TELEX;
-                       } else if (TYPE_LANDMOBILE.equals(type)) {
-                               return LANDMOBILE;
-                       } else if (TYPE_NATIONAL.equals(type)) {
-                               return NATIONAL;
-                       } else if (TYPE_PRIVATE.equals(type)) {
-                               return PRIVATE;
-                       } else if (TYPE_ERMES.equals(type)) {
-                               return ERMES;
-                       } else if (TYPE_IP.equals(type)) {
-                               return IP;
-                       } else if (TYPE_WAPCLIENTID.equals(type)) {
-                               return WAPCLIENTID;
-                       } else {
-                               return null;
-                       }
-               }
-
-               public String getType() {
-                       return this.type;
-               }
-}
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/AddressTONType.java Sat Apr 28 23:38:02 2012
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package org.mobicents.smsc.smpp;
-
-public enum AddressTONType {
- UNKNOWN("0"), INTERNATIONAL("1"), NATIONAL("2"), NETWORKSPECIFIC("3"), SUBSCRIBERNUMBER("4"),
-                       ALPHANUMBERIC("5"), ABBREVIATED("6");
-
-               private static final int TYPE_UNKNOWN = 0;
-               private static final int TYPE_INTERNATIONAL = 1;
-               private static final int TYPE_NATIONAL = 2;
-               private static final int TYPE_NETWORKSPECIFIC = 3;
-               private static final int TYPE_SUBSCRIBERNUMBER = 4;
-               private static final int TYPE_ALPHANUMBERIC = 5;
-               private static final int TYPE_ABBREVIATED = 6;
-
-               private String type = null;
-
-               private AddressTONType(String type) {
-                       this.type = type;
-               }
-
-               public static AddressTONType getAddressTONType(String type) {
-                       try {
-                               int intTon = Integer.parseInt(type);
-                               if (TYPE_UNKNOWN == intTon) {
-                                       return UNKNOWN;
-                               } else if (TYPE_INTERNATIONAL == intTon) {
-                                       return INTERNATIONAL;
-                               } else if (TYPE_NATIONAL == intTon) {
-                                       return NATIONAL;
-                               } else if (TYPE_NETWORKSPECIFIC == intTon) {
-                                       return NETWORKSPECIFIC;
-                               } else if (TYPE_SUBSCRIBERNUMBER == intTon) {
-                                       return SUBSCRIBERNUMBER;
-                               }else if (TYPE_ALPHANUMBERIC == intTon) {
-                                       return ALPHANUMBERIC;
-                               }else if (TYPE_ABBREVIATED == intTon) {
-                                       return ABBREVIATED;
-                               } else {
-                                       return null;
-                               }
-                       } catch (NumberFormatException e) {
-                               return null;
-                       }
-               }
-
-               public String getType() {
-                       return this.type;
-               }
-}
=======================================
--- /core/oam/cli/pom.xml       Sat Jul  7 02:48:18 2012
+++ /core/oam/cli/pom.xml       Sat Jul  7 10:32:42 2012
@@ -31,4 +31,48 @@
                        </resource>
                </resources>
        </build>
+       <profiles>
+               <profile>
+                       <!-- Adds the files to JBoss AS -->
+                       <id>jboss</id>
+                       <activation>
+                               <activeByDefault>true</activeByDefault>
+                       </activation>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               
<artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>deploy</id>
+                                                               
<phase>install</phase>
+                                                               <goals>
+                                                                       
<goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <tasks>
+                                                                               <copy 
todir="${jboss.home}/lib"
+                                                                                       
file="${project.build.directory}/${build.finalName}.jar" />
+                                                                       </tasks>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               
<id>undeploy</id>
+                                                               
<phase>clean</phase>
+                                                               <goals>
+                                                                       
<goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <tasks>
+                                                                               <delete 
failonerror="fals"
+                                                                                       
file="${jboss.home}/lib/${build.finalName}.jar" />
+                                                                       </tasks>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
=======================================
--- /core/slee/services/rxsmppserversbb/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java Sun Jun 3 05:01:03 2012 +++ /core/slee/services/rxsmppserversbb/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java Sat Jul 7 10:32:42 2012
@@ -64,7 +64,8 @@
public void onSendDeliveryReportSms(SmsEvent event, ActivityContextInterface aci, EventContext eventContext) {

                try {
- SmppServerSession smppSession = smppServerSessions.getSmppSession(event.getSystemId()); + SmppServerSession smppSession = smppServerSessions.getSmppSession(event.getDestAddrTon(),
+                                       event.getDestAddrNpi(), 
event.getDestAddr());

                        if (smppSession == null) {
                                this.logger.severe(String.format(
@@ -76,7 +77,7 @@
                                this.logger.severe(String.format(
"Received Delivery Report SmsEvent=%s but no SmppSession=%s is not BOUND", event,
                                                event.getSystemId()));
-                               //TODO : Add to SnF module
+                               // TODO : Add to SnF module
                                return;
                        }

=======================================
--- /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionImpl.java Sun Jun 3 05:03:52 2012 +++ /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionImpl.java Sat Jul 7 10:32:42 2012
@@ -1,5 +1,7 @@
 package org.mobicents.smsc.slee.resources.smpp.server;

+import java.util.regex.Pattern;
+
 import javax.slee.SLEEException;
 import javax.slee.resource.ActivityAlreadyExistsException;
 import javax.slee.resource.StartActivityException;
@@ -13,6 +15,7 @@
 import com.cloudhopper.smpp.impl.DefaultSmppSession;
 import com.cloudhopper.smpp.pdu.PduRequest;
 import com.cloudhopper.smpp.pdu.PduResponse;
+import com.cloudhopper.smpp.type.Address;
 import com.cloudhopper.smpp.type.RecoverablePduException;
 import com.cloudhopper.smpp.type.SmppChannelException;
 import com.cloudhopper.smpp.type.SmppTimeoutException;
@@ -25,10 +28,18 @@
        private final SmppServerSession wrappedSmppServerSession;
        private SmppServerResourceAdaptor smppServerResourceAdaptor = null;

+       private final Pattern pattern;
+
        public SmppServerSessionImpl(SmppServerSession wrappedSmppServerSession,
                        SmppServerResourceAdaptor smppServerResourceAdaptor) {
                this.wrappedSmppServerSession = wrappedSmppServerSession;
                this.smppServerResourceAdaptor = smppServerResourceAdaptor;
+
+ this.pattern = Pattern.compile(this.wrappedSmppServerSession.getConfiguration().getAddressRange().getAddress());
+       }
+
+       protected Pattern getAddressRangePattern() {
+               return this.pattern;
        }

        protected SmppServerSession getWrappedSmppServerSession() {
@@ -103,6 +114,11 @@
        public long getBoundTime() {
                return this.wrappedSmppServerSession.getBoundTime();
        }
+
+       @Override
+       public Address getAddress() {
+ return this.wrappedSmppServerSession.getConfiguration().getAddressRange();
+       }

        @Override
public SmppServerTransaction sendRequestPdu(PduRequest request, long timeoutMillis) throws RecoverablePduException,
=======================================
--- /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionsImpl.java Sun Jun 3 05:03:52 2012 +++ /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionsImpl.java Sat Jul 7 10:32:42 2012
@@ -1,16 +1,20 @@
 package org.mobicents.smsc.slee.resources.smpp.server;

+import java.util.Collection;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import javax.slee.facilities.Tracer;

-import javolution.util.FastMap;
+import javolution.util.FastList;

 import org.mobicents.smsc.slee.resources.smpp.server.events.EventsType;
import org.mobicents.smsc.slee.resources.smpp.server.events.PduRequestTimeout;
 import org.mobicents.smsc.smpp.SmppSessionHandlerInterface;

 import com.cloudhopper.smpp.PduAsyncResponse;
+import com.cloudhopper.smpp.SmppBindType;
 import com.cloudhopper.smpp.SmppConstants;
 import com.cloudhopper.smpp.SmppSessionHandler;
 import com.cloudhopper.smpp.pdu.BaseBindResp;
@@ -31,8 +35,7 @@

        private SmppServerResourceAdaptor smppServerResourceAdaptor = null;

- private FastMap<String, SmppServerSessionImpl> smppServerSessions = new FastMap<String, SmppServerSessionImpl>()
-                       .shared();
+ private Collection<SmppServerSessionImpl> smppServerSessions = new FastList<SmppServerSessionImpl>().shared();

protected SmppSessionHandlerInterfaceImpl smppSessionHandlerInterfaceImpl = null;

@@ -48,8 +51,20 @@

        }

-       public SmppServerSession getSmppSession(String systemId) {
-               return this.smppServerSessions.get(systemId);
+ public SmppServerSession getSmppSession(byte ton, byte npi, String address) {
+               for (SmppServerSessionImpl smppServerSessionImpl : 
smppServerSessions) {
+                       SmppBindType sessionBindType = 
smppServerSessionImpl.getBindType();
+
+ if (sessionBindType == SmppBindType.TRANSCEIVER || sessionBindType == SmppBindType.RECEIVER) {
+                               Pattern p = 
smppServerSessionImpl.getAddressRangePattern();
+                               Matcher m = p.matcher(address);
+                               if (m.matches()) {
+                                       return smppServerSessionImpl;
+                               }
+                       }
+               }// for
+ tracer.warning(String.format("No SmppServerSession found for address range=%s", address));
+               return null;
        }

        protected SmppSessionHandlerInterface getSmppSessionHandlerInterface() {
@@ -60,14 +75,10 @@

tracer.info(String.format("smppServerSessions.size()=%d", smppServerSessions.size()));

- for (FastMap.Entry<String, SmppServerSessionImpl> e = smppServerSessions.head(), end = smppServerSessions
-                               .tail(); (e = e.getNext()) != end;) {
-
-                       String key = e.getKey();
-                       SmppServerSessionImpl session = e.getValue();
+               for (SmppServerSessionImpl session : smppServerSessions) {
                        session.getWrappedSmppServerSession().close();
                        if (tracer.isInfoEnabled()) {
-                               tracer.info(String.format("Closed Session=%s", 
key));
+                               tracer.info(String.format("Closed Session=%s", 
session.getSystemId()));
                        }
                }

@@ -84,7 +95,7 @@
public SmppSessionHandler sessionCreated(Long sessionId, com.cloudhopper.smpp.SmppServerSession session,
                                BaseBindResp preparedBindResponse) throws 
SmppProcessingException {
SmppServerSessionImpl smppServerSessionImpl = new SmppServerSessionImpl(session, smppServerResourceAdaptor); - smppServerSessions.put(session.getConfiguration().getSystemId(), smppServerSessionImpl);
+                       smppServerSessions.add(smppServerSessionImpl);
                        if (tracer.isInfoEnabled()) {
tracer.info(String.format("Added Session=%s to list of maintained sessions", session.getConfiguration()
                                                .getSystemId()));
@@ -94,18 +105,24 @@

                @Override
public void sessionDestroyed(Long sessionId, com.cloudhopper.smpp.SmppServerSession session) { - SmppServerSessionImpl smppSession = smppServerSessions.remove(session.getConfiguration().getSystemId());
-                       if (smppSession != null) {
-                               if (tracer.isInfoEnabled()) {
- tracer.info(String.format("Removed Session=%s from list of maintained sessions", session
-                                                       
.getConfiguration().getSystemId()));
-                               }
-                       } else {
+                       boolean destroyed = false;
+                       for (SmppServerSessionImpl smppServerSessionImpl : 
smppServerSessions) {
+ if (smppServerSessionImpl.getSystemId().equals(session.getConfiguration().getSystemId())) {
+                                       
smppServerSessions.remove(smppServerSessionImpl);
+                                       if (tracer.isInfoEnabled()) {
+ tracer.info(String.format("Removed Session=%s from list of maintained sessions", session
+                                                               
.getConfiguration().getSystemId()));
+                                       }
+                                       destroyed = true;
+                                       break;
+                               }
+                       }
+
+                       if (!destroyed) {
tracer.warning(String.format("Session destroyed for=%, but was not maintained in list of sessions",
                                                
session.getConfiguration().getSystemId()));
                        }
                }
-
        }

        protected class SmppSessionHandlerImpl implements SmppSessionHandler {
=======================================
--- /core/slee/smpp-server-ra/ratype/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSession.java Tue May 15 06:25:33 2012 +++ /core/slee/smpp-server-ra/ratype/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSession.java Sat Jul 7 10:32:42 2012
@@ -8,6 +8,7 @@
 import com.cloudhopper.smpp.SmppSession.Type;
 import com.cloudhopper.smpp.pdu.PduRequest;
 import com.cloudhopper.smpp.pdu.PduResponse;
+import com.cloudhopper.smpp.type.Address;
 import com.cloudhopper.smpp.type.RecoverablePduException;
 import com.cloudhopper.smpp.type.SmppChannelException;
 import com.cloudhopper.smpp.type.SmppTimeoutException;
@@ -130,6 +131,12 @@
* @return The System.currentTimeMillis() value when the session was bound.
         */
        public long getBoundTime();
+
+       /**
+        * ESME Address
+        * @return
+        */
+       public Address getAddress();

        /**
* Main underlying method for sending a request PDU to the remote endpoint.
=======================================
--- /core/slee/smpp-server-ra/ratype/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessions.java Tue May 15 06:25:33 2012 +++ /core/slee/smpp-server-ra/ratype/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessions.java Sat Jul 7 10:32:42 2012
@@ -3,7 +3,8 @@

 public interface SmppServerSessions {

-       public SmppServerSession getSmppSession(String systemId);
+ //TODO : May be rename this method as we want SmppServerSession to send SMS to ESME + public SmppServerSession getSmppSession(byte ton, byte npi, String address);

        public String getNextMessageId();

=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java Sun Jun 3 05:03:52 2012 +++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java Sat Jul 7 10:32:42 2012
@@ -9,6 +9,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.mx.util.MBeanServerLocator;

+import com.cloudhopper.smpp.SmppBindType;
 import com.cloudhopper.smpp.SmppConstants;
 import com.cloudhopper.smpp.SmppServerHandler;
 import com.cloudhopper.smpp.SmppServerSession;
@@ -67,6 +68,24 @@
logger.error(String.format("Invalid password for SystemId=%s", bindRequest.getSystemId()));
                        throw new 
SmppProcessingException(SmppConstants.STATUS_INVPASWD);
                }
+
+               // Check of BIND is correct?
+               if ((bindRequest.getCommandId() == 
SmppConstants.CMD_ID_BIND_RECEIVER)
+                               && esme.getSmppBindType() != 
SmppBindType.RECEIVER) {
+ logger.error(String.format("Received BIND_RECEIVER for SystemId=%s but configured=%s",
+                                       bindRequest.getSystemId(), 
esme.getSmppBindType()));
+                       throw new 
SmppProcessingException(SmppConstants.STATUS_INVBNDSTS);
+ } else if ((bindRequest.getCommandId() == SmppConstants.CMD_ID_BIND_TRANSMITTER)
+                               && esme.getSmppBindType() != 
SmppBindType.TRANSMITTER) {
+ logger.error(String.format("Received BIND_TRANSMITTER for SystemId=%s but configured=%s",
+                                       bindRequest.getSystemId(), 
esme.getSmppBindType()));
+                       throw new 
SmppProcessingException(SmppConstants.STATUS_INVBNDSTS);
+ } else if ((bindRequest.getCommandId() == SmppConstants.CMD_ID_BIND_TRANSCEIVER)
+                               && esme.getSmppBindType() != 
SmppBindType.TRANSCEIVER) {
+ logger.error(String.format("Received BIND_TRANSCEIVER for SystemId=%s but configured=%s",
+                                       bindRequest.getSystemId(), 
esme.getSmppBindType()));
+                       throw new 
SmppProcessingException(SmppConstants.STATUS_INVBNDSTS);
+               }

                // TODO More parameters to compare

=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/Esme.java Sat Apr 28 23:38:02 2012 +++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/Esme.java Sat Jul 7 10:32:42 2012
@@ -28,8 +28,11 @@

 import org.apache.log4j.Logger;

+import com.cloudhopper.smpp.SmppBindType;
+import com.cloudhopper.smpp.type.Address;
+
 /**
- *
+ * @author amit bhayani
  * @author zaheer abbas
  *
  */
@@ -46,22 +49,21 @@
        private static final String ESME_PASSWORD = "password";
        private static final String REMOTE_HOST_IP = "host";
        private static final String REMOTE_HOST_PORT = "port";
+       private static final String SMPP_BIND_TYPE = "smppBindType";
        private static final String ESME_SYSTEM_TYPE = "systemType";
        private static final String ESME_INTERFACE_VERSION = "smppVersion";
        private static final String ESME_TON = "ton";
        private static final String ESME_NPI = "npi";
        private static final String ESME_ADDRESS_RANGE = "addressRange";
-
+
        private String systemId;
        private String password;
        private String host;
        private String port;
        private String systemType;
        private SmppInterfaceVersionType smppVersion = null;
-       private AddressTONType ton = null;
-       private AddressNPIType npi = null;
-       private String addressRange;
-
+       private Address address = null;
+       private SmppBindType smppBindType;

        protected SmscManagement smscManagement = null;

@@ -69,20 +71,16 @@

        }

- public Esme(String systemId, String pwd, String host, String port, String systemType, SmppInterfaceVersionType version,
-                       AddressTONType ton, AddressNPIType npi, String address) 
{
+ public Esme(String systemId, String pwd, String host, String port, SmppBindType smppBindType, String systemType,
+                       SmppInterfaceVersionType version, Address address) {
                this.systemId = systemId;
                this.password = pwd;
                this.host = host;
                this.port = port;
                this.systemType = systemType;
                this.smppVersion = version;
-               this.ton = ton;
-               this.npi = npi;
-               this.addressRange = address;
-       }
-
-
+               this.address = address;
+       }

        /**
         * Every As has unique name
@@ -92,65 +90,22 @@
        public String getSystemId() {
                return this.systemId;
        }
+
+       /**
+        * @param systemId
+        *            the systemId to set
+        */
+       public void setSystemId(String systemId) {
+               this.systemId = systemId;
+       }

        public void setSmscManagement(SmscManagement smscManagement) {
-               smscManagement = smscManagement;
+               this.smscManagement = smscManagement;
        }

        public SmscManagement getSmscManagement() {
                return smscManagement;
        }
-
-       /**
-        * XML Serialization/Deserialization
-        */
- protected static final XMLFormat<Esme> ESME_XML = new XMLFormat<Esme>(Esme.class) {
-
-               @Override
- public void read(javolution.xml.XMLFormat.InputElement xml, Esme esme) throws XMLStreamException {
-                       esme.systemId = xml.getAttribute(ESME_SYSTEM_ID, "");
-                       esme.password = xml.getAttribute(ESME_PASSWORD, "");
-                       esme.host = xml.getAttribute(REMOTE_HOST_IP, "");
-                       esme.port = xml.getAttribute(REMOTE_HOST_PORT, "");
-                       esme.systemType = xml.getAttribute(ESME_SYSTEM_TYPE, 
"");
- esme.smppVersion = SmppInterfaceVersionType.getInterfaceVersionType(xml.getAttribute(ESME_INTERFACE_VERSION, "")); - esme.ton = AddressTONType.getAddressTONType(xml.getAttribute(ESME_TON, "")); - esme.npi = AddressNPIType.getAddressNPIType(xml.getAttribute(ESME_NPI, ""));
-                       esme.addressRange = xml.getAttribute(ESME_ADDRESS_RANGE, 
"");
-
-               }
-
-               @Override
- public void write(Esme esme, javolution.xml.XMLFormat.OutputElement xml) throws XMLStreamException {
-                       xml.setAttribute(ESME_SYSTEM_ID, esme.systemId);
-                       xml.setAttribute(ESME_PASSWORD, esme.password);
-                       xml.setAttribute(REMOTE_HOST_IP, esme.host);
-                       xml.setAttribute(REMOTE_HOST_PORT, esme.port);
-                       xml.setAttribute(ESME_INTERFACE_VERSION, 
esme.smppVersion.getType());
-                       if (esme.systemType != null) {
-                               xml.setAttribute(ESME_SYSTEM_TYPE, 
esme.systemType);
-                       }
-                       if (esme.ton != null) {
-                               xml.setAttribute(ESME_TON, esme.ton.getType());
-                       }
-                       if (esme.npi != null) {
-                               xml.setAttribute(ESME_NPI, esme.ton.getType());
-                       }
-                       if (esme.addressRange != null) {
-                               xml.setAttribute(ESME_ADDRESS_RANGE, 
esme.addressRange);
-                       }
-               }
-       };
-
-       public void show(StringBuffer sb) {
- sb.append(SMSCOAMMessages.SHOW_ESME_SYSTEM_ID).append(this.systemId).append(SMSCOAMMessages.SHOW_ESME_PASSWORD).append(this.password) - .append(SMSCOAMMessages.SHOW_ESME_HOST).append(this.host).append(SMSCOAMMessages.SHOW_ESME_PORT).append(this.port) - .append(SMSCOAMMessages.SHOW_ESME_SYSTEM_TYPE).append(this.systemType).append(SMSCOAMMessages.SHOW_ESME_INTERFACE_VERSION).append(this.smppVersion) - .append(SMSCOAMMessages.SHOW_ESME_TON).append(this.ton).append(SMSCOAMMessages.SHOW_ESME_NPI).append(this.npi) - .append(SMSCOAMMessages.SHOW_ESME_ADDRESS_RANGE).append(this.addressRange);
-
-               sb.append(SMSCOAMMessages.NEW_LINE);
-       }

        /**
         * @return the password
@@ -160,7 +115,8 @@
        }

        /**
-        * @param password the password to set
+        * @param password
+        *            the password to set
         */
        public void setPassword(String password) {
                this.password = password;
@@ -174,7 +130,8 @@
        }

        /**
-        * @param host the host to set
+        * @param host
+        *            the host to set
         */
        public void setHost(String host) {
                this.host = host;
@@ -188,11 +145,20 @@
        }

        /**
-        * @param port the port to set
+        * @param port
+        *            the port to set
         */
        public void setPort(String port) {
                this.port = port;
        }
+
+       protected SmppBindType getSmppBindType() {
+               return smppBindType;
+       }
+
+       protected void setSmppBindType(SmppBindType smppBindType) {
+               this.smppBindType = smppBindType;
+       }

        /**
         * @return the systemType
@@ -202,7 +168,8 @@
        }

        /**
-        * @param systemType the systemType to set
+        * @param systemType
+        *            the systemType to set
         */
        public void setSystemType(String systemType) {
                this.systemType = systemType;
@@ -216,58 +183,71 @@
        }

        /**
-        * @param smppVersion the smppVersion to set
+        * @param smppVersion
+        *            the smppVersion to set
         */
        public void setSmppVersion(SmppInterfaceVersionType smppVersion) {
                this.smppVersion = smppVersion;
        }

        /**
-        * @return the ton
+        * XML Serialization/Deserialization
         */
-       public AddressTONType getTon() {
-               return ton;
-       }
-
-       /**
-        * @param ton the ton to set
-        */
-       public void setTon(AddressTONType ton) {
-               this.ton = ton;
-       }
-
-       /**
-        * @return the npi
-        */
-       public AddressNPIType getNpi() {
-               return npi;
-       }
-
-       /**
-        * @param npi the npi to set
-        */
-       public void setNpi(AddressNPIType npi) {
-               this.npi = npi;
-       }
-
-       /**
-        * @return the addressRange
-        */
-       public String getAddressRange() {
-               return addressRange;
-       }
-
-       /**
-        * @param addressRange the addressRange to set
-        */
-       public void setAddressRange(String addressRange) {
-               this.addressRange = addressRange;
-       }
-
-       /**
-        * @param systemId the systemId to set
-        */
-       public void setSystemId(String systemId) {
-               this.systemId = systemId;
+ protected static final XMLFormat<Esme> ESME_XML = new XMLFormat<Esme>(Esme.class) {
+
+               @Override
+ public void read(javolution.xml.XMLFormat.InputElement xml, Esme esme) throws XMLStreamException {
+                       esme.systemId = xml.getAttribute(ESME_SYSTEM_ID, "");
+                       esme.password = xml.getAttribute(ESME_PASSWORD, "");
+                       esme.host = xml.getAttribute(REMOTE_HOST_IP, "");
+                       esme.port = xml.getAttribute(REMOTE_HOST_PORT, "");
+
+ String smppBindTypeStr = xml.getAttribute(SMPP_BIND_TYPE, "TRANSCEIVER");
+
+                       if 
(SmppBindType.TRANSCEIVER.toString().equals(smppBindTypeStr)) {
+                               esme.smppBindType = SmppBindType.TRANSCEIVER;
+ } else if (SmppBindType.TRANSMITTER.toString().equals(smppBindTypeStr)) {
+                               esme.smppBindType = SmppBindType.TRANSMITTER;
+                       } else if 
(SmppBindType.RECEIVER.toString().equals(smppBindTypeStr)) {
+                               esme.smppBindType = SmppBindType.RECEIVER;
+                       }
+
+                       esme.systemType = xml.getAttribute(ESME_SYSTEM_TYPE, 
"");
+ esme.smppVersion = SmppInterfaceVersionType.getInterfaceVersionType(xml.getAttribute(
+                                       ESME_INTERFACE_VERSION, ""));
+
+                       byte ton = xml.getAttribute(ESME_TON, (byte) 0);
+                       byte npi = xml.getAttribute(ESME_NPI, (byte) 0);
+                       String addressRange = 
xml.getAttribute(ESME_ADDRESS_RANGE, null);
+
+                       esme.address = new Address(ton, npi, addressRange);
+
+               }
+
+               @Override
+ public void write(Esme esme, javolution.xml.XMLFormat.OutputElement xml) throws XMLStreamException {
+                       xml.setAttribute(ESME_SYSTEM_ID, esme.systemId);
+                       xml.setAttribute(ESME_PASSWORD, esme.password);
+                       xml.setAttribute(REMOTE_HOST_IP, esme.host);
+                       xml.setAttribute(REMOTE_HOST_PORT, esme.port);
+                       xml.setAttribute(SMPP_BIND_TYPE, 
esme.smppBindType.toString());
+                       xml.setAttribute(ESME_INTERFACE_VERSION, 
esme.smppVersion.getType());
+                       if (esme.systemType != null) {
+                               xml.setAttribute(ESME_SYSTEM_TYPE, 
esme.systemType);
+                       }
+                       xml.setAttribute(ESME_TON, esme.address.getTon());
+                       xml.setAttribute(ESME_NPI, esme.address.getNpi());
+                       xml.setAttribute(ESME_ADDRESS_RANGE, 
esme.address.getAddress());
+               }
+       };
+
+       public void show(StringBuffer sb) {
+ sb.append(SMSCOAMMessages.SHOW_ESME_SYSTEM_ID).append(this.systemId).append(SMSCOAMMessages.SHOW_ESME_PASSWORD) + .append(this.password).append(SMSCOAMMessages.SHOW_ESME_HOST).append(this.host) + .append(SMSCOAMMessages.SHOW_ESME_PORT).append(this.port).append(SMSCOAMMessages.SHOW_ESME_SYSTEM_TYPE) + .append(this.systemType).append(SMSCOAMMessages.SHOW_ESME_INTERFACE_VERSION).append(this.smppVersion)
+                               
.append(SMSCOAMMessages.SHOW_ADDRESS).append(this.address);
+
+               sb.append(SMSCOAMMessages.NEW_LINE);
        }
 }
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java Sat Apr 28 23:38:02 2012 +++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCOAMMessages.java Sat Jul 7 10:32:42 2012
@@ -95,4 +95,6 @@

        public static final String SHOW_STARTED = " started=";

-}
+       public static final String SHOW_ADDRESS = " address=";
+
+}
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java Sat Jul 7 02:48:18 2012 +++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java Sat Jul 7 10:32:42 2012
@@ -29,6 +29,9 @@
 import org.apache.log4j.Logger;
 import org.mobicents.ss7.management.console.ShellExecutor;

+import com.cloudhopper.smpp.SmppBindType;
+import com.cloudhopper.smpp.type.Address;
+
 /**
  * @author amit bhayani
  * @author zaheer abbas
@@ -39,11 +42,11 @@
private static final Logger logger = Logger.getLogger(SMSCShellExecutor.class);

        private SmscManagement smscManagement;
-
+
        public SMSCShellExecutor() {

        }
-
+
        /**
         * @return the m3uaManagement
         */
@@ -52,18 +55,18 @@
        }

        /**
-        * @param m3uaManagement the m3uaManagement to set
+        * @param m3uaManagement
+        *            the m3uaManagement to set
         */
        public void setSmscManagement(SmscManagement smscManagement) {
                this.smscManagement = smscManagement;
        }
-

        /**
-        * smsc esme create <Any 4/5 digit number> <Specify password>
-        * <host-ip> <port> system-type <sms | vms | ota >
-        * interface-version <3.3 | 3.4 | 5.0> esme-ton <esme address ton>
-        * esme-npi <esme address npi> esme-range <esme address range>
+        * smsc esme create <Any 4/5 digit number> <Specify password> <host-ip>
+ * <port> <TRANSCEIVER|TRANSMITTER|RECEIVER> system-type <sms | vms | ota

+ * interface-version <3.3 | 3.4 | 5.0> esme-ton <esme address ton> esme-npi
+        * <esme address npi> esme-range <esme address range>
         *
         * @param args
         * @return
@@ -90,25 +93,41 @@
                int intPort = -1;
                if (strPort == null) {
                        return SMSCOAMMessages.INVALID_COMMAND;
-               }else{
-                       try{
+               } else {
+                       try {
                                intPort = Integer.parseInt(strPort);
-                               }catch(Exception e){
-                                       return SMSCOAMMessages.INVALID_COMMAND;
-                               }
+                       } catch (Exception e) {
+                               return SMSCOAMMessages.INVALID_COMMAND;
+                       }
                }

-
+               SmppBindType smppBindType = null;
+               String smppBindTypeStr = args[7];
+
+               if (smppBindTypeStr == null) {
+                       return SMSCOAMMessages.INVALID_COMMAND;
+               }
+
+               if 
(SmppBindType.TRANSCEIVER.toString().equals(smppBindTypeStr)) {
+                       smppBindType = SmppBindType.TRANSCEIVER;
+               } else if 
(SmppBindType.TRANSMITTER.toString().equals(smppBindTypeStr)) {
+                       smppBindType = SmppBindType.TRANSMITTER;
+               } else if 
(SmppBindType.RECEIVER.toString().equals(smppBindTypeStr)) {
+                       smppBindType = SmppBindType.RECEIVER;
+               } else {
+                       return SMSCOAMMessages.INVALID_COMMAND;
+               }
+
                String systemType = null;
                SmppInterfaceVersionType smppVersionType = null;
-               AddressTONType esmeTonType = null;
-               AddressNPIType esmeNpiType = null;
+               byte esmeTonType = 0;
+               byte esmeNpiType = 0;
                String esmeAddrRange = null;
-
-               int count = 7;
+
+               int count = 8;

                while (count < args.length) {
-                       //These are all optional parameters for a Tx/Rx/Trx 
binds
+                       // These are all optional parameters for a Tx/Rx/Trx 
binds
                        String key = args[count++];
                        if (key == null) {
                                return SMSCOAMMessages.INVALID_COMMAND;
@@ -116,23 +135,25 @@

                        if (key.equals("system-type")) {
                                systemType = args[count++];
-                   } else if (key.equals("interface-version")) {
+                       } else if (key.equals("interface-version")) {
smppVersionType = SmppInterfaceVersionType.getInterfaceVersionType(args[count++]);
                                if (smppVersionType == null) {
                                        smppVersionType = 
SmppInterfaceVersionType.SMPP34;
-                       }
+                               }
                        } else if (key.equals("esme-ton")) {
-                               esmeTonType = 
AddressTONType.getAddressTONType(args[count++]);
+                               esmeTonType = Byte.parseByte(args[count++]);
                        } else if (key.equals("esme-npi")) {
-                               esmeNpiType = 
AddressNPIType.getAddressNPIType(args[count++]);
+                               esmeNpiType = Byte.parseByte(args[count++]);
                        } else if (key.equals("esme-range")) {
-                               esmeAddrRange = /*Regex*/args[count++];
+                               esmeAddrRange = /* Regex */args[count++];
                        } else {
                                return SMSCOAMMessages.INVALID_COMMAND;
                        }
-               }
-
- Esme esme = this.smscManagement.createEsme(systemId, password, host, strPort, systemType, smppVersionType, esmeTonType, esmeNpiType, esmeAddrRange);
+
+               }
+               Address address = new Address(esmeTonType, esmeNpiType, 
esmeAddrRange);
+ Esme esme = this.smscManagement.createEsme(systemId, password, host, strPort, smppBindType, systemType, smppVersionType,
+                               address);
return String.format(SMSCOAMMessages.CREATE_ESME_SUCCESSFULL, esme.getSystemId());
        }

@@ -199,63 +220,89 @@
                                }
                                return SMSCOAMMessages.INVALID_COMMAND;
                        } else if (args[1].equals("rule")) {/*
-
-                               if (args.length > 5) {
-                                       return SMSCOAMMessages.INVALID_COMMAND;
-                               }
-
-                               // related to rem AS for SigGatewayImpl
-                               String raspCmd = args[2];
-
-                               if (raspCmd == null) {
-                                       return SMSCOAMMessages.INVALID_COMMAND;
-                               } else if (raspCmd.equals("create")) {
-                                       // Create new rule
-                                       if (args.length < 5) {
-                                               return 
SMSCOAMMessages.INVALID_COMMAND;
-                                       }
-
-                                       String aspname = args[3];
-                                       String assocName = args[4];
-
-                                       if (aspname == null || assocName == 
null) {
-                                               return 
SMSCOAMMessages.INVALID_COMMAND;
-                                       }
-
- AspFactory factory = this.m3uaManagement.createAspFactory(aspname, assocName); - return String.format(SMSCOAMMessages.CREATE_ASP_SUCESSFULL, factory.getName());
-                               } else if (raspCmd.equals("destroy")) {
-                                       if (args.length < 4) {
-                                               return 
SMSCOAMMessages.INVALID_COMMAND;
-                                       }
-
-                                       String aspName = args[3];
-                                       
this.m3uaManagement.destroyAspFactory(aspName);
-                                       return String.format("Successfully destroyed 
ASP name=%s", aspName);
-
-                               } else if (raspCmd.equals("show")) {
-                                       return this.showAspFactories();
-
-                               } else if (raspCmd.equals("start")) {
-                                       if (args.length < 4) {
-                                               return 
SMSCOAMMessages.INVALID_COMMAND;
-                                       }
-
-                                       String aspName = args[3];
-                                       this.m3uaManagement.startAsp(aspName);
-                                       return 
String.format(SMSCOAMMessages.ASP_START_SUCESSFULL, aspName);
-                               } else if (raspCmd.equals("stop")) {
-                                       if (args.length < 4) {
-                                               return 
SMSCOAMMessages.INVALID_COMMAND;
-                                       }
-
-                                       String aspName = args[3];
-                                       this.m3uaManagement.stopAsp(aspName);
-                                       return 
String.format(SMSCOAMMessages.ASP_STOP_SUCESSFULL, aspName);
-                               }
-
-                               return SMSCOAMMessages.INVALID_COMMAND;
-                       */}
+                                                                               
                 *
+                                                                                  
              * if (args.length > 5) { return
+                                                                               
                 * SMSCOAMMessages
+                                                                               
                 * .INVALID_COMMAND; }
+                                                                               
                 *
+                                                                               
                 * // related to rem AS for
+                                                                               
                 * SigGatewayImpl String raspCmd
+                                                                               
                 * = args[2];
+                                                                               
                 *
+                                                                               
                 * if (raspCmd == null) { return
+                                                                               
                 * SMSCOAMMessages
+                                                                               
                 * .INVALID_COMMAND; } else if
+                                                                                         
       * (raspCmd.equals("create")) {
+                                                                               
                 * // Create new rule if
+                                                                                  
              * (args.length < 5) { return
+                                                                               
                 * SMSCOAMMessages
+                                                                               
                 * .INVALID_COMMAND; }
+                                                                               
                 *
+                                                                               
                 * String aspname = args[3];
+                                                                               
                 * String assocName = args[4];
+                                                                               
                 *
+                                                                               
                 * if (aspname == null ||
+                                                                               
                 * assocName == null) { return
+                                                                               
                 * SMSCOAMMessages
+                                                                               
                 * .INVALID_COMMAND; }
+                                                                               
                 *
+                                                                               
                 * AspFactory factory =
+                                                                               
                 * this.m3uaManagement
+                                                                               
                 * .createAspFactory(aspname,
+                                                                               
                 * assocName); return
+                                                                               
                 * String.format
+                                                                               
                 * (SMSCOAMMessages.
+                                                                               
                 * CREATE_ASP_SUCESSFULL,
+                                                                               
                 * factory.getName()); } else if
+                                                                                         
       * (raspCmd.equals("destroy")) {
+                                                                                  
              * if (args.length < 4) { return
+                                                                               
                 * SMSCOAMMessages
+                                                                               
                 * .INVALID_COMMAND; }
+                                                                               
                 *
+                                                                               
                 * String aspName = args[3];
+                                                                               
                 * this
+                                                                               
                 * .m3uaManagement.destroyAspFactory
+                                                                               
                 * (aspName); return
+                                                                               
                 * String.format(
+                                                                                         
       * "Successfully destroyed ASP name=%s"
+                                                                               
                 * , aspName);
+                                                                               
                 *
+                                                                               
                 * } else if
+                                                                                         
       * (raspCmd.equals("show")) {
+                                                                               
                 * return
+                                                                               
                 * this.showAspFactories();
+                                                                               
                 *
+                                                                               
                 * } else if
+                                                                                         
       * (raspCmd.equals("start")) {
+                                                                                  
              * if (args.length < 4) { return
+                                                                               
                 * SMSCOAMMessages
+                                                                               
                 * .INVALID_COMMAND; }
+                                                                               
                 *
+                                                                               
                 * String aspName = args[3];
+                                                                               
                 * this
+                                                                               
                 * .m3uaManagement.startAsp(
+                                                                               
                 * aspName ); return
+                                                                               
                 * String.format(SMSCOAMMessages
+                                                                               
                 * .ASP_START_SUCESSFULL,
+                                                                               
                 * aspName); } else if
+                                                                                         
       * (raspCmd.equals("stop")) { if
+                                                                                  
              * (args.length < 4) { return
+                                                                               
                 * SMSCOAMMessages
+                                                                               
                 * .INVALID_COMMAND; }
+                                                                               
                 *
+                                                                               
                 * String aspName = args[3];
+                                                                               
                 * this
+                                                                               
                 * .m3uaManagement.stopAsp(aspName
+                                                                               
                 * ); return
+                                                                               
                 * String.format(SMSCOAMMessages
+                                                                               
                 * .ASP_STOP_SUCESSFULL,
+                                                                               
                 * aspName); }
+                                                                               
                 *
+                                                                               
                 * return
+                                                                               
                 * SMSCOAMMessages.INVALID_COMMAND
+                                                                               
                 * ;
+                                                                               
                 */
+                       }
                        return SMSCOAMMessages.INVALID_COMMAND;
                } catch (Exception e) {
logger.error(String.format("Error while executing comand %s", Arrays.toString(args)), e);
@@ -272,7 +319,7 @@

        @Override
        public boolean handles(String command) {
-               return "sccp".equals(command);
+               return "smsc".equals(command);
        }

 }
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SmscManagement.java Tue May 15 06:25:33 2012 +++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SmscManagement.java Sat Jul 7 10:32:42 2012
@@ -36,6 +36,9 @@

 import org.apache.log4j.Logger;

+import com.cloudhopper.smpp.SmppBindType;
+import com.cloudhopper.smpp.type.Address;
+
 /**
  * @author zaheer abbas
  *
@@ -160,8 +163,8 @@
         * @return
         * @throws Exception
         */
- public Esme createEsme(String systemId, String password, String host, String port, String systemType, - SmppInterfaceVersionType smppIntVersion, AddressTONType ton, AddressNPIType npi, String addressRange) + public Esme createEsme(String systemId, String password, String host, String port, SmppBindType smppBindType, String systemType,
+                       SmppInterfaceVersionType smppIntVersion, Address 
address)
                        throws Exception {

                /* Esme system id should be unique and mandatory for each esme 
*/
@@ -175,7 +178,7 @@
                        smppIntVersion = SmppInterfaceVersionType.SMPP34;
                }

- esme = new Esme(systemId, password, host, port, systemType, smppIntVersion, ton, npi, addressRange); + esme = new Esme(systemId, password, host, port, smppBindType, systemType, smppIntVersion, address);
                esme.setSmscManagement(this);
                esmes.add(esme);

Reply via email to