diff options
| author | Rickard Green <[email protected]> | 2019-06-17 13:34:47 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-06-17 13:34:47 +0200 |
| commit | 80864b9a1245d0aa4698cf93454f48efd3b536e6 (patch) | |
| tree | 3edb0d641b5b3ff9f706ab2506381dbb54c9650c | |
| parent | 6fa28115d29f0470d470c3d3aed016df89d9474a (diff) | |
| parent | c2344b1da074443770ae5ad2ef5523e4410ad216 (diff) | |
| download | otp-80864b9a1245d0aa4698cf93454f48efd3b536e6.tar.gz otp-80864b9a1245d0aa4698cf93454f48efd3b536e6.tar.bz2 otp-80864b9a1245d0aa4698cf93454f48efd3b536e6.zip | |
Merge branch 'maint'
* maint:
Don't disconnect on remote exit/2 with old incarnation as recipient
| -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 1329d9d55f..a077c3a9ef 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) { |