1692610 - Port bug 1690615: Extract the dns lookup from nsSocketTransport

Status: RESOLVED FIXED

(Thunderbird :: Upstream Synchronization, task)

Description

[Rob Lemley [:rjl]]

Busted build...

[task 2021-02-12T22:08:00.636Z] 22:08:00     INFO -  /builds/worker/fetches/sccache/sccache /builds/worker/fetches/clang/bin/clang-cl -Xclang -std=c++17 -FonsImapProtocol.obj -c  -I/builds/worker/workspace/obj-build/dist/stl_wrappers -guard:cf -DNDEBUG=1 -DTRIMMED=1 -DWINAPI_NO_BUNDLED_LIBRARIES -DMOZ_HAS_MOZGLUE -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL -DSTATIC_EXPORTABLE_JS_API -I/builds/worker/checkouts/gecko/comm/mailnews/imap/src -I/builds/worker/workspace/obj-build/comm/mailnews/imap/src -I/builds/worker/checkouts/gecko/ipc/chromium/src -I/builds/worker/checkouts/gecko/netwerk/base -I/builds/worker/workspace/obj-build/dist/include -I/builds/worker/workspace/obj-build/dist/include/nspr -I/builds/worker/workspace/obj-build/dist/include/nss -MD -FI /builds/worker/workspace/obj-build/mozilla-config.h -DMOZILLA_CLIENT -Qunused-arguments -Qunused-arguments -fcrash-diagnostics-dir=/builds/worker/artifacts -TP -Zc:sizedDealloc- -D_HAS_EXCEPTIONS=0 -W3 -Gy -Zc:inline -Gw -Wno-inline-new-delete -Wno-invalid-offsetof -Wno-microsoft-enum-value -Wno-microsoft-include -Wno-unknown-pragmas -Wno-ignored-pragmas -Wno-deprecated-declarations -Wno-invalid-noreturn -Wno-inconsistent-missing-override -Wno-implicit-exception-spec-mismatch -Wno-microsoft-exception-spec -Wno-unused-local-typedef -Wno-ignored-attributes -Wno-used-but-marked-unused -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING -GR- -Z7 -Xclang -load -Xclang /builds/worker/workspace/obj-build/build/clang-plugin/libclang-plugin.so -Xclang -add-plugin -Xclang moz-check -O2 -Oy- -Werror -Xclang -fexperimental-new-pass-manager  -Xclang -MP -Xclang -dependency-file -Xclang .deps/nsImapProtocol.obj.pp -Xclang -MT -Xclang nsImapProtocol.obj   /builds/worker/checkouts/gecko/comm/mailnews/imap/src/nsImapProtocol.cpp
[task 2021-02-12T22:08:00.637Z] 22:08:00     INFO -  /builds/worker/checkouts/gecko/comm/mailnews/imap/src/nsImapProtocol.cpp(978,78): error: too few arguments to function call, expected 6, have 5
[task 2021-02-12T22:08:00.637Z] 22:08:00     INFO -                                        aProxyInfo, getter_AddRefs(m_transport));
[task 2021-02-12T22:08:00.638Z] 22:08:00     INFO -                                                                               ^
[task 2021-02-12T22:08:00.640Z] 22:08:00     INFO -  /builds/worker/workspace/obj-build/dist/include/nsISocketTransportService.h(92,14): note: 'CreateTransport' declared here
[task 2021-02-12T22:08:00.641Z] 22:08:00     INFO -    NS_IMETHOD CreateTransport(const nsTArray<nsCString >& aSocketTypes, const nsACString& aHost, int32_t aPort, nsIProxyInfo *aProxyInfo, nsIDNSRecord *dnsRecord, nsISocketTransport **_retval) = 0;
[task 2021-02-12T22:08:00.642Z] 22:08:00     INFO -               ^
[task 2021-02-12T22:08:00.642Z] 22:08:00     INFO -  /builds/worker/checkouts/gecko/comm/mailnews/imap/src/nsImapProtocol.cpp(984,68): error: too few arguments to function call, expected 6, have 5
[task 2021-02-12T22:08:00.642Z] 22:08:00     INFO -                                          getter_AddRefs(m_transport));
[task 2021-02-12T22:08:00.642Z] 22:08:00     INFO -                                                                     ^
[task 2021-02-12T22:08:00.642Z] 22:08:00     INFO -  /builds/worker/workspace/obj-build/dist/include/nsISocketTransportService.h(92,14): note: 'CreateTransport' declared here
[task 2021-02-12T22:08:00.643Z] 22:08:00     INFO -    NS_IMETHOD CreateTransport(const nsTArray<nsCString >& aSocketTypes, const nsACString& aHost, int32_t aPort, nsIProxyInfo *aProxyInfo, nsIDNSRecord *dnsRecord, nsISocketTransport **_retval) = 0;
[task 2021-02-12T22:08:00.643Z] 22:08:00     INFO -               ^
[task 2021-02-12T22:08:00.643Z] 22:08:00     INFO -  2 errors generated.
[task 2021-02-12T22:08:00.644Z] 22:08:00    ERROR -  make[4]: *** [/builds/worker/checkouts/gecko/config/rules.mk:676: nsImapProtocol.obj] Error 1

Comment 1

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/1399ae652655
Port bug 1690615: Update calls to createTransport. rs=bustage-fix

Comment 2

[Rob Lemley [:rjl]]

Attachment: Bug 1692610 - Port bug 1690615: Update calls to createTransport. rs=bustage-fix

Comment 3

[Rob Lemley [:rjl]]

Reopening to fix chat not connecting:

 NS_ERROR_XPC_NOT_ENOUGH_ARGS: Not enough arguments [nsIRoutedSocketTransportService.createRoutedTransport] socket.jsm:535
    _createTransport resource:///modules/socket.jsm:535
    onProxyAvailable resource:///modules/socket.jsm:367
    openIMAccountWizard chrome://messenger/content/mailCore.js:649
    oncommand chrome://messenger/content/messenger.xhtml:1

Comment 4

[Rob Lemley [:rjl]]

Attachment: Bug 1692610 - Follow-up: Add new arguments to createRoutedTransport(). r=mkmelin

Fix for chat.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/29b753301550
Follow-up: Add new arguments to createRoutedTransport(). r=mkmelin

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/3b2642c81087
follow-up to clang format. rs=clang-format