feat(network): Self-healing NAT state #3010
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,14 +54,55 @@ | |
| #include "GameNetwork/NAT.h" | ||
| #include "GameNetwork/udp.h" | ||
| #include "GameNetwork/NetworkDefs.h" | ||
| #include "GameNetwork/IPEnumeration.h" | ||
| #include "GameNetwork/GameSpy/GSConfig.h" | ||
|
|
||
|
|
||
| FirewallHelperClass *TheFirewallHelper = nullptr; | ||
|
|
||
| FirewallHelperClass * createFirewallHelper() | ||
| { | ||
| FirewallHelperClass *helper = NEW FirewallHelperClass(); | ||
|
githubawn marked this conversation as resolved.
|
||
| helper->detectFirewallBehavior(); | ||
| return helper; | ||
| } | ||
|
|
||
| FirewallHelperClass::FirewallBehaviorType getBestKnownFirewallBehavior() | ||
|
There was a problem hiding this comment. All it does is interact with |
||
| { | ||
| if (TheFirewallHelper != nullptr) | ||
| { | ||
| if (TheFirewallHelper->isBehaviorDetectionComplete() | ||
| && TheFirewallHelper->getFirewallBehavior() != FirewallHelperClass::FIREWALL_TYPE_UNKNOWN) | ||
| { | ||
| return TheFirewallHelper->getFirewallBehavior(); | ||
| } | ||
|
|
||
| if (TheFirewallHelper->getLastFirewallBehavior() != FirewallHelperClass::FIREWALL_TYPE_UNKNOWN) | ||
| { | ||
| return TheFirewallHelper->getLastFirewallBehavior(); | ||
| } | ||
|
Comment on lines
+80
to
+83
There was a problem hiding this comment.
When the selected IP changes after an earlier probe completed, this fallback publishes the previous interface's NAT behavior while replacement detection is still running. The matching delta fallback is then consumed by NAT port prediction, causing peers to use the wrong traversal strategy or probe the wrong port until connection timeout. Knowledge Base Used: GameNetwork: Multiplayer Networking Prompt To Fix With AIThis is a comment left during a code review.
Path: Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp
Line: 80-83
Comment:
**Refresh publishes stale NAT state**
When the selected IP changes after an earlier probe completed, this fallback publishes the previous interface's NAT behavior while replacement detection is still running. The matching delta fallback is then consumed by NAT port prediction, causing peers to use the wrong traversal strategy or probe the wrong port until connection timeout.
**Knowledge Base Used:** [GameNetwork: Multiplayer Networking](https://app.greptile.com/thesuperhackers/-/custom-context/knowledge-base/thesuperhackers/generalsgamecode/-/docs/gamenetwork-multiplayer.md)
How can I resolve this? If you propose a fix, please make it concise. |
||
| } | ||
|
|
||
| return FirewallHelperClass::FIREWALL_TYPE_UNKNOWN; | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
| } | ||
|
|
||
| Short getBestKnownSourcePortAllocationDelta() | ||
|
There was a problem hiding this comment. All it does is interact with |
||
| { | ||
| if (TheFirewallHelper != nullptr) | ||
| { | ||
| if (TheFirewallHelper->isBehaviorDetectionComplete() | ||
| && TheFirewallHelper->getFirewallBehavior() != FirewallHelperClass::FIREWALL_TYPE_UNKNOWN) | ||
| { | ||
| return TheFirewallHelper->getSourcePortAllocationDelta(); | ||
| } | ||
|
|
||
| if (TheFirewallHelper->getLastFirewallBehavior() != FirewallHelperClass::FIREWALL_TYPE_UNKNOWN) | ||
| { | ||
| return TheFirewallHelper->getLastSourcePortAllocationDelta(); | ||
| } | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -176,22 +217,12 @@ void FirewallHelperClass::reset() | |
| *=============================================================================================*/ | ||
| Bool FirewallHelperClass::detectFirewall() | ||
| { | ||
| if (m_behavior == FIREWALL_TYPE_UNKNOWN) { | ||
| detectFirewallBehavior(); | ||
|
|
||
| return FALSE; | ||
| } else { | ||
| DEBUG_LOG(("FirewallHelperClass::detectFirewall - firewall behavior already specified as %d, port allocation delta is %d, skipping detection.", m_behavior, m_sourcePortAllocationDelta)); | ||
| } | ||
|
|
||
| return TRUE; | ||
|
|
@@ -480,44 +511,6 @@ UnsignedShort FirewallHelperClass::getManglerResponse(UnsignedShort packetID, In | |
| return mangled_port; | ||
| } | ||
|
|
||
| /*********************************************************************************************** | ||
| * FirewallHelperClass::flagNeedToRefresh -- Flag that the next time we log in we need to * | ||
| * refresh our firewall settings. * | ||
|
|
@@ -535,38 +528,11 @@ void FirewallHelperClass::writeFirewallBehavior() | |
| *=============================================================================================*/ | ||
| void FirewallHelperClass::flagNeedToRefresh(Bool flag) | ||
| { | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
| if (flag) { | ||
|
There was a problem hiding this comment. This flag argument looks very useless. Can be removed. "Munkee" text above needs updating then. |
||
| detectFirewallBehavior(); | ||
| } | ||
| } | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
|
|
||
| /*********************************************************************************************** | ||
| * FHC::detectFirewallBehavior -- What is that wacky firewall doing to our packet headers? * | ||
| * * | ||
|
|
@@ -581,15 +547,28 @@ void FirewallHelperClass::readFirewallBehavior() | |
| * HISTORY: * | ||
| * 3/15/01 12:30PM ST : Created * | ||
| *=============================================================================================*/ | ||
| void FirewallHelperClass::detectFirewallBehavior() | ||
| { | ||
| reset(); | ||
| m_currentTry = 0; | ||
| m_numManglers = 0; | ||
| m_numResponses = 0; | ||
| m_packetID = 0; | ||
| m_timeoutLength = 0; | ||
| m_timeoutStart = 0; | ||
|
|
||
| if (m_behavior != FIREWALL_TYPE_UNKNOWN) | ||
| { | ||
| m_lastBehavior = m_behavior; | ||
| m_lastSourcePortAllocationDelta = m_sourcePortAllocationDelta; | ||
| } | ||
|
|
||
| m_sourcePortAllocationDelta = 0; | ||
| m_behavior = FIREWALL_TYPE_UNKNOWN; | ||
| m_currentState = DETECTIONSTATE_BEGIN; | ||
| } | ||
|
|
||
| FirewallHelperClass::FirewallBehaviorType FirewallHelperClass::getFirewallBehavior() { | ||
| return m_behavior; | ||
| } | ||
|
|
||
|
|
@@ -608,6 +587,12 @@ Short FirewallHelperClass::getSourcePortAllocationDelta() { | |
| Bool FirewallHelperClass::detectionBeginUpdate() { | ||
| // UnsignedShort mangler_port = MANGLER_PORT; | ||
| m_packetID = 0x7f00; | ||
|
|
||
| if (TheGameSpyConfig == nullptr) { | ||
| DEBUG_LOG(("FirewallHelperClass::detectionBeginUpdate - no GameSpy config, skipping detection.")); | ||
| m_currentState = DETECTIONSTATE_DONE; | ||
| return TRUE; | ||
| } | ||
| //int current_mangler = 0; | ||
|
|
||
| /* | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can all be const