Revision: 89
Author: [email protected]
Date: Mon Feb 18 02:17:44 2013
Log: Redundant state info is removed from logging;
rommClient is started only on first successful registration;
http://code.google.com/p/red5phone/source/detail?r=89
Modified:
/branches/red5sip/src/java/org/red5/sip/app/Application.java
/branches/red5sip/src/java/org/red5/sip/app/RTMPRoomClient.java
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/Application.java Thu Feb 14
08:34:08 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/Application.java Mon Feb 18
02:17:44 2013
@@ -13,34 +13,32 @@
import org.zoolu.sip.address.NameAddress;
public class Application implements Daemon {
-
private static final Logger log =
LoggerFactory.getLogger(Application.class);
-
private static final int SIP_START_PORT = 5070;
private static final int SOUND_START_PORT = 3010;
-
private static int sipPort = SIP_START_PORT;
private static int soundPort = SOUND_START_PORT;
-
private Properties props = null;
-
private Map<Integer, SIPTransport> transportMap = new HashMap<Integer,
SIPTransport>();
-
private RTMPControlClient rtmpControlClient;
+ boolean startRoomClient = true;
- public static SIPTransport createSIPTransport(Properties prop, int
room_id) {
+ private SIPTransport createSIPTransport(Properties prop, int room_id) {
log.info("Creating SIP trasport for room: " + room_id);
RTPStreamSender.useASAO =
prop.getProperty("red5.codec", "asao").equals("asao");
RTMPRoomClient roomClient = new RTMPRoomClient(
prop.getProperty("red5.host")
, prop.getProperty("om.context", "openmeetings")
, room_id);
+
SIPTransport sipTransport = new SIPTransport(roomClient,
sipPort++, soundPort++) {
public void onUaRegistrationSuccess(SIPRegisterAgent ra,
NameAddress target, NameAddress contact, String result) {
-
log.info("Registered successfully");
this.roomClient.setSipNumberListener(this);
- this.roomClient.start();
+ if (Application.this.startRoomClient) {
+ this.roomClient.start();
+ Application.this.startRoomClient = false;
+ }
}
public void onUaRegistrationFailure(SIPRegisterAgent ra,
NameAddress target, NameAddress contact, String result) {
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/RTMPRoomClient.java Mon Feb
18 01:25:36 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/RTMPRoomClient.java Mon Feb
18 02:17:44 2013
@@ -216,7 +216,7 @@
@Override
public void connectionOpened(RTMPConnection conn, RTMP state) {
- log.debug("RTMP Connection opened" + state);
+ log.debug("RTMP Connection opened");
super.connectionOpened( conn, state );
this.conn = conn;
retryNumber = 0;
@@ -231,7 +231,7 @@
@Override
public void connectionClosed(RTMPConnection conn, RTMP state) {
- log.debug("RTMP Connection closed" + state);
+ log.debug("RTMP Connection closed");
super.connectionClosed( conn, state );
if(reconnect && ++retryNumber < MAX_RETRY_NUMBER) {
try {
