Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Flip iter operations to keep associated address/header/packets together (backport #22245)#22257

Merged
mergify[bot] merged 1 commit intov1.9from
mergify/bp/v1.9/pr-22245
Jan 4, 2022
Merged

Flip iter operations to keep associated address/header/packets together (backport #22245)#22257
mergify[bot] merged 1 commit intov1.9from
mergify/bp/v1.9/pr-22245

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 3, 2022

This is an automatic backport of pull request #22245 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…er (#22245)

Flip iter operations to keep associated address/header/packets together

Before this change, if cast_socket_addr() returned a None for any
address/header pair, the subsequent zip() would misalign the
address/header pair and packet. So, this change zips all three together,
then does filter_map() so keep things aligned.

Additionally, compute total_size inline to avoid running through packets
a second time.

(cherry picked from commit 20b61e2)
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 3, 2022
@mergify mergify Bot merged commit 464d533 into v1.9 Jan 4, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 4, 2022

Codecov Report

Merging #22257 (0b74ad3) into v1.9 (7c5d3e5) will increase coverage by 0.0%.
The diff coverage is 76.4%.

@@           Coverage Diff           @@
##             v1.9   #22257   +/-   ##
=======================================
  Coverage    81.1%    81.1%           
=======================================
  Files         518      518           
  Lines      144991   145044   +53     
=======================================
+ Hits       117608   117678   +70     
+ Misses      27383    27366   -17     

@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22245 branch January 4, 2022 07:06
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants