miniupnpc: Update to 2.2.8 (new major 18) #97139
Merged
+79
−116
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
Keep support for major 17 by using a version check for the changed API. Fixes godotengine#93907.
akien-mga
added
bug
enhancement
topic:thirdparty
cherrypick:4.3
akien-mga
commented
Sep 18, 2024
| @@ -131,7 +131,11 @@ void UPNP::parse_igd(Ref<UPNPDevice> dev, UPNPDev *devlist) { | |||
| GetUPNPUrls(&urls, &data, dev->get_description_url().utf8().get_data(), 0); | |||
|
|
|||
| char addr[16]; | |||
| #if MINIUPNPC_API_VERSION >= 18 | |||
| int i = UPNP_GetValidIGD(devlist, &urls, &data, (char *)&addr, 16, nullptr, 0); | |||
There was a problem hiding this comment.
The new prototype is:
UPNP_GetValidIGD(struct UPNPDev * devlist,
struct UPNPUrls * urls,
struct IGDdatas * data,
char * lanaddr, int lanaddrlen,
char * wanaddr, int wanaddrlen);We should evaluate whether we want to make use of the new wanaddr stuff @mhilbrunner
akien-mga
added
the
cherrypick:4.2
twrightsman
added a commit
to twrightsman/godot
that referenced
this pull request
Dec 14, 2024
Backports godotengine#97139 without bumping the embedded miniupnpc library. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
|
Cherry-picked for 4.3.1. Doesn't cherry-pick cleanly on |
akien-mga
removed
cherrypick:4.2
Relintai
pushed a commit
to Relintai/pandemonium_engine
that referenced
this pull request
Feb 3, 2025
Backports godotengine/godot#97139 without bumping the embedded miniupnpc library. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
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.
Keep support for major 17 by using a version check for the changed API.
Fixes #93907.