Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Issue 1577873003: Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. (Closed)

Created:
4 years, 11 months ago by stefan-webrtc
Modified:
4 years, 11 months ago
Reviewers:
tommi, pthatcher1
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. To reduce the risk of future mistakes when connecting Ports, Port::OnSentPacket was made pure virtual to ensure that new implementations take care of it. BUG=4173 R=pthatcher@webrtc.org Committed: https://crrev.com/7307952a5bf63311e5f9a2a90089a06177e42716 Cr-Commit-Position: refs/heads/master@{#11247}

Patch Set 1 #

Patch Set 2 : Also wired up for TCPPort. #

Total comments: 4

Patch Set 3 : Improve comments. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+39 lines, -12 lines) Patch
M webrtc/p2p/base/p2ptransportchannel.h View 1 1 chunk +1 line, -1 line 0 comments Download
M webrtc/p2p/base/p2ptransportchannel.cc View 1 1 chunk +1 line, -2 lines 0 comments Download
M webrtc/p2p/base/port.h View 1 2 1 chunk +5 lines, -1 line 0 comments Download
M webrtc/p2p/base/port.cc View 1 1 chunk +0 lines, -4 lines 0 comments Download
M webrtc/p2p/base/port_unittest.cc View 1 1 chunk +4 lines, -0 lines 0 comments Download
M webrtc/p2p/base/portinterface.h View 1 1 chunk +1 line, -1 line 0 comments Download
M webrtc/p2p/base/relayport.h View 1 2 2 chunks +6 lines, -1 line 0 comments Download
M webrtc/p2p/base/relayport.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M webrtc/p2p/base/stunport.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M webrtc/p2p/base/tcpport.h View 1 1 chunk +3 lines, -0 lines 0 comments Download
M webrtc/p2p/base/tcpport.cc View 1 2 chunks +7 lines, -0 lines 0 comments Download
M webrtc/p2p/base/turnport.h View 1 chunk +2 lines, -0 lines 0 comments Download
M webrtc/p2p/base/turnport.cc View 1 2 chunks +7 lines, -0 lines 0 comments Download

Messages

