talk/app/webrtc/java/jni/peerconnection_jni.cc - Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/app/webrtc/java/jni/peerconnection_jni.cc

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Merge with master Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: talk/app/webrtc/java/jni/peerconnection_jni.cc

diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc

index bf0f0066294c5c9d77a5ebabc0ef2bf5d16a788b..4647d140c0d2a109923f08965e43ad573ee839d4 100644

--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc

+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc

@@ -1374,7 +1374,11 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)(

PCOJava* observer = reinterpret_cast<PCOJava*>(observer_p);

observer->SetConstraints(new ConstraintsWrapper(jni, j_constraints));

rtc::scoped_refptr<PeerConnectionInterface> pc(f->CreatePeerConnection(

- rtc_config, observer->constraints(), NULL, NULL, observer));

+ rtc_config,

+ observer->constraints(),

+ nullptr,

+ rtc::scoped_ptr<webrtc::DtlsIdentityStoreInterface>(nullptr).Pass(),

tommi (sloooow) - chröme 2015/08/18 14:49:35 hmm... could you just pass nullptr here?

+ observer));

return (jlong)pc.release();

}

« talk/app/webrtc/dtlscertificate.h ('K') | « talk/app/webrtc/dtlscertificate.cc ('k') | talk/app/webrtc/objc/RTCPeerConnection.mm » ('j') | talk/app/webrtc/peerconnection.h » ('J')