Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #5254 #5274

Merged
merged 11 commits into from Feb 27, 2021
Merged

Fix for #5254 #5274

merged 11 commits into from Feb 27, 2021

Conversation

@BaronGreenback
Copy link
Contributor

@BaronGreenback BaronGreenback commented Feb 20, 2021

Fix1: (#5254) The virtual interface detection routine is supposed to add the interface names defined in the list to the excluded bind list. eg. vEthernet* excludes an interfaces starting with vEthernet.

However, as the excluded interface name is not prefixed with ! it is ignored, and is instead added to the list of bind interfaces.

This PR corrects the problem by prepending the virtual interface name upon which to match with a "!" so that it will be processed correctly.

Fix2: When there were multiple virtual interfaces, only the first that matched was processed. All are now processed.

@BaronGreenback BaronGreenback changed the title Fix for virtual interface detection Fix for #5254 Feb 20, 2021
@BaronGreenback
Copy link
Contributor Author

@BaronGreenback BaronGreenback commented Feb 21, 2021

Fixed additional bug found whilst fixing tests.

@BaronGreenback BaronGreenback force-pushed the BaronGreenback:bindfix branch from b937959 to 7bfc59b Feb 21, 2021
@BaronGreenback
Copy link
Contributor Author

@BaronGreenback BaronGreenback commented Feb 21, 2021

Sorry for all the updates - tests worked locally, but not remotely even VS reported both were synced. Turns out they weren't!

Jellyfin.Networking/Manager/NetworkManager.cs Outdated Show resolved Hide resolved
/// <returns><c>true</c> if an interface name matches the token, <c>False</c> otherwise.</returns>
private bool IsInterface(string token, out int index)
private bool TryIsInterface(string token, [NotNullWhen(true)] out List<int>? index)

This comment has been minimized.

@Bond-009

Bond-009 Feb 23, 2021
Member

Suggested change
private bool TryIsInterface(string token, [NotNullWhen(true)] out List<int>? index)
private bool TryIsInterface(string token, [MaybeNullWhen(false)] out List<int> index)
BaronGreenback and others added 3 commits Feb 23, 2021
Co-authored-by: Bond-009 <bond.009@outlook.com>
Co-authored-by: Bond-009 <bond.009@outlook.com>
BaronGreenback and others added 2 commits Feb 27, 2021
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
@BaronGreenback BaronGreenback requested a review from Bond-009 Feb 27, 2021
@cvium cvium merged commit 1460528 into jellyfin:master Feb 27, 2021
12 checks passed
12 checks passed
Analyze (csharp) Analyze (csharp)
Details
CodeQL 1 fix
Details
Jellyfin Server Build #20210227.9 succeeded
Details
Jellyfin Server (Build Debug) Build Debug succeeded
Details
Jellyfin Server (Build Release) Build Release succeeded
Details
Jellyfin Server (Compatibility Check Common) Compatibility Check Common succeeded
Details
Jellyfin Server (Compatibility Check Controller) Compatibility Check Controller succeeded
Details
Jellyfin Server (Compatibility Check Model) Compatibility Check Model succeeded
Details
Jellyfin Server (Compatibility Check Naming) Compatibility Check Naming succeeded
Details
Jellyfin Server (Test Linux) Test Linux succeeded
Details
Jellyfin Server (Test Windows) Test Windows succeeded
Details
Jellyfin Server (Test macOS) Test macOS succeeded
Details
joshuaboniface added a commit that referenced this pull request Feb 28, 2021
(cherry picked from commit 1460528)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
@BaronGreenback BaronGreenback deleted the BaronGreenback:bindfix branch Feb 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants