Skip to content

fix portfwd issue when dealing with server response failures #7252

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

Merged
notimaginative merged 1 commit into from
Feb 28, 2026
+9 −2
Merged

fix portfwd issue when dealing with server response failures #7252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions code/network/multi_portfwd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ void multi_port_forward_init()

void multi_port_forward_do()
{
static bool failed_before = false;
pcp_fstate_e state;
size_t info_count = 0;
int wait_ms;
Expand All @@ -117,7 +118,10 @@ void multi_port_forward_do()
// check progress and log if needed
if ( pcp_eval_flow_state(PF_pcp_flow, &state) ) {
if (state == pcp_state_failed) {
ml_string("Port forward => Mapping failed!");
if ( !failed_before ) {
ml_string("Port forward => Mapping failed!");
failed_before = true; // reduce log spam
}
} else if (state == pcp_state_succeeded) {
pcp_flow_info_t *flow_info = pcp_flow_get_info(PF_pcp_flow, &info_count);

Expand All @@ -143,6 +147,8 @@ void multi_port_forward_do()
ml_printf("Port forward => Mapping valid until %s", time_str);
}

failed_before = false;

if (flow_info) {
free(flow_info); // system call, allocated in lib ** don't change! **
}
Expand Down Expand Up @@ -178,7 +184,7 @@ void multi_port_forward_close()
#ifndef NDEBUG
static void PF_logger_fn(pcp_loglvl_e /* lvl */, const char *msg)
{
nprintf(("portfwd", "Port forward => %s", msg));
nprintf(("portfwd", "Port forward => %s\n", msg));
}
#endif

Expand Down
1 change: 1 addition & 0 deletions lib/libpcpnatpmp/src/pcp_event_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ static int get_first_flow_iter(pcp_flow_t *f, void *data) {
case pfs_idle:
case pfs_wait_for_server_init:
case pfs_send:
case pfs_failed:
d->msg = f;
return 1;
default:
Expand Down