3 new revisions:
Revision: 1a66e1388931
Author: pslegr <[email protected]>
Date: Sat Dec 1 08:21:56 2012
Log: fix issue 186
http://code.google.com/p/jss7/source/detail?r=1a66e1388931
Revision: 1c9d7a1aba13
Author: [email protected] <[email protected]>
Date: Fri Nov 30 23:41:26 2012
Log: Fix for Issue 185: moobicents-sgw throws CNF ShellServer
http://code.google.com/p/jss7/source/detail?r=1c9d7a1aba13
Revision: 6ef6bd025208
Author: [email protected] <[email protected]>
Date: Sat Dec 1 02:37:37 2012
Log: Issue 189: Decoding of
org.mobicents.ss7.management.transceiver.Messag...
http://code.google.com/p/jss7/source/detail?r=6ef6bd025208
==============================================================================
Revision: 1a66e1388931
Author: pslegr <[email protected]>
Date: Sat Dec 1 08:21:56 2012
Log: fix issue 186
http://code.google.com/p/jss7/source/detail?r=1a66e1388931
Modified:
/management/shell-client/src/main/config/ss7-cli.bat
==============================================================================
Revision: 1c9d7a1aba13
Author: [email protected] <[email protected]>
Date: Fri Nov 30 23:41:26 2012
Log: Fix for Issue 185: moobicents-sgw throws CNF ShellServer
http://code.google.com/p/jss7/source/detail?r=1c9d7a1aba13
Modified:
/sgw/boot/pom.xml
=======================================
--- /sgw/boot/pom.xml Wed Nov 21 03:29:31 2012
+++ /sgw/boot/pom.xml Fri Nov 30 23:41:26 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.mobicents.protocols.ss7.sgw</groupId>
@@ -41,6 +42,71 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
+
+ <!-- SS7 Dependencies -->
+ <dependency>
+ <artifactId>mtp-api</artifactId>
+ <groupId>org.mobicents.protocols.ss7.mtp</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>mtp</artifactId>
+ <groupId>org.mobicents.protocols.ss7.mtp</groupId>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+ <artifactId>linkset</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <!-- Hardware Dahdi Java -->
+ <dependency>
+ <artifactId>mobicents-dahdi</artifactId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+ </dependency>
+
+ <!-- Hardware Dialogic Java
+ <dependency>
+ <artifactId>mobicents-dialogic</artifactId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+ </dependency>
+ -->
+
+ <!-- m3ua -->
+ <dependency>
+ <artifactId>m3ua-api</artifactId>
+ <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
+ </dependency>
+
+ <dependency>
+ <artifactId>m3ua-impl</artifactId>
+ <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
+ </dependency>
+
+ <dependency>
+ <artifactId>shell-server-api</artifactId>
+
<groupId>org.mobicents.protocols.ss7.management</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>shell-server-impl</artifactId>
+
<groupId>org.mobicents.protocols.ss7.management</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>shell-transport</artifactId>
+
<groupId>org.mobicents.protocols.ss7.management</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>scheduler</artifactId>
+ <groupId>org.mobicents.protocols.ss7.scheduler</groupId>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.protocols.sctp</groupId>
+ <artifactId>sctp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.protocols.sctp</groupId>
+ <artifactId>sctp-impl</artifactId>
+ </dependency>
+
</dependencies>
<build>
<finalName>run</finalName>
==============================================================================
Revision: 6ef6bd025208
Author: [email protected] <[email protected]>
Date: Sat Dec 1 02:37:37 2012
Log: Issue 189: Decoding of
org.mobicents.ss7.management.transceiver.Message
fails if empty data sent.
http://code.google.com/p/jss7/source/detail?r=6ef6bd025208
Modified:
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/Message.java
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/MessageFactory.java
/management/shell-transport/src/test/java/org/mobicents/ss7/management/transceiver/MessageFactoryTest.java
=======================================
---
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/Message.java
Sun Sep 23 01:37:36 2012
+++
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/Message.java
Sat Dec 1 02:37:37 2012
@@ -23,6 +23,7 @@
package org.mobicents.ss7.management.transceiver;
import java.nio.ByteBuffer;
+import java.util.Arrays;
/**
* Represents the Shell Command protocol data unit
@@ -74,5 +75,33 @@
public String toString() {
return new String(data);
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + Arrays.hashCode(data);
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Message other = (Message) obj;
+ if (!Arrays.equals(data, other.data))
+ return false;
+ return true;
+ }
}
=======================================
---
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/MessageFactory.java
Sun Sep 23 01:37:36 2012
+++
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/MessageFactory.java
Sat Dec 1 02:37:37 2012
@@ -107,7 +107,7 @@
// at this point we must recheck remainder of the input buffer
// because possible case when input buffer fits exactly to the
header
- if (!buffer.hasRemaining()) {
+ if (length>0 && !buffer.hasRemaining()) {
return null;
}
=======================================
---
/management/shell-transport/src/test/java/org/mobicents/ss7/management/transceiver/MessageFactoryTest.java
Sun Sep 23 01:37:36 2012
+++
/management/shell-transport/src/test/java/org/mobicents/ss7/management/transceiver/MessageFactoryTest.java
Sat Dec 1 02:37:37 2012
@@ -58,6 +58,19 @@
@AfterTest
public void tearDown() {
}
+
+ @Test
+ public void testEmptyMessage() throws IOException {
+ Message msgInput = messageFactory.createMessage("");
+
+ ByteBuffer rxBuffer = ByteBuffer.allocateDirect(8192);
+ msgInput.encode(rxBuffer);
+ rxBuffer.flip();
+
+ Message messageOutpu = messageFactory.createMessage(rxBuffer);
+
+ assertEquals(messageOutpu, msgInput);
+ }
@Test
public void testLongMessage() throws IOException {
