Fixed IPv4 to IPv6 mapping in CIPAddress::pton(..) #1664
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maxsharabayko
added
Type: Bug
maxsharabayko
force-pushed
the
hotfix/ipv6-pton
branch
from
542fe30 to
c199270
Compare
TestIPv6.v4_calls_v6_mappedListener# On HS Conclusion Request:
# CUDT::acceptAndRespond(..)
agent_family: IPv6 (m_SelfAddr.family)
peer: "::ffff:127.0.0.1:64888"
ip[4]: 16777343, 0, 0, 0
# After CIPAddress::pton():
m_SelfAddr: "::ffff:127.0.0.1:4200"
# CIPAddress::ntop(peer, (w_hs.m_piPeerIP));
# Goes to HS Conclusion Response
w_hs.m_piPeerIP[4]: 0, 0, 0xFF, 16777343Caller# On HS Conclusion Response:
# CUDT::postConnect(..)
m_SelfAddr.family() (agent_family): IPv4 (AF_INET)
ip[4]: 0, 0, 0xFF, 16777343
peer: "127.0.0.1:4200"
Resulting m_SelfAddr: "0.0.0.0:52872" |
TestIPv6.v6_calls_v4Caller Sends HS Induction RequestPeer IP Address[4]: 0, 0, 0xFF, 16777343Listener Sends HS Induction Response:Peer IP Address[4]: 0, 0, 0xFF, 16777343Caller Sends HS Conclusion RequestPeer IP Address[4]: 0, 0, 0xFF, 16777343Listener Sends HS Conclusion Response ❗Peer IP Address[4]: 16777343, 0, 0xFF, 16777343 |
maxsharabayko
commented
Nov 19, 2020
srtcore/common.cpp
Outdated
|
|
||
| bool is_mapped_ipv4 = (std::mismatch(mbegin, mend, peeraddr16).first == mend); | ||
| bool is_mapped_ipv4 = (std::mismatch(mbegin, mend, peeraddr16).first == mend); |
There was a problem hiding this comment.
const bool is_mapped_ipv4 = std::equal(mbegin, mend, peeraddr16);
Codecov Report
@@ Coverage Diff @@
## master #1664 +/- ##
==========================================
+ Coverage 60.37% 60.63% +0.26%
==========================================
Files 77 78 +1
Lines 17389 17436 +47
==========================================
+ Hits 10498 10572 +74
+ Misses 6891 6864 -27
Continue to review full report at Codecov.
|
maxsharabayko
force-pushed
the
hotfix/ipv6-pton
branch
from
0793123 to
456a498
Compare
Co-authored-by: Maxim Sharabayko <maxsharabayko@haivision.com> Co-authored-by: Mathieu Poux <mathieu.poux@gmail.com>
maxsharabayko
force-pushed
the
hotfix/ipv6-pton
branch
from
a2b5eb3 to
445ce20
Compare
1 task
maxsharabayko
force-pushed
the
hotfix/ipv6-pton
branch
from
445ce20 to
d09ea96
Compare
|
Due to CI failures, IPv6 connection tests were extracted to PR #1670 for further fixes, while the bug fix can go within this PR. |
ethouris
approved these changes
Nov 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While converting IPv4 mapped to IPv6 there was an error in the IPv4 index.
Fixes #1663
Added unit test for the case.
TODO
CIPAddress::pton(..)