Commit Graph

24 Commits

Author SHA1 Message Date
f65de8483e Fix sending wrong candidates down to transportchannel.
BUG=4665
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/54489004

Cr-Commit-Position: refs/heads/master@{#9266}
2015-05-22 21:55:26 +00:00
4eddf18b1c Don't crash if SetRemoteDescription is called first with BundlePolicy=max-bundle.
BUG=
R=decurtis@webrtc.org, juberti@google.com

Review URL: https://webrtc-codereview.appspot.com/46149004

Cr-Commit-Position: refs/heads/master@{#9124}
2015-04-30 17:56:21 +00:00
0e209b03bf Update bundle behavior to match BundlePolicy spec in http://rtcweb-wg.github.io/jsep/.
BUG=1574
R=juberti@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36659004

Cr-Commit-Position: refs/heads/master@{#8851}
2015-03-24 16:30:02 +00:00
63a10978e1 Remove troublesome Windows line ending.
R=decurtis@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/48549004

Cr-Commit-Position: refs/heads/master@{#8766}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8766 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-17 21:50:29 +00:00
6ad507ac35 Refactor how the TransportChannels are set in the BaseChannel to rely lesson Session, so that in the future we can rely on Transport instead, and also be able to change Transports on the fly for BUNDLE.
Also, remove channel_name.  It's no longer needed.

This is a part of the big BUNDLE implementation at https://webrtc-codereview.appspot.com/45519004/

R=decurtis@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/43719004

Cr-Commit-Position: refs/heads/master@{#8741}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8741 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-16 20:19:42 +00:00
c04a97f054 Move from BaseSession::GetStats to WebRtcSession::GetTransportStats
This is a part of the big BUNDLE implementation at https://webrtc-codereview.appspot.com/45519004/

Review URL: https://webrtc-codereview.appspot.com/45639004

Cr-Commit-Position: refs/heads/master@{#8739}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8739 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-16 19:32:23 +00:00
990a00c30a Remove unused transport code.
This is a part of the big BUNDLE implementation at https://webrtc-codereview.appspot.com/45519004/

R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49389004

Cr-Commit-Position: refs/heads/master@{#8719}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8719 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-13 18:20:48 +00:00
877ac765ad Cleanup and prepare for bundling.
- Add a GetOptions function. Needed for eventual bundle testing to
  confirm that channel options are preserved.
- Simplify unit tests and cleanup unused code.

This is a re-roll of 8237 (https://webrtc-codereview.appspot.com/39699004) with a default GetOption implementation.

R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/38909004

Cr-Commit-Position: refs/heads/master@{#8245}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8245 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-04 22:03:41 +00:00
520a69e8ea Revert 8238 "Add RefCounting for TransportProxies"
Failing on Mac64_Debug

> Add RefCounting for TransportProxies
> 
> BUG=1574
> R=pthatcher@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/37869004

TBR=decurtis@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/37159004

Cr-Commit-Position: refs/heads/master@{#8243}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8243 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-04 12:46:13 +00:00
c5f697135e Revert 8237 "Cleanup and prepare for bundling."
libjingle_peerconnection_objc_test consistently failing on Mac64 Debug.

> Cleanup and prepare for bundling.
> 
> - Add a GetOptions function. Needed for eventual bundle testing to
>   confirm that channel options are preserved.
> - Simplify unit tests and cleanup unused code.
> 
> BUG=1574
> R=pthatcher@webrtc.org, tommi@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/39699004

TBR=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/34959004

Cr-Commit-Position: refs/heads/master@{#8241}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8241 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-04 10:22:43 +00:00
e2506670a4 Add RefCounting for TransportProxies
BUG=1574
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/37869004

Cr-Commit-Position: refs/heads/master@{#8238}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8238 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-03 23:19:23 +00:00
af01d93aa2 Cleanup and prepare for bundling.
- Add a GetOptions function. Needed for eventual bundle testing to
  confirm that channel options are preserved.
- Simplify unit tests and cleanup unused code.

BUG=1574
R=pthatcher@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/39699004

Cr-Commit-Position: refs/heads/master@{#8237}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8237 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-03 23:14:18 +00:00
357469da5a Fixes reference counting problem when a TransportProxy points to a Transport prior to creating channels.
Until the TransportProxy enters the "negotiated" state we only create
ChannelImpls but we don't hook up to them. However, we still neeed to
reserve their spot and increment the reference count.

Once we are negotiated we can hook all the ChannelProxy's to the
corresponding ChannelImpls.

This change is needed to implement maxbundle.

BUG=1574
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36789004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8082 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-01-15 22:53:49 +00:00
aacc23465b Split up (Jingle)Session from BaseSession. This is part of an ongoing effort to move Jingle-specific code out of WebRTC and into its own repository.
(This is the 3rd try)

R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/29309004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7956 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-18 20:31:29 +00:00
4cb3856a4d Revert "Split up (Jingle)Session from BaseSession. This is part of an ongoing effort to move Jingle-specific code out of WebRTC and into its own repository."
This reverts r7939 because it broke Chromium and other depedent projects that rely on certain logic remaining in p2p/base/session.cc and not in webrtc/libjingle/session.cc.

BUG=
R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36589004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7940 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-18 02:28:25 +00:00
536f999e58 Split up (Jingle)Session from BaseSession. This is part of an ongoing effort to move Jingle-specific code out of WebRTC and into its own repository.
This is an un-revert of r7992 and r7993.

R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/32869004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7939 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-18 01:22:02 +00:00
38881be912 If one of the bundled content is missing in SDP, return false to MaybeEnalbeMuxingSupport().
Verified in chromium. Now the existing content still could work.

BUG=4096
TEST=Manual Test
R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36529004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7926 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-17 05:59:41 +00:00
f050791ba0 Revert "Split up (Jingle)Session from BaseSession. This is part of an ongoing effort to move Jingle-specific code out of WebRTC and into its own repository."
This reverts r7992.

It broke the Chromium build because the Chroumium build relies on the logic in webtc/libjingle/session.cc, but Chromium doesn't compile that file.

R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/38389004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7923 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-16 22:28:03 +00:00
4afb59903c Split up (Jingle)Session from BaseSession. This is part of an ongoing effort to move Jingle-specific code out of WebRTC and into its own repository.
R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/35529004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7922 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-16 21:37:37 +00:00
18a3896bd2 Revert r7886:7887.
Broke build steps in other code that uses securetunnelsessionclient.cc
and others.

TBR=tommi@webrtc.org,pthatcher@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/36439004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7890 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-15 07:03:04 +00:00
dee76f3b89 Move the obvious/easy Jingle-specific code into webrtc/libjingle.
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/32669004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7886 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-12 21:04:42 +00:00
269fb4bc90 move xmpp and p2p to webrtc
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.

BUG=3379

Review URL: https://webrtc-codereview.appspot.com/26999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-28 22:20:11 +00:00
28100cb388 Reverts r7459 "Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p."
BUG=N/A
TBR=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/29829004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7472 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-17 22:03:39 +00:00
d1ba6d9cbf Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p.
BUG=3379
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/27709005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7459 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-15 17:30:28 +00:00