diff options
| author | Erlang/OTP <[email protected]> | 2019-06-17 16:51:15 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-17 16:51:15 +0200 |
| commit | 23bad500c23832aab498e6f44cb6f04a90f3a920 (patch) | |
| tree | 18a838bf097230eda94e0d5d38339fc0a8b6283f /erts | |
| parent | 89b80b3ef0f396b8b82e593da1f01e149d4885a9 (diff) | |
| parent | 79e9b25ac74e29d678ef6473813fce4f71ded196 (diff) | |
| download | otp-23bad500c23832aab498e6f44cb6f04a90f3a920.tar.gz otp-23bad500c23832aab498e6f44cb6f04a90f3a920.tar.bz2 otp-23bad500c23832aab498e6f44cb6f04a90f3a920.zip | |
Merge branch 'rickard/dist-exit2/22/OTP-15867' into maint-22
* rickard/dist-exit2/22/OTP-15867:
Don't disconnect on remote exit/2 with old incarnation as recipient
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/dist.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index ff19ef018e..5e48a553af 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -2055,10 +2055,17 @@ int erts_net_message(Port *prt, token = tuple[4]; } if (is_not_pid(from) - || dep != external_pid_dist_entry(from) - || is_not_internal_pid(to)) { + || dep != external_pid_dist_entry(from)) { goto invalid_message; } + if (is_not_internal_pid(to)) { + if (is_external_pid(to)) { + DistEntry *dep = external_pid_dist_entry(to); + if (dep == erts_this_dist_entry) + break; /* Old incarnation of this node... */ + } + goto invalid_message; + } if (!erts_proc_lookup(to)) { if (ede_hfrag != NULL) { |