[Openh323-cvs] opal/src/rtp rtp.cxx,2.25.2.2,2.25.2.3

[Damien S. <dsa...@us...>]

Update of /cvsroot/openh323/opal/src/rtp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15809/src/rtp

Modified Files:
      Tag: Phobos
	rtp.cxx 
Log Message:
Backported STUN sockets pair fix from HEAD.


Index: rtp.cxx
===================================================================
RCS file: /cvsroot/openh323/opal/src/rtp/rtp.cxx,v
retrieving revision 2.25.2.2
retrieving revision 2.25.2.3
diff -C2 -d -r2.25.2.2 -r2.25.2.3
*** rtp.cxx	6 Feb 2006 04:38:38 -0000	2.25.2.2
--- rtp.cxx	28 Mar 2006 11:21:19 -0000	2.25.2.3
***************
*** 28,31 ****
--- 28,39 ----
   *
   * $Log$
+  * Revision 2.25.2.3  2006/03/28 11:21:19  dsandras
+  * Backported STUN sockets pair fix from HEAD.
+  *
+  * Revision 2.29  2006/03/28 11:20:22  dsandras
+  * If STUN can not create a socket pair for RTP/RTCP, create separate sockets
+  * and continue. At worse, RTCP won't be received. The SIP part could reuse
+  * the RTCP port (different from RTP port + 1) in its SDP if required.
+  *
   * Revision 2.25.2.2  2006/02/06 04:38:38  csoutheren
   * Backported RTP payload mapping fixes from CVS head
***************
*** 1664,1669 ****
      }
      else {
!       PTRACE(1, "RTP\tSTUN could not create socket pair!");
!       return FALSE;
      }
    }
--- 1672,1686 ----
      }
      else {
!       PTRACE(1, "RTP\tSTUN could not create RTP/RTCP socket pair; trying to create RTP socket anyway.");
!       if (stun->CreateSocket(dataSocket)) {
! 	dataSocket->GetLocalAddress(localAddress, localDataPort);
!       }
!       else {
! 	PTRACE(1, "RTP\tSTUN could not create RTP socket either.");
! 	return FALSE;
!       }
!       if (stun->CreateSocket(controlSocket)) {
! 	controlSocket->GetLocalAddress(localAddress, localControlPort);
!       }
      }
    }