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

8296615: use of undeclared identifier 'IPV6_DONTFRAG' #11047

Closed
wants to merge 1 commit into from

Conversation

XueleiFan
Copy link
Member

@XueleiFan XueleiFan commented Nov 8, 2022

Hi,

May I have this update in jdk.net reviewed?

While build on MacOX, I run into the following issues:
/Users/xueleifan/workspace/jdk-dev/src/jdk.net/macosx/native/libextnet/MacOSXSocketOptions.c:207:43: error: use of undeclared identifier 'IPV6_DONTFRAG'
rv = setsockopt(fd, IPPROTO_IPV6, IPV6_DONTFRAG, &value, sizeof(value));

It looks like the IPV6_DONTFRAG defined in netinet6/in6.h is somehow filtered out for MacOSXSocketOptions.c. The option could add back as what was did for IP_DONTFRAG. The value for IPV6_DONTFRAG is copied from netinet6/in6.h. Hopefully, it is a safe value to use.

Thanks,
Xuelei


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8296615: use of undeclared identifier 'IPV6_DONTFRAG'

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11047/head:pull/11047
$ git checkout pull/11047

Update a local copy of the PR:
$ git checkout pull/11047
$ git pull https://git.openjdk.org/jdk pull/11047/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11047

View PR using the GUI difftool:
$ git pr show -t 11047

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11047.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 8, 2022

👋 Welcome back xuelei! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Nov 8, 2022

@XueleiFan The following label will be automatically applied to this pull request:

  • net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the net net-dev@openjdk.org label Nov 8, 2022
@XueleiFan XueleiFan marked this pull request as ready for review November 8, 2022 22:43
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 8, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 8, 2022

Webrevs

@AlanBateman
Copy link
Contributor

AlanBateman commented Nov 9, 2022

Which macOS release and Xcode version is this, just wondering why it hasn't been seen before now.

@XueleiFan
Copy link
Member Author

XueleiFan commented Nov 9, 2022

Which macOS release and Xcode version is this, just wondering why it hasn't been seen before now.

I just noticed the issue yesterday while I run the building. I could build without any problem a few days before. The system is macOS Monterey version 12.6. Here is the related OpenJDK building configure summary:

* Toolchain:      clang (clang/LLVM from Xcode 14.1)
* Sysroot:        /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.0.sdk
* C Compiler:     Version 14.0.0 (at /usr/bin/clang)
* C++ Compiler:   Version 14.0.0 (at /usr/bin/clang++)

@Michael-Mc-Mahon
Copy link
Member

Seems strange that the definition has been removed in a newer Xcode version. Have you checked if it has been moved to a different header file?

@XueleiFan
Copy link
Member Author

Seems strange that the definition has been removed in a newer Xcode version. Have you checked if it has been moved to a different header file?

It is still in the in6.h. But it is not included because of the macro definitions.

#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
    ...
#ifdef __APPLE_USE_RFC_3542
    ...
#define	IPV6_DONTFRAG		62 /* bool; disable IPv6 fragmentation */
    ...
#endif /* __APPLE_USE_RFC_3542 */
    ...
#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */

If I updated the MacOSXSocketOptions.c code to:

#define __APPLE_USE_RFC_3542
#include <netinet/in.h>

#ifndef IP_DONTFRAG
#define IP_DONTFRAG             28
#endif

#if defined(_POSIX_C_SOURCE)
#undef IP_DONTFRAG
#endif

#if !defined(_DARWIN_C_SOURCE)
#undef IP_DONTFRAG
#endif

/*
#ifndef IPV6_DONTFRAG
#define IPV6_DONTFRAG           62
#endif
*/

I can see neither IP_DONTFRAG nor IPV6_DONTFRAG is defined. I think the _POSIX_C_SOURCE is defined, and _DARWIN_C_SOURCE not in the building environment. And the definitions of _POSIX_C_SOURCE and _DARWIN_C_SOURCE get the IPV6_DONTFRAG definition in in6.h out.

Alternatively, we may be able to define _DARWIN_C_SOURCE as we did for __APPLE_USE_RFC_3542. But the impact may be more wider.

  #define __APPLE_USE_RFC_3542
+ #define _DARWIN_C_SOURCE
  #include <netinet/in.h>

@Michael-Mc-Mahon
Copy link
Member

Thanks. I think your suggested change in the webrev is best.

@openjdk
Copy link

openjdk bot commented Nov 9, 2022

@XueleiFan This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8296615: use of undeclared identifier 'IPV6_DONTFRAG'

Reviewed-by: michaelm

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 22 new commits pushed to the master branch:

  • d4376f8: 8296406: ChainingConstructors jtreg test reduce code duplication
  • 4a0093c: 8294362: UL: Replace the internal usage of manual buffers with stringStream in LogSelection
  • fef68bb: 8296515: RISC-V: Small refactoring for MaxReductionV/MinReductionV/AddReductionV node implementation
  • 82cbfb5: 8296140: Drop unused field java.util.Calendar.DATE_MASK
  • fd83764: 8296239: ISO 4217 Amendment 174 Update
  • d9b25e8: 8296426: x86: Narrow UseAVX and UseSSE flags
  • 8146e1a: 8296347: Memory leak from ClassPathDirEntry::_dir
  • 671f84b: 8296143: CertAttrSet's set/get mechanism is not type-safe
  • d04d656: 8296433: Encountered null CLD while loading shared lambda proxy class
  • 74f2b16: 8295303: cleanup debug agent's confusing use of EI_GC_FINISH
  • ... and 12 more: https://git.openjdk.org/jdk/compare/b6ea69c06aca7f013e26596cebd039960c5b4d34...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 9, 2022
@XueleiFan
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 9, 2022

Going to push as commit 17e3412.
Since your change was applied there have been 24 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 9, 2022
@openjdk openjdk bot closed this Nov 9, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 9, 2022
@openjdk
Copy link

openjdk bot commented Nov 9, 2022

@XueleiFan Pushed as commit 17e3412.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@XueleiFan XueleiFan deleted the JDK-8296615 branch November 13, 2022 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated net net-dev@openjdk.org
3 participants