Skip to content

Update to support OTP25-27 #362

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
merged 4 commits into from
Jun 3, 2025
Merged

Update to support OTP25-27 #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96394aa
Update jinterface to 1.14.1 from OTP 27.3.3
bjosv May 27, 2025
f49d3ea
Update supported Erlang versions
bjosv May 27, 2025
2006828
Update erlide_kernel version to v0.118.0
bjosv May 27, 2025
8ba68d4
Set version to 0.63.0
bjosv May 27, 2025
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
2 changes: 1 addition & 1 deletion extras/org.erlide.licenses/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/wrangler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion features/org.erlide/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.erlide"
label="Erlang language tools IDE"
version="0.62.0.qualifier"
version="0.63.0.qualifier"
provider-name="%vendorName"
plugin="org.erlide.branding"
image="erlang-64.gif"
Expand Down
4 changes: 2 additions & 2 deletions features/org.erlide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<artifactId>org.erlide</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion libs/com.ericsson.otp.jinterface/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Erlang OTP JInterface
Bundle-SymbolicName: com.ericsson.otp.jinterface
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.13.1
Bundle-Version: 1.14.1
Bundle-Vendor: Erlide project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.ericsson.otp.erlang
Expand Down
2 changes: 1 addition & 1 deletion libs/com.ericsson.otp.jinterface/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>com.ericsson.otp.jinterface</artifactId>
<version>1.13.1</version>
<version>1.14.1</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
103 changes: 62 additions & 41 deletions libs/com.ericsson.otp.jinterface/src/com/ericsson/otp/erlang/AbstractConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
* Copyright Ericsson AB 2000-2022. All Rights Reserved.
* Copyright Ericsson AB 2000-2023. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -425,29 +425,12 @@ protected void sendUnlink(final OtpErlangPid from, final OtpErlangPid dest,
header.write1(passThrough);
header.write1(version);

if ((peer.flags & AbstractNode.dFlagUnlinkId) != 0) {
// header
header.write_tuple_head(4);
header.write_long(unlinkIdTag);
header.write_long(unlink_id);
header.write_any(from);
header.write_any(dest);
}
else {
/*
* A node that isn't capable of talking the new link protocol.
*
* Send an old unlink op, and send ourselves an unlink-ack. We may
* end up in an inconsistent state as we could before the new link
* protocol was introduced...
*/
// header
header.write_tuple_head(3);
header.write_long(unlinkTag);
header.write_any(from);
header.write_any(dest);
deliver(new OtpMsg(unlinkIdAckTag, dest, from, unlink_id));
}
// header
Copy link
Collaborator

@zuiderkwast zuiderkwast May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't review these changes. Please describe in the PR how the uplift was done, so I know what needs to be reviewed and what not.

Copy link
Collaborator Author

@bjosv bjosv Jun 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit with the jinterface-update has info where its copied from, and the plan is to merge the commits separately. I will be helpful for future updates.
The other commits are mainly the same steps we did in previous lifts; a search and replace.

header.write_tuple_head(4);
header.write_long(unlinkIdTag);
header.write_long(unlink_id);
header.write_any(from);
header.write_any(dest);

// fix up length in preamble
header.poke4BE(0, header.size() - 4);
Expand All @@ -471,26 +454,25 @@ protected void sendUnlinkAck(final OtpErlangPid from, final OtpErlangPid dest,
if (!connected) {
throw new IOException("Not connected");
}
if ((peer.flags & AbstractNode.dFlagUnlinkId) != 0) {
@SuppressWarnings("resource")

@SuppressWarnings("resource")
final OtpOutputStream header = new OtpOutputStream(headerLen);

// preamble: 4 byte length + "passthrough" tag
header.write4BE(0); // reserve space for length
header.write1(passThrough);
header.write1(version);
// preamble: 4 byte length + "passthrough" tag
header.write4BE(0); // reserve space for length
header.write1(passThrough);
header.write1(version);

// header
header.write_tuple_head(4);
header.write_long(unlinkIdAckTag);
header.write_long(unlink_id);
header.write_any(from);
header.write_any(dest);
// fix up length in preamble
header.poke4BE(0, header.size() - 4);
// header
header.write_tuple_head(4);
header.write_long(unlinkIdAckTag);
header.write_long(unlink_id);
header.write_any(from);
header.write_any(dest);
// fix up length in preamble
header.poke4BE(0, header.size() - 4);

do_send(header);
}
do_send(header);

}

Expand Down Expand Up @@ -1033,6 +1015,7 @@ protected void doAccept() throws IOException, OtpAuthException {
sendStatus("ok");
final int our_challenge = genChallenge();
sendChallenge(peer.flags, localNode.flags, our_challenge);
recvComplement(send_name_tag);
final int her_challenge = recvChallengeReply(our_challenge);
final byte[] our_digest = genDigest(her_challenge,
localNode.cookie());
Expand Down Expand Up @@ -1245,11 +1228,26 @@ protected int recvName(final OtpPeer apeer) throws IOException {
final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
byte[] tmpname;
final int len = tmpbuf.length;
long flag_mask;

send_name_tag = ibuf.read1();
switch (send_name_tag) {
case 'n':
if (ibuf.read2BE() != 5)
throw new IOException("Invalid handshake version");
apeer.flags = ibuf.read4BE();
flag_mask = (1L << 32) - 1;
if ((apeer.flags & AbstractNode.dFlagHandshake23) == 0)
throw new IOException("Missing DFLAG_HANDSHAKE_23");
apeer.distLow = apeer.distHigh = 6;
tmpname = new byte[len - 7];
ibuf.readN(tmpname);
hisname = OtpErlangString.newString(tmpname);
break;
case 'N':
apeer.distLow = apeer.distHigh = 6;
apeer.flags = ibuf.read8BE();
flag_mask = ~0L;
if ((apeer.flags & AbstractNode.dFlagMandatory25Digest) != 0) {
apeer.flags |= AbstractNode.mandatoryFlags25;
}
Expand All @@ -1265,7 +1263,7 @@ protected int recvName(final OtpPeer apeer) throws IOException {
throw new IOException("Unknown remote node type");
}

if ((apeer.flags & AbstractNode.mandatoryFlags) != AbstractNode.mandatoryFlags) {
if ((~apeer.flags & flag_mask & AbstractNode.mandatoryFlags) != 0) {
throw new IOException(
"Handshake failed - peer cannot handle all mandatory capabilities");
}
Expand Down Expand Up @@ -1336,6 +1334,29 @@ protected int recvChallenge() throws IOException {
return challenge;
}

protected void recvComplement(int send_name_tag) throws IOException {

if (send_name_tag == 'n') {
try {
final byte[] tmpbuf = read2BytePackage();
@SuppressWarnings("resource")
final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
if (ibuf.read1() != 'c')
throw new IOException("Not a complement tag");

final long flagsHigh = ibuf.read4BE();
peer.flags |= flagsHigh << 32;
if ((~peer.flags & AbstractNode.mandatoryFlags) != 0) {
throw new IOException("Handshake failed - peer missing" +
" mandatory capabilities");
}
peer.setCreation(ibuf.read4BE());
} catch (final OtpErlangDecodeException e) {
throw new IOException("Handshake failed - not enough data");
}
}
}

protected void sendChallengeReply(final int challenge, final byte[] digest)
throws IOException {

Expand Down
9 changes: 6 additions & 3 deletions libs/com.ericsson.otp.jinterface/src/com/ericsson/otp/erlang/AbstractNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,21 @@ public class AbstractNode implements OtpTransportFactory {
| dFlagBitBinaries
| dFlagHandshake23;

/* New mandatory flags in OTP 26 */
static final long mandatoryFlags26 = dFlagV4PidsRefs
| dFlagUnlinkId;

/* Mandatory flags for distribution. Keep them in sync with
DFLAG_DIST_MANDATORY in erts/emulator/beam/dist.h. */
static final long mandatoryFlags = mandatoryFlags25;
static final long mandatoryFlags = mandatoryFlags25
| mandatoryFlags26;

int ntype = NTYPE_R6;
int proto = 0; // tcp/ip
int distHigh = 6;
int distLow = 6; // Cannot talk to nodes before OTP 23
private int creation = 0x710000;
long flags = mandatoryFlags
| dFlagUnlinkId
| dFlagV4PidsRefs
| dFlagMandatory25Digest;

/* initialize hostname and default cookie */
Expand Down
4 changes: 1 addition & 3 deletions libs/com.ericsson.otp.jinterface/src/com/ericsson/otp/erlang/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# %CopyrightBegin%
#
# Copyright Ericsson AB 2000-2022. All Rights Reserved.
# Copyright Ericsson AB 2000-2024. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -133,6 +133,4 @@ release_spec: opt

release_docs_spec:

xmllint:

# ----------------------------------------------------
2 changes: 1 addition & 1 deletion libs/com.google.truth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion libs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/org.erlide.backend/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.erlide.backend;singleton:=true
Bundle-Version: 0.62.0.qualifier
Bundle-Version: 0.63.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.erlide.backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<artifactId>org.erlide.backend</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
2 changes: 1 addition & 1 deletion plugins/org.erlide.branding/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: erlide - Erlang language tools
Bundle-SymbolicName: org.erlide.branding;singleton:=true
Bundle-Version: 0.62.0.qualifier
Bundle-Version: 0.63.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui.intro.universal;bundle-version="3.2.500",
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.erlide.branding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<artifactId>org.erlide.branding</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.erlide.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.erlide.core; singleton:=true
Bundle-Version: 0.62.0.qualifier
Bundle-Version: 0.63.0.qualifier
Bundle-Activator: org.erlide.core.ErlangPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.erlide.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<artifactId>org.erlide.core</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
2 changes: 1 addition & 1 deletion plugins/org.erlide.cover.api/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Cover Interfaces
Bundle-SymbolicName: org.erlide.cover.api;singleton:=true
Bundle-Version: 0.62.0.qualifier
Bundle-Version: 0.63.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.erlide.model.api,
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.erlide.cover.api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<artifactId>org.erlide.cover.api</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion plugins/org.erlide.cover.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Cover suport for ErlIde (Core plugin)
Bundle-SymbolicName: org.erlide.cover.core;singleton:=true
Bundle-Version: 0.62.0.qualifier
Bundle-Version: 0.63.0.qualifier
Bundle-Activator: org.erlide.cover.core.Activator
Bundle-Vendor: Erlang Solutions
Require-Bundle: org.eclipse.core.runtime,
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.erlide.cover.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>org.erlide</groupId>
<artifactId>org.erlide.parent</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<artifactId>org.erlide.cover.core</artifactId>
<version>0.62.0-SNAPSHOT</version>
<version>0.63.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Loading