3 new revisions:
Revision: 2b09b5a9df78
Author: unknown <yulian@Venera.(none)>
Date: Tue Dec 11 05:12:46 2012
Log: Resolved mgcp client parsing issue
http://code.google.com/p/mediaserver/source/detail?r=2b09b5a9df78
Revision: e08b3f0e49a9
Author: unknown <yulian@Venera.(none)>
Date: Tue Dec 11 05:16:05 2012
Log: Merge branch 'master' of https://code.google.com/p/mediaserver...
http://code.google.com/p/mediaserver/source/detail?r=e08b3f0e49a9
Revision: 58b65b61f232
Author: unknown <yulian@Venera.(none)>
Date: Tue Dec 11 05:16:57 2012
Log: Merge branch 'ts1' of https://code.google.com/p/mediaserver...
http://code.google.com/p/mediaserver/source/detail?r=58b65b61f232
==============================================================================
Revision: 2b09b5a9df78
Author: unknown <yulian@Venera.(none)>
Date: Tue Dec 11 05:12:46 2012
Log: Resolved mgcp client parsing issue
http://code.google.com/p/mediaserver/source/detail?r=2b09b5a9df78
Modified:
/client/jsr-309/tck/deps/mgcp-driver-3.0.0.FINAL.jar
/client/jsr-309/tck/server.log
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/MgcpMessageParser.java
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/Utils.java
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/UtilsFactory.java
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/stack/DeleteConnectionHandler.java
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/stack/JainMgcpStackImpl.java
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/utils/PacketRepresentationFactory.java
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
=======================================
--- /client/jsr-309/tck/deps/mgcp-driver-3.0.0.FINAL.jar Tue Nov 6
04:41:55 2012
+++ /client/jsr-309/tck/deps/mgcp-driver-3.0.0.FINAL.jar Tue Dec 11
05:12:46 2012
Binary file, no diff available.
=======================================
--- /client/jsr-309/tck/server.log Mon Dec 10 15:44:18 2012
+++ /client/jsr-309/tck/server.log Tue Dec 11 05:12:46 2012
@@ -1,6 +1,6 @@
-2012-12-11 00:49:12,933 DEBUG [TestBase] (main) Loading
file:/opt/mobsource/medianew/client/jsr-309/tck/exclude-list.properties
-2012-12-11 00:49:12,934 INFO [Runner] (main) Start
mandatory.functional.mediagroup.PlayerTest.test_2_1_1_1_Play
javadoc::Joinable::1 javadoc::MediaGroup::1 javadoc::MediaGroup::6
javadoc::Player::1 javadoc::PlayerEvent::15
-2012-12-11 00:49:12,935 DEBUG [TestBase] (main) Getting a MsControlFactory
instance
-2012-12-11 00:49:12,956 INFO [DriverImpl] (main) Initializing MGCP on
/127.0.0.1:2729
-2012-12-11 00:49:12,969 WARN [JainMgcpStackImpl] (main) Failed to locate
properties file, using default values
-2012-12-11 00:49:12,979 INFO [JainMgcpStackImpl] (main) Jain Mgcp stack
bound to IP /127.0.0.1 and UDP port 2729
+2012-12-11 14:47:16,734 DEBUG [TestBase] (main) Loading
file:/opt/mobsource/medianew/client/jsr-309/tck/exclude-list.properties
+2012-12-11 14:47:16,736 INFO [Runner] (main) Start
mandatory.functional.mediagroup.PlayerTest.test_2_1_1_1_Play
javadoc::Joinable::1 javadoc::MediaGroup::1 javadoc::MediaGroup::6
javadoc::Player::1 javadoc::PlayerEvent::15
+2012-12-11 14:47:16,736 DEBUG [TestBase] (main) Getting a MsControlFactory
instance
+2012-12-11 14:47:16,758 INFO [DriverImpl] (main) Initializing MGCP on
/127.0.0.1:2729
+2012-12-11 14:47:16,771 WARN [JainMgcpStackImpl] (main) Failed to locate
properties file, using default values
+2012-12-11 14:47:16,781 INFO [JainMgcpStackImpl] (main) Jain Mgcp stack
bound to IP /127.0.0.1 and UDP port 2729
=======================================
---
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/MgcpMessageParser.java
Mon Dec 10 15:44:18 2012
+++
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/MgcpMessageParser.java
Tue Dec 11 05:12:46 2012
@@ -99,6 +99,8 @@
line=output.output;
currIndex=output.newIndex;
sdp.append(line);
+ if(currIndex<message.length())
+ sdp.append("\r\n");
}
if (logger.isDebugEnabled()) {
=======================================
---
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/Utils.java
Mon Dec 10 15:44:18 2012
+++
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/Utils.java
Tue Dec 11 05:12:46 2012
@@ -836,47 +836,43 @@
// (eventId /"all"/eventRange
// /"*"/"#");for DTMF
// ["@"(ConnectionId /"$"/"*")]
+ decdEventName.clear();
this.split('/', value, this.decdEventName);
// String tokens[] = forwardSlashPattern.split(value, 0);
- try {
- int size = decdEventName.size();
- if (size == 1) {
- return new EventName(PackageName.AllPackages,
MgcpEvent.factory(decdEventName.get(0)).withParm(param));
- } else if (size == 2) {
- int pos =
decdEventName.get(1).indexOf(AMPERSAND);
- if (pos > 0) {
- String cid =
(decdEventName.get(1).substring(pos + 1)).trim();
- ConnectionIdentifier
connectionIdentifier = null;
- if
((ConnectionIdentifier.AnyConnection).toString().equals(cid)) {
- connectionIdentifier =
ConnectionIdentifier.AnyConnection;
- } else if
((ConnectionIdentifier.AllConnections).toString().equals(cid)) {
- connectionIdentifier =
ConnectionIdentifier.AllConnections;
- } else {
- connectionIdentifier = new
ConnectionIdentifier(cid);
- }
- return new EventName(PackageName.factory(decdEventName.get(0)),
MgcpEvent.factory(
- (decdEventName.get(1)).substring(0, pos)).withParm(param),
connectionIdentifier);
+ int size = decdEventName.size();
+ if (size == 1) {
+ return new EventName(PackageName.AllPackages,
MgcpEvent.factory(decdEventName.get(0)).withParm(param));
+ } else if (size == 2) {
+ int pos = decdEventName.get(1).indexOf(AMPERSAND);
+ if (pos > 0) {
+ String cid =
(decdEventName.get(1).substring(pos + 1)).trim();
+ ConnectionIdentifier connectionIdentifier =
null;
+ if
((ConnectionIdentifier.AnyConnection).toString().equals(cid)) {
+ connectionIdentifier =
ConnectionIdentifier.AnyConnection;
+ } else if
((ConnectionIdentifier.AllConnections).toString().equals(cid)) {
+ connectionIdentifier =
ConnectionIdentifier.AllConnections;
} else {
- return new EventName(PackageName.factory(decdEventName.get(0)),
MgcpEvent.factory(
-
decdEventName.get(1)).withParm(param));
+ connectionIdentifier = new
ConnectionIdentifier(cid);
}
- } else if (size == 3) {
- int pos =
decdEventName.get(2).indexOf(AMPERSAND);
- if (pos < 0) {
- throw new ParseException("Invalid token
" + decdEventName.get(2), 0);
- }
-
- String cid =
(decdEventName.get(1)).substring(pos + 1);
return new EventName(PackageName.factory(decdEventName.get(0)),
MgcpEvent.factory(
- (decdEventName.get(1)).substring(0, pos)).withParm(param), new
ConnectionIdentifier(cid));
+ (decdEventName.get(1)).substring(0, pos)).withParm(param),
connectionIdentifier);
} else {
- throw new ParseException("Unexpected event name
" + value, 0);
+ return new EventName(PackageName.factory(decdEventName.get(0)),
MgcpEvent.factory(
+
decdEventName.get(1)).withParm(param));
}
- } finally {
- decdEventName.clear();
- }
+ } else if (size == 3) {
+ int pos = decdEventName.get(2).indexOf(AMPERSAND);
+ if (pos < 0) {
+ throw new ParseException("Invalid token " +
decdEventName.get(2), 0);
+ }
+ String cid = (decdEventName.get(1)).substring(pos + 1);
+ return new EventName(PackageName.factory(decdEventName.get(0)),
MgcpEvent.factory(
+ (decdEventName.get(1)).substring(0, pos)).withParm(param), new
ConnectionIdentifier(cid));
+ } else {
+ throw new ParseException("Unexpected event name " +
value, 0);
+ }
}
public String encodeInfoCodeList(InfoCode[] infoCodes) {
=======================================
---
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/UtilsFactory.java
Sat Sep 15 16:38:09 2012
+++
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/parser/UtilsFactory.java
Tue Dec 11 05:12:46 2012
@@ -25,13 +25,15 @@
import java.util.ArrayList;
import java.util.List;
+import org.mobicents.protocols.mgcp.stack.ConcurrentLinkedList;
+
import org.apache.log4j.Logger;
public class UtilsFactory {
private static final Logger logger =
Logger.getLogger(UtilsFactory.class);
- private List<Utils> list = new ArrayList<Utils>();
+ private ConcurrentLinkedList<Utils> list = new
ConcurrentLinkedList<Utils>();
private int size = 0;
private int count = 0;
@@ -39,18 +41,15 @@
this.size = size;
for (int i = 0; i < size; i++) {
Utils utils = new Utils();
- list.add(utils);
+ list.offer(utils);
}
}
public Utils allocate() {
- Utils utils = null;
+ Utils utils = list.poll();
- if (!list.isEmpty()) {
- utils = list.remove(0);
- if (utils != null) {
- return utils;
- }
+ if (utils != null) {
+ return utils;
}
utils = new Utils();
@@ -63,9 +62,8 @@
}
public void deallocate(Utils utils) {
- if (list.size() < size && utils != null) {
- list.add(utils);
- }
+ //lets not discard will cause gc
+ list.offer(utils);
}
public int getSize() {
=======================================
---
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/stack/DeleteConnectionHandler.java
Sat Dec 8 15:29:16 2012
+++
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/stack/DeleteConnectionHandler.java
Tue Dec 11 05:12:46 2012
@@ -292,10 +292,19 @@
*/
public void param(String name, String value) throws
ParseException {
if(name.length()==1) {
- if(name.charAt(0)=='p' || name.charAt(0)=='P')
-
response.setConnectionParms(utils.decodeConnectionParms(value));
- else
- logger.warn("Unidentified DLCX Response parameter " + name + " with
value = " + value);
+ switch(name.charAt(0))
+ {
+ case 'i':
+ case 'I':
+ //do nothing, should not be
here , but sent by mms
+ break;
+ case 'p':
+ case 'P':
+
response.setConnectionParms(utils.decodeConnectionParms(value));
+ break;
+ default:
+ logger.warn("Unidentified DLCX Response parameter " + name + " with
value = " + value);
+ }
}
else
logger.warn("Unidentified DLCX Response parameter " + name + " with
value = " + value);
=======================================
---
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/stack/JainMgcpStackImpl.java
Sat Dec 8 15:29:16 2012
+++
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/stack/JainMgcpStackImpl.java
Tue Dec 11 05:12:46 2012
@@ -370,14 +370,14 @@
this.sendBuffer.clear();
this.sendBuffer.put(pr.getRawData(),0,pr.getLength());
this.sendBuffer.flip();
-
-
this.channel.send(this.sendBuffer, pr.getInetAddress());
+
this.channel.send(this.sendBuffer, pr.getInetAddress());
} catch (IOException e) {
if(logger.isEnabledFor(Level.ERROR))
{
logger.error("I/O Exception
occured, caused by", e);
}
}
+ this.prFactory.deallocate(pr);
}
finish = System.currentTimeMillis();
=======================================
---
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/utils/PacketRepresentationFactory.java
Sat Sep 15 16:38:09 2012
+++
/client/mgcp/driver/src/main/java/org/mobicents/protocols/mgcp/utils/PacketRepresentationFactory.java
Tue Dec 11 05:12:46 2012
@@ -27,11 +27,13 @@
import org.apache.log4j.Logger;
+import org.mobicents.protocols.mgcp.stack.ConcurrentLinkedList;
+
public class PacketRepresentationFactory {
private static final Logger logger =
Logger.getLogger(PacketRepresentationFactory.class);
- private List<PacketRepresentation> list = new
ArrayList<PacketRepresentation>();
+ private ConcurrentLinkedList<PacketRepresentation> list = new
ConcurrentLinkedList<PacketRepresentation>();
private int size = 0;
private int dataArrSize = 0;
private int count = 0;
@@ -41,18 +43,13 @@
this.dataArrSize = dataArrSize;
for (int i = 0; i < size; i++) {
PacketRepresentation pr = new
PacketRepresentation(dataArrSize, this);
- list.add(pr);
- }
+ list.offer(pr);
+ }
}
public PacketRepresentation allocate() {
- PacketRepresentation pr = null;
+ PacketRepresentation pr = list.poll();
- if (!list.isEmpty()) {
- pr = list.remove(0);
-
- }
-
if(pr!=null){
pr.setLength(0);
return pr;
@@ -62,20 +59,17 @@
count++;
if (logger.isDebugEnabled()) {
- logger.debug("UtilsFactory underflow. Count = " +
count);
+ logger.debug("PRFactory underflow. Count = " + count);
}
- logger.error("UtilsFactory underflow. Count = " + count);
+ logger.error("PRFactory underflow. Count = " + count);
return pr;
}
public void deallocate(PacketRepresentation pr) {
- if (list.size() < size && pr != null) {
- list.add(pr);
- } else{
- System.out.println("Discarding the PR "+pr);
- }
+ //lets not discard will cause gc
+ list.offer(pr);
}
public int getSize() {
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Mon Dec 10 15:44:18 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Tue Dec 11 05:12:46 2012
@@ -13,7 +13,7 @@
Bundle-Vendor: TeleStax, Inc.
Implementation-Vendor-Id: TeleStax, Inc.
Bundle-Version: 3.0.0.FINAL
-Bnd-LastModified: 1355177063505
+Bnd-LastModified: 1355227815134
Bundle-ManifestVersion: 2
Bundle-License: http://www.gnu.org/licenses/lgpl-2.1.html
Bundle-Description: Mobicents :: Parent pom for 2.x releases
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Mon Dec 10 15:44:18 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Tue Dec 11 05:12:46 2012
@@ -1,5 +1,5 @@
#Generated by Maven
-#Tue Dec 11 00:04:23 IST 2012
+#Tue Dec 11 14:10:15 IST 2012
version=3.0.0.FINAL
groupId=org.mobicents.media.docs
artifactId=mobicents-mms-docs-sources
==============================================================================
Revision: e08b3f0e49a9
Author: unknown <yulian@Venera.(none)>
Date: Tue Dec 11 05:16:05 2012
Log: Merge branch 'master' of https://code.google.com/p/mediaserver
Conflicts:
media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
http://code.google.com/p/mediaserver/source/detail?r=e08b3f0e49a9
Modified:
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Tue Dec 11 05:12:46 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Tue Dec 11 05:16:05 2012
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
Created-By: Apache Maven Bundle Plugin
-Built-By: root
-Build-Jdk: 1.6.0_18
+Built-By: jean
+Build-Jdk: 1.6.0_30
Implementation-Title: org.mobicents.media.docs:mobicents-mms-docs-sour
ces
Implementation-Version: 3.0.0.FINAL
@@ -13,7 +13,11 @@
Bundle-Vendor: TeleStax, Inc.
Implementation-Vendor-Id: TeleStax, Inc.
Bundle-Version: 3.0.0.FINAL
+<<<<<<< HEAD
Bnd-LastModified: 1355227815134
+=======
+Bnd-LastModified: 1355227433338
+>>>>>>> 787cdc2bbf670e96361e3476b5d8bd7e01e5221f
Bundle-ManifestVersion: 2
Bundle-License: http://www.gnu.org/licenses/lgpl-2.1.html
Bundle-Description: Mobicents :: Parent pom for 2.x releases
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Tue Dec 11 05:12:46 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Tue Dec 11 05:16:05 2012
@@ -1,5 +1,9 @@
#Generated by Maven
+<<<<<<< HEAD
#Tue Dec 11 14:10:15 IST 2012
+=======
+#Tue Dec 11 13:03:54 CET 2012
+>>>>>>> 787cdc2bbf670e96361e3476b5d8bd7e01e5221f
version=3.0.0.FINAL
groupId=org.mobicents.media.docs
artifactId=mobicents-mms-docs-sources
==============================================================================
Revision: 58b65b61f232
Author: unknown <yulian@Venera.(none)>
Date: Tue Dec 11 05:16:57 2012
Log: Merge branch 'ts1' of https://code.google.com/p/mediaserver
Conflicts:
pom.xml
http://code.google.com/p/mediaserver/source/detail?r=58b65b61f232
Modified:
/pom.xml
=======================================
--- /pom.xml Sat Nov 3 07:01:34 2012
+++ /pom.xml Tue Dec 11 05:16:57 2012
@@ -5,7 +5,7 @@
<parent>
<groupId>org.mobicents</groupId>
<artifactId>mobicents-parent</artifactId>
- <version>2.22</version>
+ <version>6.1.1-TelScale-SNAPSHOT</version>
</parent>
<groupId>org.mobicents.media</groupId>
@@ -224,7 +224,37 @@
without user configuration
-->
+<<<<<<< HEAD
<repositories>
+=======
+ <repositories>
+ <repository>
+ <id>telscale-releases-repository</id>
+ <name>TelScale Releases Repository</name>
+
<url>http://telestax.artifactoryonline.com/telestax/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>telscale-snapshots-repository</id>
+ <name>TelScale Snapshots Repository</name>
+
<url>http://telestax.artifactoryonline.com/telestax/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+>>>>>>> origin/ts1
<repository>
<id>mobicents-public-repository-group</id>
<name>Mobicens Public Maven Repository Group</name>
