Skip to content

Commit

Permalink
8315651: Stop hiding AIX specific multicast socket errors via Network…
Browse files Browse the repository at this point in the history
…Configuration (aix)

Reviewed-by: alanb, mdoerr, clanger
  • Loading branch information
TOatGithub authored and TheRealMDoerr committed Sep 7, 2023
1 parent 9887cd8 commit e22eb06
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions test/lib/jdk/test/lib/NetworkConfiguration.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -176,17 +176,6 @@ private boolean supportsIp4Multicast(NetworkInterface nif) {
return false;
}

// On AIX there is a bug:
// When IPv6 is enabled on the system, the JDK opens sockets as AF_INET6.
// If there's an interface configured with IPv4 addresses only, it should
// be able to become the network interface for a multicast socket (that
// could be in both, IPv4 or IPv6 space). But both possible setsockopt
// calls for either IPV6_MULTICAST_IF or IP_MULTICAST_IF return
// EADDRNOTAVAIL. So we must skip such interfaces here.
if (Platform.isAix() && isIPv6Available() && !hasIp6Addresses(nif)) {
return false;
}

if (Platform.isOSX()) {
// multicasting may not work on interfaces that only
// have link local addresses
Expand Down

3 comments on commit e22eb06

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on e22eb06 Sep 19, 2023

Choose a reason for hiding this comment

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

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-e22eb06a in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e22eb06a from the openjdk/jdk repository.

The commit being backported was authored by Thomas Obermeier on 7 Sep 2023 and was reviewed by Alan Bateman, Martin Doerr and Christoph Langer.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git RealCLanger-backport-e22eb06a:RealCLanger-backport-e22eb06a
$ git checkout RealCLanger-backport-e22eb06a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git RealCLanger-backport-e22eb06a

Please sign in to comment.