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

MINIFICPP-2152 Remove own server and client socket implementations #1599

Closed
wants to merge 10 commits into from

Conversation

lordgamez
Copy link
Contributor

  • Rewrite SiteToSite and CSite2SiteTests to use Asio library instead of custom socket implementation
  • Remove custom socket implementation classes and related utils and tests: ClientSocket.h, DescriptorStream.h, EndianCheck.h, ServerSocket.h, Sockets.h, StreamFactory.h, SecureDescriptorStream.h, TLSServerSocket.h, TLSSocket.h
  • Remove ProvenanceReportingTest as it was not part of the test suite, it was failing and was unmaintained
  • Remove SecureSocketGetTCPTests as it will be replaced in https://issues.apache.org/jira/browse/MINIFICPP-2154

Depends on #1592 and #1595

https://issues.apache.org/jira/browse/MINIFICPP-2152


Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically main)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file?
  • If applicable, have you updated the NOTICE file?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.

@lordgamez lordgamez mentioned this pull request Jul 4, 2023
8 tasks
libminifi/include/utils/net/Socket.h Show resolved Hide resolved
libminifi/include/utils/net/Socket.h Show resolved Hide resolved
libminifi/include/utils/net/DNS.h Outdated Show resolved Hide resolved
libminifi/src/utils/net/DNS.cpp Show resolved Hide resolved
libminifi/src/utils/net/DNS.cpp Outdated Show resolved Hide resolved
libminifi/src/utils/net/Socket.cpp Outdated Show resolved Hide resolved
libminifi/src/utils/net/Socket.cpp Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

It would be nice to move the logic to the .cpp file, and avoid polluting other translation units with windows and other heavyweight headers.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The logic was already moved in #1602 but this is not yet rebased on that. After the dependency #1595 is merged we can rebase and check if there are any headers left that could be moved to the cpp file.

libminifi/include/utils/net/AsioSocketUtils.h Show resolved Hide resolved
libminifi/src/utils/net/DNS.cpp Outdated Show resolved Hide resolved
@lordgamez lordgamez changed the base branch from MINIFICPP-2152_BASE to MINIFICPP-2137 August 3, 2023 14:08
@lordgamez lordgamez changed the base branch from MINIFICPP-2137 to main August 18, 2023 13:46
@martinzink martinzink self-requested a review August 18, 2023 14:23
Copy link
Member

@martinzink martinzink left a comment

Choose a reason for hiding this comment

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

I think we could also remove the now unused close function from FileUtils.h https://github.com/apache/nifi-minifi-cpp/blob/main/libminifi/include/utils/file/FileUtils.h#L422-L428 but otherwise LGTM 👍

@lordgamez
Copy link
Contributor Author

I think we could also remove the now unused close function from FileUtils.h https://github.com/apache/nifi-minifi-cpp/blob/main/libminifi/include/utils/file/FileUtils.h#L422-L428 but otherwise LGTM 👍

Good point, removed the close function in 8526c33

@fgerlits fgerlits closed this in 6241dc3 Aug 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants