Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674

Merged
scalablecory merged 5 commits into
dotnet:masterfrom
tmds:connectasync_saea
Apr 3, 2020
Merged

Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom
tmds:connectasync_saea

Conversation

@tmds

@tmdstmds commented Mar 17, 2020

Copy link
Copy Markdown
Member

These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.

cc @stephentoub@antonfirsov @dotnet/ncl

antonfirsov
antonfirsov approved these changes Mar 17, 2020
View reviewed changes

@antonfirsovantonfirsov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@davidshdavidsh added this to the 5.0 milestone Mar 17, 2020
@davidsh

davidsh commented Mar 17, 2020

Copy link
Copy Markdown
Contributor

We'll want to run Outerloop tests before this can be merged.

scalablecory
scalablecory reviewed Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs Outdated
scalablecory
scalablecory approved these changes Mar 17, 2020
View reviewed changes

@scalablecoryscalablecory left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.

@antonfirsov

antonfirsov commented Mar 19, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.

@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.

@tmdstmds changed the title Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov

antonfirsov commented Mar 21, 2020

Copy link
Copy Markdown
Contributor

/azp run runtime-libraries outerloop

@azure-pipelines

azure-pipelinesBot commented Mar 21, 2020

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@antonfirsov

antonfirsov commented Mar 21, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .

I guess we are still missing something about that obscure _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.

