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.

Sign up for GitHub

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

Jump to bottom

[P2P] Enforce expected outbound services #1616

Merged
merged 6 commits into from
May 13, 2020
Merged

[P2P] Enforce expected outbound services #1616

merged 6 commits into from
May 13, 2020

Conversation

Fuzzbawls
Copy link
Collaborator

Backport of bitcoin#7749. This is next in line for #1374.

Original description:

At this point, we do not:

  • check that relayed/stored addr messages have the NODE_NETWORK bit set.
  • check that nodes selected for outbound connection have NODE_NETWORK advertized.
  • check that the nServices flag in the "version" message by a node corresponds to what we expected when deciding to connect to it.
  • store the updated nServices flag from the "version" message in addrman.

Fix this.

@Fuzzbawls Fuzzbawls added this to the 5.0.0 milestone May 11, 2020
@Fuzzbawls Fuzzbawls self-assigned this May 11, 2020
@Fuzzbawls Fuzzbawls added this to In progress in Update network code from upstream via automation May 11, 2020
This was referenced May 12, 2020
Closed
Merged
furszy
furszy approved these changes May 12, 2020
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

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

one-one with 7749 with the only exception of the tier two area, looks good, utACK a48639f

Update network code from upstream automation moved this from In progress to Reviewer approved May 13, 2020
random-zebra
random-zebra approved these changes May 13, 2020
View reviewed changes
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

All good. ACK a48639f and merging...

@random-zebra random-zebra merged commit f295ee4 into PIVX-Project:master May 13, 2020
Update network code from upstream automation moved this from Reviewer approved to Done May 13, 2020
furszy added a commit that referenced this pull request May 14, 2020
@furszy
Merge #1618: [P2P] Do not set extra flags for unfiltered DNS seed res…
077ab3d 
…ults

9107379 Do not set extra flags for unfiltered DNS seed results (Pieter Wuille)

Pull request description:

  Backport of bitcoin#8208 based on top of #1616 (Only the last commit is important here). Part of #1374.

  Original Description:

  > Any flag set in nRelevantServices would propagate to all CAddress results retrieved from the DNS seed, even if that DNS seed does not support filtering.
  >
  > Fix this by making the name adaptation function also update the passed in flags.
  >
  > Furthermore, move that from from DNSSeedData to net. Structs in chainparams should be data only.

ACKs for top commit:
  random-zebra:
    utACK 9107379
  furszy:
    utACK 9107379

Tree-SHA512: a4c75fcdabac7afbd5df4b33f0bd02a438dffa75b8b63bc49fe63998579c8a15d6067cc357a72efd0b8123c9708853b9e2d04eada7ae85c088b0952bcf0baa90
@lyricidal lyricidal mentioned this pull request Dec 20, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@furszy furszy furszy approved these changes

@random-zebra random-zebra random-zebra approved these changes

Assignees

@Fuzzbawls Fuzzbawls

Labels
P2P Upstream
Projects
No open projects
Update network code from upstream
  
Done
Milestone
4.2.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Fuzzbawls @furszy @random-zebra @sipa