Total messages: 23 (11 generated)
stefan-webrtc
4 years, 11 months ago (2016-01-12 13:37:55 UTC) #3
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1577873003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1577873003/1
4 years, 11 months ago (2016-01-12 13:46:47 UTC) #5
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: android_arm64_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
4 years, 11 months ago (2016-01-12 15:47:00 UTC) #7
pthatcher1
lgtm, assuming you improve the comments a bit. https://codereview.webrtc.org/1577873003/diff/20001/webrtc/p2p/base/port.h File webrtc/p2p/base/port.h (right): https://codereview.webrtc.org/1577873003/diff/20001/webrtc/p2p/base/port.h#newcode285 webrtc/p2p/base/port.h:285: // ...
4 years, 11 months ago (2016-01-13 19:42:37 UTC) #9
stefan-webrtc
Improve comments.
4 years, 11 months ago (2016-01-14 10:13:24 UTC) #10
stefan-webrtc
https://codereview.webrtc.org/1577873003/diff/20001/webrtc/p2p/base/port.h File webrtc/p2p/base/port.h (right): https://codereview.webrtc.org/1577873003/diff/20001/webrtc/p2p/base/port.h#newcode285 webrtc/p2p/base/port.h:285: // PortInterface. On 2016/01/13 19:42:36, pthatcher1 wrote: > I ...
4 years, 11 months ago (2016-01-14 10:14:38 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1577873003/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1577873003/40001
4 years, 11 months ago (2016-01-14 10:14:48 UTC) #14
commit-bot: I haz the power
Try jobs failed on following builders: android_arm64_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
4 years, 11 months ago (2016-01-14 12:15:15 UTC) #16
stefan-webrtc
Committed patchset #3 (id:40001) manually as 7307952a5bf63311e5f9a2a90089a06177e42716 (presubmit successful).
4 years, 11 months ago (2016-01-14 12:16:04 UTC) #18
commit-bot: I haz the power
Patchset 3 (id:??) landed as https://crrev.com/7307952a5bf63311e5f9a2a90089a06177e42716 Cr-Commit-Position: refs/heads/master@{#11247}
4 years, 11 months ago (2016-01-14 12:16:06 UTC) #20
tommi
Looks like this broke chrome: https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_compile_dbg_ng/builds/143025/steps/compile%20%28with%20patch%29/logs/stdio Need to revert since it's blocking the roll.
4 years, 11 months ago (2016-01-14 12:55:59 UTC) #22
tommi
4 years, 11 months ago (2016-01-14 12:56:42 UTC) #23
Message was sent while issue was closed.
A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.webrtc.org/1586063002/ by tommi@webrtc.org.

The reason for reverting is: Broke Chrome:

https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium...

FAILED: cd ../../third_party/libjingle; python
../../native_client/build/build_nexe.py --root ../.. --product-dir
../../out/Debug/xyz --config-name Debug -t ../../native_client/toolchain/ --arch
pnacl --build newlib_plib --name
../../out/Debug/gen/tc_pnacl_newlib/lib/libjingle_nacl.a --objdir
../../out/Debug/obj/third_party/libjingle/libjingle_nacl.gen/pnacl_newlib-pnacl/libjingle_nacl
"--include-dirs=../../out/Debug/gen/tc_pnacl_newlib/include ../..
\"../../out/Debug/gen\" ./source ../ ../../native_client_sdk/src/libraries
../../native_client_sdk/src/libraries/nacl_io/include
../../native_client_sdk/src/libraries/third_party/newlib-extras
../expat/files/lib ../boringssl/src/include" "--compile_flags=-O2 -g -Wall
-fdiagnostics-show-option -Werror  -Wno-unused-function -Wno-char-subscripts
-Wno-c++11-extensions -Wno-unnamed-type-template-args -Wno-extra-semi
-Wno-unused-private-field -Wno-char-subscripts -Wno-unused-function
\"-std=gnu++11\" " --gomadir /b/build/goma "--defines=\"__STDC_LIMIT_MACROS=1\"
\"__STDC_FORMAT_MACROS=1\" \"_GNU_SOURCE=1\" \"_POSIX_C_SOURCE=199506\"
\"_XOPEN_SOURCE=600\" \"DYNAMIC_ANNOTATIONS_ENABLED=1\"
\"DYNAMIC_ANNOTATIONS_PREFIX=NACL_\" \"NACL_BUILD_ARCH=x86\"
V8_DEPRECATION_WARNINGS \"CLD_VERSION=2\" \"_FILE_OFFSET_BITS=64\"
CHROMIUM_BUILD \"CR_CLANG_REVISION=255169-1\" COMPONENT_BUILD
UI_COMPOSITOR_IMAGE_TRANSPORT \"USE_AURA=1\" \"USE_ASH=1\" \"USE_PANGO=1\"
\"USE_CAIRO=1\" \"USE_DEFAULT_RENDER_THEME=1\" \"USE_LIBJPEG_TURBO=1\"
\"USE_X11=1\" \"IMAGE_LOADER_EXTENSION=1\" \"ENABLE_WEBRTC=1\"
\"ENABLE_MEDIA_ROUTER=1\" USE_PROPRIETARY_CODECS ENABLE_PEPPER_CDMS
ENABLE_CONFIGURATION_POLICY ENABLE_NOTIFICATIONS \"ENABLE_HIDPI=1\"
\"ENABLE_TOPCHROME_MD=1\" USE_UDEV DONT_EMBED_BUILD_METADATA
\"DCHECK_ALWAYS_ON=1\" FIELDTRIAL_TESTING_ENABLED \"ENABLE_TASK_MANAGER=1\"
\"ENABLE_EXTENSIONS=1\" \"ENABLE_PDF=1\" \"ENABLE_PLUGINS=1\"
\"ENABLE_SESSION_SERVICE=1\" \"ENABLE_THEMES=1\" \"ENABLE_AUTOFILL_DIALOG=1\"
\"ENABLE_BACKGROUND=1\" \"ENABLE_PRINTING=1\" \"ENABLE_PRINT_PREVIEW=1\"
\"ENABLE_SPELLCHECK=1\" \"ENABLE_CAPTIVE_PORTAL_DETECTION=1\"
\"ENABLE_APP_LIST=1\" \"ENABLE_SUPERVISED_USERS=1\" \"ENABLE_MDNS=1\"
\"ENABLE_SERVICE_DISCOVERY=1\" V8_USE_EXTERNAL_STARTUP_DATA FULL_SAFE_BROWSING
SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL EXPAT_RELATIVE_PATH FEATURE_ENABLE_SSL
GTEST_RELATIVE_PATH HAVE_OPENSSL_SSL_H NO_MAIN_THREAD_WRAPPING NO_SOUND_SYSTEM
WEBRTC_POSIX SRTP_RELATIVE_PATH SSL_USE_OPENSSL USE_WEBRTC_DEV_BRANCH
\"timezone=_timezone\" XML_STATIC \"USE_LIBPCI=1\" \"USE_OPENSSL=1\"
\"USE_OPENSSL_CERTS=1\"" "--link_flags=-B../../out/Debug/gen/tc_pnacl_newlib/lib
 "
"--source-list=../../out/gypfiles/third_party/libjingle/pnacl_newlib.libjingle_nacl.source_list.gypcmd"
In file included from ../webrtc/p2p/base/tcpport.cc:67:
../webrtc/p2p/base/tcpport.h:50:23: error: 'CreateConnection' overrides a member
function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
  virtual Connection* CreateConnection(const Candidate& address,
                      ^
../webrtc/p2p/base/portinterface.h:71:23: note: overridden virtual function is
here
  virtual Connection* CreateConnection(
                      ^
In file included from ../webrtc/p2p/base/tcpport.cc:67:
../webrtc/p2p/base/tcpport.h:53:16: error: 'PrepareAddress' overrides a member
function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
  virtual void PrepareAddress();
               ^
../webrtc/p2p/base/portinterface.h:63:16: note: overridden virtual function is
here
  virtual void PrepareAddress() = 0;
               ^

(etc).

Powered by Google App Engine
This is Rietveld 408576698