tmds
tmds commented Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
{
try
{
if (_currentSocket!.SocketType != SocketType.Stream)

@tmdstmdsMar 21, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.

@scalablecoryscalablecoryMar 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.

@tmdstmdsMar 21, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.
We added the check because UDP socket gave an error.

@jaredparjaredpar mentioned this pull request Mar 21, 2020
Closed
@tmds

tmds commented Mar 21, 2020

Copy link
Copy Markdown
MemberAuthor

@antonfirsov , you can push commits to this branch.

@antonfirsovantonfirsov added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Mar 21, 2020
@ericstjericstj mentioned this pull request Mar 23, 2020
Closed
@tmds

tmds commented Mar 31, 2020

Copy link
Copy Markdown
MemberAuthor

@antonfirsov I noticed the failures are not Windows-only, I will investigate further.

@antonfirsov

antonfirsov commented Mar 31, 2020

Copy link
Copy Markdown
Contributor

@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.

@tmds

tmds commented Apr 2, 2020

Copy link
Copy Markdown
MemberAuthor

@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?

@scalablecory

scalablecory commented Apr 2, 2020

Copy link
Copy Markdown
Contributor

Thank you! Will take a look shortly.

@antonfirsov

antonfirsov commented Apr 2, 2020

Copy link
Copy Markdown
Contributor

/azp run runtime-libraries outerloop

@azure-pipelines

azure-pipelinesBot commented Apr 2, 2020

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

antonfirsov
antonfirsov reviewed Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

return (_socketType == SocketType.Stream) &&
(_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
(remoteEP.AddressFamily != AddressFamily.Unix);

@antonfirsovantonfirsovApr 3, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?

@tmdstmdsApr 3, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.

antonfirsov
antonfirsov approved these changes Apr 3, 2020
View reviewed changes

@antonfirsovantonfirsov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.

@antonfirsovantonfirsov removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Apr 3, 2020
scalablecory
scalablecory approved these changes Apr 3, 2020
View reviewed changes

@scalablecoryscalablecory left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.

@scalablecory
scalablecory merged commit b755ba9 into dotnet:masterApr 3, 2020
@tmdstmds mentioned this pull request Apr 6, 2020
Merged
@wfurtwfurt mentioned this pull request Jul 14, 2020
Closed
@ghostghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@stephentoubstephentoubstephentoub left review comments
+2 more reviewers
@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-System.Net.Sockets

Projects

None yet

Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674
Merged
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Apr 3, 2020
Merged
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Conversation
@tmds
@tmdstmds
commented
Mar 17, 2020

Copy link


Copy Markdown

Member
These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.
cc @stephentoub@antonfirsov @dotnet/ncl
antonfirsov
antonfirsov
approved these changes
Mar 17, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@davidshdavidsh
added this to the 5.0 milestone
Mar 17, 2020
@davidsh
davidsh
commented
Mar 17, 2020

Copy link


Copy Markdown

Contributor
We'll want to run Outerloop tests before this can be merged.
scalablecory
scalablecory
reviewed
Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
Outdated

scalablecory
scalablecory
approved these changes
Mar 17, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.
@antonfirsov
antonfirsov
commented
Mar 19, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.
@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.
@tmdstmds
changed the title
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov
antonfirsov
commented
Mar 21, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Mar 21, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@antonfirsov
antonfirsov
commented
Mar 21, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .
I guess we are still missing something about that obscure  _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.
tmds
tmds
commented
Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
 {
 try
 {
 if (_currentSocket!.SocketType != SocketType.Stream)
@tmdstmdsMar 21, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.
@scalablecoryscalablecoryMar 21, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.
@tmdstmdsMar 21, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.

We added the check because UDP socket gave an error.
@jaredparjaredpar
mentioned this pull request
Mar 21, 2020

Closed

@tmds
tmds
commented
Mar 21, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov , you can push commits to this branch.
@antonfirsovantonfirsov
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Mar 21, 2020
@ericstjericstj
mentioned this pull request
Mar 23, 2020

Closed

@tmds
tmds
commented
Mar 31, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov I noticed the failures are not Windows-only, I will investigate further.
@antonfirsov
antonfirsov
commented
Mar 31, 2020

Copy link


Copy Markdown

Contributor
@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.
@tmds
tmds
commented
Apr 2, 2020

Copy link


Copy Markdown

MemberAuthor
@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?
@scalablecory
scalablecory
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
Thank you! Will take a look shortly.
@antonfirsov
antonfirsov
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 2, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
antonfirsov
antonfirsov
reviewed
Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

 return (_socketType == SocketType.Stream) &&
 (_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
 (remoteEP.AddressFamily != AddressFamily.Unix);
@antonfirsovantonfirsovApr 3, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?
@tmdstmdsApr 3, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.
antonfirsov
antonfirsov
approved these changes
Apr 3, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.
@antonfirsovantonfirsov
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Apr 3, 2020
scalablecory
scalablecory
approved these changes
Apr 3, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.
@scalablecory
scalablecory
merged commit b755ba9
into
dotnet:masterApr 3, 2020
@tmdstmds
mentioned this pull request
Apr 6, 2020
 Merged

@wfurtwfurt
mentioned this pull request
Jul 14, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@stephentoubstephentoubstephentoub left review comments

+2 more reviewers

@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net.Sockets

Projects


None yet


Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674
Merged
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Apr 3, 2020
Merged
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Conversation
@tmds
@tmdstmds
commented
Mar 17, 2020

Copy link


Copy Markdown

Member
These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.
cc @stephentoub@antonfirsov @dotnet/ncl
antonfirsov
antonfirsov
approved these changes
Mar 17, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@davidshdavidsh
added this to the 5.0 milestone
Mar 17, 2020
@davidsh
davidsh
commented
Mar 17, 2020

Copy link


Copy Markdown

Contributor
We'll want to run Outerloop tests before this can be merged.
scalablecory
scalablecory
reviewed
Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
Outdated

scalablecory
scalablecory
approved these changes
Mar 17, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.
@antonfirsov
antonfirsov
commented
Mar 19, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.
@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.
@tmdstmds
changed the title
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov
antonfirsov
commented
Mar 21, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Mar 21, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@antonfirsov
antonfirsov
commented
Mar 21, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .
I guess we are still missing something about that obscure  _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.
tmds
tmds
commented
Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
 {
 try
 {
 if (_currentSocket!.SocketType != SocketType.Stream)
@tmdstmdsMar 21, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.
@scalablecoryscalablecoryMar 21, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.
@tmdstmdsMar 21, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.

We added the check because UDP socket gave an error.
@jaredparjaredpar
mentioned this pull request
Mar 21, 2020

Closed

@tmds
tmds
commented
Mar 21, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov , you can push commits to this branch.
@antonfirsovantonfirsov
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Mar 21, 2020
@ericstjericstj
mentioned this pull request
Mar 23, 2020

Closed

@tmds
tmds
commented
Mar 31, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov I noticed the failures are not Windows-only, I will investigate further.
@antonfirsov
antonfirsov
commented
Mar 31, 2020

Copy link


Copy Markdown

Contributor
@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.
@tmds
tmds
commented
Apr 2, 2020

Copy link


Copy Markdown

MemberAuthor
@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?
@scalablecory
scalablecory
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
Thank you! Will take a look shortly.
@antonfirsov
antonfirsov
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 2, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
antonfirsov
antonfirsov
reviewed
Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

 return (_socketType == SocketType.Stream) &&
 (_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
 (remoteEP.AddressFamily != AddressFamily.Unix);
@antonfirsovantonfirsovApr 3, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?
@tmdstmdsApr 3, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.
antonfirsov
antonfirsov
approved these changes
Apr 3, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.
@antonfirsovantonfirsov
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Apr 3, 2020
scalablecory
scalablecory
approved these changes
Apr 3, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.
@scalablecory
scalablecory
merged commit b755ba9
into
dotnet:masterApr 3, 2020
@tmdstmds
mentioned this pull request
Apr 6, 2020
 Merged

@wfurtwfurt
mentioned this pull request
Jul 14, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@stephentoubstephentoubstephentoub left review comments

+2 more reviewers

@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net.Sockets

Projects


None yet


Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674
Merged
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Apr 3, 2020
Merged
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Conversation
@tmds
@tmdstmds
commented
Mar 17, 2020

Copy link


Copy Markdown

Member
These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.
cc @stephentoub@antonfirsov @dotnet/ncl
antonfirsov
antonfirsov
approved these changes
Mar 17, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@davidshdavidsh
added this to the 5.0 milestone
Mar 17, 2020
@davidsh
davidsh
commented
Mar 17, 2020

Copy link


Copy Markdown

Contributor
We'll want to run Outerloop tests before this can be merged.
scalablecory
scalablecory
reviewed
Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
Outdated

scalablecory
scalablecory
approved these changes
Mar 17, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.
@antonfirsov
antonfirsov
commented
Mar 19, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.
@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.
@tmdstmds
changed the title
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov
antonfirsov
commented
Mar 21, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Mar 21, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@antonfirsov
antonfirsov
commented
Mar 21, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .
I guess we are still missing something about that obscure  _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.
tmds
tmds
commented
Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
 {
 try
 {
 if (_currentSocket!.SocketType != SocketType.Stream)
@tmdstmdsMar 21, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.
@scalablecoryscalablecoryMar 21, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.
@tmdstmdsMar 21, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.

We added the check because UDP socket gave an error.
@jaredparjaredpar
mentioned this pull request
Mar 21, 2020

Closed

@tmds
tmds
commented
Mar 21, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov , you can push commits to this branch.
@antonfirsovantonfirsov
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Mar 21, 2020
@ericstjericstj
mentioned this pull request
Mar 23, 2020

Closed

@tmds
tmds
commented
Mar 31, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov I noticed the failures are not Windows-only, I will investigate further.
@antonfirsov
antonfirsov
commented
Mar 31, 2020

Copy link


Copy Markdown

Contributor
@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.
@tmds
tmds
commented
Apr 2, 2020

Copy link


Copy Markdown

MemberAuthor
@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?
@scalablecory
scalablecory
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
Thank you! Will take a look shortly.
@antonfirsov
antonfirsov
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 2, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
antonfirsov
antonfirsov
reviewed
Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

 return (_socketType == SocketType.Stream) &&
 (_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
 (remoteEP.AddressFamily != AddressFamily.Unix);
@antonfirsovantonfirsovApr 3, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?
@tmdstmdsApr 3, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.
antonfirsov
antonfirsov
approved these changes
Apr 3, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.
@antonfirsovantonfirsov
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Apr 3, 2020
scalablecory
scalablecory
approved these changes
Apr 3, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.
@scalablecory
scalablecory
merged commit b755ba9
into
dotnet:masterApr 3, 2020
@tmdstmds
mentioned this pull request
Apr 6, 2020
 Merged

@wfurtwfurt
mentioned this pull request
Jul 14, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@stephentoubstephentoubstephentoub left review comments

+2 more reviewers

@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net.Sockets

Projects


None yet


Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674
Merged
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Apr 3, 2020
Merged
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Conversation
@tmds
@tmdstmds
commented
Mar 17, 2020

Copy link


Copy Markdown

Member
These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.
cc @stephentoub@antonfirsov @dotnet/ncl
antonfirsov
antonfirsov
approved these changes
Mar 17, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@davidshdavidsh
added this to the 5.0 milestone
Mar 17, 2020
@davidsh
davidsh
commented
Mar 17, 2020

Copy link


Copy Markdown

Contributor
We'll want to run Outerloop tests before this can be merged.
scalablecory
scalablecory
reviewed
Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
Outdated

scalablecory
scalablecory
approved these changes
Mar 17, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.
@antonfirsov
antonfirsov
commented
Mar 19, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.
@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.
@tmdstmds
changed the title
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov
antonfirsov
commented
Mar 21, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Mar 21, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@antonfirsov
antonfirsov
commented
Mar 21, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .
I guess we are still missing something about that obscure  _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.
tmds
tmds
commented
Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
 {
 try
 {
 if (_currentSocket!.SocketType != SocketType.Stream)
@tmdstmdsMar 21, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.
@scalablecoryscalablecoryMar 21, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.
@tmdstmdsMar 21, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.

We added the check because UDP socket gave an error.
@jaredparjaredpar
mentioned this pull request
Mar 21, 2020

Closed

@tmds
tmds
commented
Mar 21, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov , you can push commits to this branch.
@antonfirsovantonfirsov
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Mar 21, 2020
@ericstjericstj
mentioned this pull request
Mar 23, 2020

Closed

@tmds
tmds
commented
Mar 31, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov I noticed the failures are not Windows-only, I will investigate further.
@antonfirsov
antonfirsov
commented
Mar 31, 2020

Copy link


Copy Markdown

Contributor
@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.
@tmds
tmds
commented
Apr 2, 2020

Copy link


Copy Markdown

MemberAuthor
@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?
@scalablecory
scalablecory
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
Thank you! Will take a look shortly.
@antonfirsov
antonfirsov
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 2, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
antonfirsov
antonfirsov
reviewed
Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

 return (_socketType == SocketType.Stream) &&
 (_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
 (remoteEP.AddressFamily != AddressFamily.Unix);
@antonfirsovantonfirsovApr 3, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?
@tmdstmdsApr 3, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.
antonfirsov
antonfirsov
approved these changes
Apr 3, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.
@antonfirsovantonfirsov
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Apr 3, 2020
scalablecory
scalablecory
approved these changes
Apr 3, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.
@scalablecory
scalablecory
merged commit b755ba9
into
dotnet:masterApr 3, 2020
@tmdstmds
mentioned this pull request
Apr 6, 2020
 Merged

@wfurtwfurt
mentioned this pull request
Jul 14, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@stephentoubstephentoubstephentoub left review comments

+2 more reviewers

@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net.Sockets

Projects


None yet


Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674
Merged
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Apr 3, 2020
Merged
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Conversation
@tmds
@tmdstmds
commented
Mar 17, 2020

Copy link


Copy Markdown

Member
These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.
cc @stephentoub@antonfirsov @dotnet/ncl
antonfirsov
antonfirsov
approved these changes
Mar 17, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@davidshdavidsh
added this to the 5.0 milestone
Mar 17, 2020
@davidsh
davidsh
commented
Mar 17, 2020

Copy link


Copy Markdown

Contributor
We'll want to run Outerloop tests before this can be merged.
scalablecory
scalablecory
reviewed
Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
Outdated

scalablecory
scalablecory
approved these changes
Mar 17, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.
@antonfirsov
antonfirsov
commented
Mar 19, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.
@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.
@tmdstmds
changed the title
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov
antonfirsov
commented
Mar 21, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Mar 21, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@antonfirsov
antonfirsov
commented
Mar 21, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .
I guess we are still missing something about that obscure  _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.
tmds
tmds
commented
Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
 {
 try
 {
 if (_currentSocket!.SocketType != SocketType.Stream)
@tmdstmdsMar 21, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.
@scalablecoryscalablecoryMar 21, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.
@tmdstmdsMar 21, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.

We added the check because UDP socket gave an error.
@jaredparjaredpar
mentioned this pull request
Mar 21, 2020

Closed

@tmds
tmds
commented
Mar 21, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov , you can push commits to this branch.
@antonfirsovantonfirsov
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Mar 21, 2020
@ericstjericstj
mentioned this pull request
Mar 23, 2020

Closed

@tmds
tmds
commented
Mar 31, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov I noticed the failures are not Windows-only, I will investigate further.
@antonfirsov
antonfirsov
commented
Mar 31, 2020

Copy link


Copy Markdown

Contributor
@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.
@tmds
tmds
commented
Apr 2, 2020

Copy link


Copy Markdown

MemberAuthor
@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?
@scalablecory
scalablecory
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
Thank you! Will take a look shortly.
@antonfirsov
antonfirsov
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 2, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
antonfirsov
antonfirsov
reviewed
Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

 return (_socketType == SocketType.Stream) &&
 (_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
 (remoteEP.AddressFamily != AddressFamily.Unix);
@antonfirsovantonfirsovApr 3, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?
@tmdstmdsApr 3, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.
antonfirsov
antonfirsov
approved these changes
Apr 3, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.
@antonfirsovantonfirsov
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Apr 3, 2020
scalablecory
scalablecory
approved these changes
Apr 3, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.
@scalablecory
scalablecory
merged commit b755ba9
into
dotnet:masterApr 3, 2020
@tmdstmds
mentioned this pull request
Apr 6, 2020
 Merged

@wfurtwfurt
mentioned this pull request
Jul 14, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@stephentoubstephentoubstephentoub left review comments

+2 more reviewers

@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net.Sockets

Projects


None yet


Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674
Merged
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Apr 3, 2020
Merged
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Conversation
@tmds
@tmdstmds
commented
Mar 17, 2020

Copy link


Copy Markdown

Member
These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.
cc @stephentoub@antonfirsov @dotnet/ncl
antonfirsov
antonfirsov
approved these changes
Mar 17, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@davidshdavidsh
added this to the 5.0 milestone
Mar 17, 2020
@davidsh
davidsh
commented
Mar 17, 2020

Copy link


Copy Markdown

Contributor
We'll want to run Outerloop tests before this can be merged.
scalablecory
scalablecory
reviewed
Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
Outdated

scalablecory
scalablecory
approved these changes
Mar 17, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.
@antonfirsov
antonfirsov
commented
Mar 19, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.
@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.
@tmdstmds
changed the title
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov
antonfirsov
commented
Mar 21, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Mar 21, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@antonfirsov
antonfirsov
commented
Mar 21, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .
I guess we are still missing something about that obscure  _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.
tmds
tmds
commented
Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
 {
 try
 {
 if (_currentSocket!.SocketType != SocketType.Stream)
@tmdstmdsMar 21, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.
@scalablecoryscalablecoryMar 21, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.
@tmdstmdsMar 21, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.

We added the check because UDP socket gave an error.
@jaredparjaredpar
mentioned this pull request
Mar 21, 2020

Closed

@tmds
tmds
commented
Mar 21, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov , you can push commits to this branch.
@antonfirsovantonfirsov
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Mar 21, 2020
@ericstjericstj
mentioned this pull request
Mar 23, 2020

Closed

@tmds
tmds
commented
Mar 31, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov I noticed the failures are not Windows-only, I will investigate further.
@antonfirsov
antonfirsov
commented
Mar 31, 2020

Copy link


Copy Markdown

Contributor
@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.
@tmds
tmds
commented
Apr 2, 2020

Copy link


Copy Markdown

MemberAuthor
@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?
@scalablecory
scalablecory
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
Thank you! Will take a look shortly.
@antonfirsov
antonfirsov
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 2, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
antonfirsov
antonfirsov
reviewed
Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

 return (_socketType == SocketType.Stream) &&
 (_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
 (remoteEP.AddressFamily != AddressFamily.Unix);
@antonfirsovantonfirsovApr 3, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?
@tmdstmdsApr 3, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.
antonfirsov
antonfirsov
approved these changes
Apr 3, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.
@antonfirsovantonfirsov
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Apr 3, 2020
scalablecory
scalablecory
approved these changes
Apr 3, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.
@scalablecory
scalablecory
merged commit b755ba9
into
dotnet:masterApr 3, 2020
@tmdstmds
mentioned this pull request
Apr 6, 2020
 Merged

@wfurtwfurt
mentioned this pull request
Jul 14, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@stephentoubstephentoubstephentoub left review comments

+2 more reviewers

@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net.Sockets

Projects


None yet


Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets - #33674
Merged
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Apr 3, 2020
Merged
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix sockets#33674
scalablecory merged 5 commits into
dotnet:masterfrom 
tmds:connectasync_saea
Conversation
@tmds
@tmdstmds
commented
Mar 17, 2020

Copy link


Copy Markdown

Member
These are the changes from #787 that deal with making ConnectAsync(SocketAsyncEventArgs) work for non-stream protocols (like UDP) on Windows.
cc @stephentoub@antonfirsov @dotnet/ncl
antonfirsov
antonfirsov
approved these changes
Mar 17, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@davidshdavidsh
added this to the 5.0 milestone
Mar 17, 2020
@davidsh
davidsh
commented
Mar 17, 2020

Copy link


Copy Markdown

Contributor
We'll want to run Outerloop tests before this can be merged.
scalablecory
scalablecory
reviewed
Mar 17, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
Outdated

scalablecory
scalablecory
approved these changes
Mar 17, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small question/nit, otherwise looks good.
@antonfirsov
antonfirsov
commented
Mar 19, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Looks like there's no need to check _rightEndpoint: both ConnectAsync and BeginConnect will ensure that the sockets are bound in WildcardBindForConnectIfNecessary anyways, so we can get rid of this obscure logic.
@tmdswith this change all tests are passing. It also includes an additional test for all connect variants to improve coverage.
@tmdstmds
changed the title
Socket.Windows: support ConnectAsync(SocketAsyncEventArgs) for non-stream protocolsSocket.Windows: support ConnectAsync(SocketAsyncEventArgs) for UDP, and Unix socketsMar 21, 2020
@antonfirsov
antonfirsov
commented
Mar 21, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Mar 21, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@antonfirsov
antonfirsov
commented
Mar 21, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
I'm guilty of not testing my proposal locally on Linux, and it looks like we have a bunch of related test failures, mostly specific to connect with IPv6 .
I guess we are still missing something about that obscure  _rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint) logic.
tmds
tmds
commented
Mar 21, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
 {
 try
 {
 if (_currentSocket!.SocketType != SocketType.Stream)
@tmdstmdsMar 21, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonfirsov@scalablecory also give this condition some thought. Personally, I'm fine if CI passes. You may have a better understanding of what SO_UPDATE_CONNECT_CONTEXT does to decide if this is the most appropriate check.
@scalablecoryscalablecoryMar 21, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should match the logic for CanUseConnectEx. We need to call SO_UPDATE_CONNECT_CONTEXT if ConnectEx is used.
@tmdstmdsMar 21, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same thing, though it seems the stream unix socket, which doesn't support ConnectEx, doesn't give an error when we set this socket option.

We added the check because UDP socket gave an error.
@jaredparjaredpar
mentioned this pull request
Mar 21, 2020

Closed

@tmds
tmds
commented
Mar 21, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov , you can push commits to this branch.
@antonfirsovantonfirsov
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Mar 21, 2020
@ericstjericstj
mentioned this pull request
Mar 23, 2020

Closed

@tmds
tmds
commented
Mar 31, 2020

Copy link


Copy Markdown

MemberAuthor
@antonfirsov I noticed the failures are not Windows-only, I will investigate further.
@antonfirsov
antonfirsov
commented
Mar 31, 2020

Copy link


Copy Markdown

Contributor
@tmds yes, they are mostly specific to Linux and IPv6 as far as I remember.
@tmds
tmds
commented
Apr 2, 2020

Copy link


Copy Markdown

MemberAuthor
@scalablecory@antonfirsovCanUseConnectEx now has proper implementation. I included comments to explain what it does. Tests pass in CI. Can you take another look?
@scalablecory
scalablecory
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
Thank you! Will take a look shortly.
@antonfirsov
antonfirsov
commented
Apr 2, 2020

Copy link


Copy Markdown

Contributor
/azp run runtime-libraries outerloop
@azure-pipelines
azure-pipelinesBot
commented
Apr 2, 2020

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
antonfirsov
antonfirsov
reviewed
Apr 3, 2020
View reviewed changes
Comment threadsrc/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs

 return (_socketType == SocketType.Stream) &&
 (_rightEndPoint != null || remoteEP.GetType() == typeof(IPEndPoint)) &&
 (remoteEP.AddressFamily != AddressFamily.Unix);
@antonfirsovantonfirsovApr 3, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if @stephentoub's #33674 (comment) also applies to AddressFamily ? Wouldn't it be more future proof to use the condition (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6) instead?
@tmdstmdsApr 3, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no preference for remoteEP.GetType() == typeof(IPEndPoint) vs (remoteEP.AddressFamily == AddressFamily.InterNetwork || remoteEP.AddressFamily == AddressFamily.InterNetworkV6), so I kept the check as it was.
antonfirsov
antonfirsov
approved these changes
Apr 3, 2020
View reviewed changes
@antonfirsovantonfirsov
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and all test failures are unrelated. If someone else can confirm, I think we are safe to merge.
@antonfirsovantonfirsov
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Apr 3, 2020
scalablecory
scalablecory
approved these changes
Apr 3, 2020
View reviewed changes
@scalablecoryscalablecory
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.
@scalablecory
scalablecory
merged commit b755ba9
into
dotnet:masterApr 3, 2020
@tmdstmds
mentioned this pull request
Apr 6, 2020
 Merged

@wfurtwfurt
mentioned this pull request
Jul 14, 2020

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Dec 10, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@stephentoubstephentoubstephentoub left review comments

+2 more reviewers

@scalablecoryscalablecoryscalablecory approved these changes
@antonfirsovantonfirsovantonfirsov approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net.Sockets

Projects


None yet


Milestone

5.0.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tmds@davidsh@antonfirsov@scalablecory@stephentoub@Dotnet-GitSync-Bot