Update of /usr/cvsroot/asterisk/channels/h323
In directory mongoose.digium.com:/tmp/cvs-serv12625
Modified Files:
ast_h323.cpp ast_h323.h
Log Message:
re-apply possible CCM fix. Someone still needs to test this
Index: ast_h323.cpp
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ast_h323.cpp 20 Mar 2004 14:24:20 -0000 1.38
+++ ast_h323.cpp 20 Mar 2004 14:29:36 -0000 1.39
@@ -687,7 +687,7 @@
cout << " -- SessionID: " << sessionID << endl;
cout << " -- Direction: " << dir << endl;
}
- return new H323_ExternalRTPChannel(*this, capability, dir, sessionID, externalIpAddress, externalPort);
+ return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID, externalIpAddress, externalPort);
}
/** This callback function is invoked once upon creation of each
@@ -720,6 +720,63 @@
return TRUE;
}
+/* MyH323_ExternalRTPChannel */
+MyH323_ExternalRTPChannel::MyH323_ExternalRTPChannel(MyH323Connection & connection,
+ const H323Capability & capability,
+ Directions direction,
+ unsigned sessionID,
+ const PIPSocket::Address & ip,
+ WORD dataPort)
+ : H323_ExternalRTPChannel(connection, capability, direction, sessionID, ip, dataPort)
+{
+ if (h323debug) {
+ cout << " == New H.323 ExternalRTPChannel created." << endl;
+ }
+ return;
+}
+
+MyH323_ExternalRTPChannel::~MyH323_ExternalRTPChannel()
+{
+ if (h323debug) {
+ cout << " == H.323 ExternalRTPChannel deleted." << endl;
+ }
+ return;
+}
+
+BOOL MyH323_ExternalRTPChannel::OnReceivedPDU(
+ const H245_H2250LogicalChannelParameters & param,
+ unsigned & errorCode)
+{
+ if (h323debug) {
+ cout << " MyH323_ExternalRTPChannel::OnReceivedPDU " << endl;
+ }
+ return H323_ExternalRTPChannel::OnReceivedPDU( param, errorCode );
+}
+
+BOOL MyH323_ExternalRTPChannel::OnReceivedAckPDU(
+ const H245_H2250LogicalChannelAckParameters & param)
+{
+
+ PIPSocket::Address remoteIpAddress; // IP Address of remote endpoint
+ WORD remotePort; // remote endpoint Data port (control is dataPort+1)
+
+ if (h323debug) {
+ cout << " MyH323_ExternalRTPChannel::OnReceivedAckPDU " << endl;
+ }
+
+ if (H323_ExternalRTPChannel::OnReceivedAckPDU( param )) {
+ GetRemoteAddress(remoteIpAddress, remotePort);
+ if (h323debug) {
+ cout << " -- remoteIpAddress: " << remoteIpAddress << endl;
+ cout << " -- remotePort: " << remotePort << endl;
+ }
+ /* Notify Asterisk of remote RTP information */
+ on_start_logical_channel(connection.GetCallReference(), (const char *)remoteIpAddress.AsString(), remotePort);
+ return TRUE;
+ }
+ return FALSE;
+}
+
/** IMPLEMENTATION OF C FUNCTIONS */
@@ -1096,6 +1153,4 @@
}
} /* extern "C" */
-
-
Index: ast_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ast_h323.h 20 Mar 2004 14:24:20 -0000 1.19
+++ ast_h323.h 20 Mar 2004 14:29:36 -0000 1.20
@@ -253,6 +253,26 @@
BOOL bridging; // Used to help determine which IP to use
};
+class MyH323_ExternalRTPChannel : public H323_ExternalRTPChannel {
+
+ PCLASSINFO(MyH323_ExternalRTPChannel, H323_ExternalRTPChannel);
+
+ public:
+
+ MyH323_ExternalRTPChannel(MyH323Connection &, const H323Capability &, Directions,
+ unsigned, const PIPSocket::Address &, WORD);
+
+ ~MyH323_ExternalRTPChannel();
+
+ BOOL OnReceivedPDU(
+ const H245_H2250LogicalChannelParameters & param, /// Acknowledgement PDU
+ unsigned & errorCode /// Error on failure
+ );
+
+ BOOL OnReceivedAckPDU(const H245_H2250LogicalChannelAckParameters & param);
+
+};
+
/**
* The MyProcess is a necessary descendant PProcess class so that the H323EndPoint
* objected to be created from within that class. (Who owns main() problem).
@@ -268,5 +288,4 @@
};
-