From: Hannes F. <hfr...@us...> - 2007-03-30 06:44:46
|
Update of /cvsroot/openh323/opal/src/h323 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19249/src/h323 Modified Files: Tag: MediaTypeBranch h323ep.cxx Log Message: (Backport from HEAD) Tidied some code when a new connection is created by an endpoint. Now if someone needs to derive a connectino class they can create it without needing to remember to do any more than the new. Fixed various GCC warnings Index: h323ep.cxx =================================================================== RCS file: /cvsroot/openh323/opal/src/h323/h323ep.cxx,v retrieving revision 2.61.2.3 retrieving revision 2.61.2.4 diff -C2 -d -r2.61.2.3 -r2.61.2.4 *** h323ep.cxx 20 Mar 2007 07:52:19 -0000 2.61.2.3 --- h323ep.cxx 30 Mar 2007 06:44:45 -0000 2.61.2.4 *************** *** 28,31 **** --- 28,38 ---- * * $Log$ + * Revision 2.61.2.4 2007/03/30 06:44:45 hfriederich + * (Backport from HEAD) + * Tidied some code when a new connection is created by an endpoint. Now + * if someone needs to derive a connectino class they can create it without + * needing to remember to do any more than the new. + * Fixed various GCC warnings + * * Revision 2.61.2.3 2007/03/20 07:52:19 hfriederich * (Backport from HEAD) *************** *** 612,616 **** connection = CreateConnection(*manager.CreateCall(), token, NULL, *transport, PString::Empty(), PString::Empty(), &pdu); ! if (connection == NULL) { PTRACE(1, "H225\tEndpoint could not create connection, " "sending release complete PDU: callRef=" << callReference); --- 619,623 ---- connection = CreateConnection(*manager.CreateCall(), token, NULL, *transport, PString::Empty(), PString::Empty(), &pdu); ! if (!AddConnection(connection)) { PTRACE(1, "H225\tEndpoint could not create connection, " "sending release complete PDU: callRef=" << callReference); *************** *** 638,643 **** return TRUE; } - - connectionsActive.SetAt(token, connection); } --- 645,648 ---- *************** *** 669,676 **** OpalConnection::StringOptions * stringOptions) { ! H323Connection * conn = new H323Connection(call, *this, token, alias, address, options, stringOptions); ! if (conn != NULL) ! OnNewConnection(call, *conn); ! return conn; } --- 674,678 ---- OpalConnection::StringOptions * stringOptions) { ! return new H323Connection(call, *this, token, alias, address, options, stringOptions); } *************** *** 751,761 **** H323Connection * connection = CreateConnection(call, newToken, userData, *transport, alias, address, NULL, options, stringOptions); ! if (connection == NULL) { PTRACE(1, "H225\tEndpoint could not create connection, aborting setup."); return FALSE; } - connectionsActive.SetAt(newToken, connection); - inUseFlag.Signal(); --- 753,761 ---- H323Connection * connection = CreateConnection(call, newToken, userData, *transport, alias, address, NULL, options, stringOptions); ! if (!AddConnection(connection)) { PTRACE(1, "H225\tEndpoint could not create connection, aborting setup."); return FALSE; } inUseFlag.Signal(); |