Skip to contentSkip to conversation

Change in openvpn[master]: Haiku: Fix short interface path length

Openvpn-devel In review kallisti5 (Code Review) 3 participants 7 messages Jan 28, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1738029022000.I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d@...2715...

#1 lore raw

Attention is currently required from: flichtenheld, plaisthos.

Hello plaisthos, flichtenheld,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/689?usp=email

to review the following change.

Change subject: Haiku: Fix short interface path length
......................................................................

Haiku: Fix short interface path length

* Haiku uses full paths for interface names, 16 characters isn't enough.

Change-Id: I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d
---
M src/openvpn/route.h

1 file changed, 7 insertions(+), 0 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/89/689/1

src/openvpn/route.h +7 -0
index 421e7d2..69b06b8 100644
@@ -155,6 +155,8 @@
     /* gateway interface */
 #ifdef _WIN32
     DWORD adapter_index; /* interface or ~0 if undefined */
+#elif defined(TARGET_HAIKU)
+    char iface[PATH_MAX]; /* iface names are full /dev path with driver name */
 #else
     char iface[16]; /* interface name (null terminated), may be empty */
 #endif
@@ -186,8 +188,13 @@
 #else
     /* non linux platform don't have this constant defined */
 #ifndef IFNAMSIZ
+#if defined(TARGET_HAIKU)
+/* iface names are full /dev path with driver name */
+#define IFNAMSIZ PATH_MAX
+#else
 #define IFNAMSIZ 16
 #endif
+#endif
     char iface[IFNAMSIZ]; /* interface name (null terminated), may be empty */
 #endif
 

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/689?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d
Gerrit-Change-Number: 689
Gerrit-PatchSet: 1
Gerrit-Owner: kallisti5 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

kallisti5 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/689?usp=email )

Change subject: Haiku: Fix short interface path length
......................................................................

Patch Set 1:

(1 comment)

Patchset:

PS1:
This got missed in the last round of Haiku patches. Our device names are full paths, so need PATH_MAX

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/689?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d
Gerrit-Change-Number: 689
Gerrit-PatchSet: 1
Gerrit-Owner: kallisti5 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 01:51:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

#3 lore raw
In reply to a message not in the archive

Attention is currently required from: kallisti5, plaisthos.

flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/689?usp=email )

Change subject: Haiku: Fix short interface path length
......................................................................

Patch Set 1: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/689?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d
Gerrit-Change-Number: 689
Gerrit-PatchSet: 1
Gerrit-Owner: kallisti5 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: kallisti5 <[email protected]...>
Gerrit-Comment-Date: Tue, 28 Jan 2025 12:38:36 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#4 lore raw

PATCH 1/1 Haiku: Fix short interface path length

In reply to a message not in the archive

From: Alexander von Gluck <[email protected]...>

* Haiku uses full paths for interface names, 16 characters isn't enough.

Change-Id I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/689
This mail reflects revision 1 of this Change.

Signed-off-by line for the author was added as per our policy.

Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>

src/openvpn/route.h +7 -0
index 421e7d2..69b06b8 100644
@@ -155,6 +155,8 @@
     /* gateway interface */
 #ifdef _WIN32
     DWORD adapter_index; /* interface or ~0 if undefined */
+#elif defined(TARGET_HAIKU)
+    char iface[PATH_MAX]; /* iface names are full /dev path with driver name */
 #else
     char iface[16]; /* interface name (null terminated), may be empty */
 #endif
@@ -186,8 +188,13 @@
 #else
     /* non linux platform don't have this constant defined */
 #ifndef IFNAMSIZ
+#if defined(TARGET_HAIKU)
+/* iface names are full /dev path with driver name */
+#define IFNAMSIZ PATH_MAX
+#else
 #define IFNAMSIZ 16
 #endif
+#endif
     char iface[IFNAMSIZ]; /* interface name (null terminated), may be empty */
 #endif
 
#5 lore raw

[Openvpn-devel] [PATCH applied] Re: Haiku: Fix short interface path length

I'm not totally happy with another #ifdef added to that already-not-so-nice #orgy, but I see no more elegant way. One might consider to move the #define IFNAMSIZ further up, and use it in the "iface[16]" definition (getting rid of one #ifdef)... but that's somewhat outside the scope of this patch, so maybe I'll give it a go ;-)

Your patch has been applied to the master branch.

commit 34f302247c865827b7075422e32c272a203783cb

Author: Alexander von Gluck
Date:   Tue Jan 28 13:40:26 2025 +0100
     Haiku: Fix short interface path length

     Signed-off-by: Alexander von Gluck <[email protected]...>
     Acked-by: Frank Lichtenheld <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg30654.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#6 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#2) to the change originally created by kallisti5. ( http://gerrit.openvpn.net/c/openvpn/+/689?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld

Change subject: Haiku: Fix short interface path length
......................................................................

Haiku: Fix short interface path length

* Haiku uses full paths for interface names, 16 characters isn't enough.

Change-Id I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30654.html

---
M src/openvpn/route.h

1 file changed, 7 insertions(+), 0 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/89/689/2

src/openvpn/route.h +7 -0
index 421e7d2..69b06b8 100644
@@ -155,6 +155,8 @@
     /* gateway interface */
 #ifdef _WIN32
     DWORD adapter_index; /* interface or ~0 if undefined */
+#elif defined(TARGET_HAIKU)
+    char iface[PATH_MAX]; /* iface names are full /dev path with driver name */
 #else
     char iface[16]; /* interface name (null terminated), may be empty */
 #endif
@@ -186,8 +188,13 @@
 #else
     /* non linux platform don't have this constant defined */
 #ifndef IFNAMSIZ
+#if defined(TARGET_HAIKU)
+/* iface names are full /dev path with driver name */
+#define IFNAMSIZ PATH_MAX
+#else
 #define IFNAMSIZ 16
 #endif
+#endif
     char iface[IFNAMSIZ]; /* interface name (null terminated), may be empty */
 #endif
 

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/689?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d
Gerrit-Change-Number: 689
Gerrit-PatchSet: 2
Gerrit-Owner: kallisti5 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#7 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/689?usp=email )

Change subject: Haiku: Fix short interface path length
......................................................................

Haiku: Fix short interface path length

* Haiku uses full paths for interface names, 16 characters isn't enough.

Change-Id I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30654.html

---
M src/openvpn/route.h

1 file changed, 7 insertions(+), 0 deletions(-)
src/openvpn/route.h +7 -0
index 421e7d2..69b06b8 100644
@@ -155,6 +155,8 @@
     /* gateway interface */
 #ifdef _WIN32
     DWORD adapter_index; /* interface or ~0 if undefined */
+#elif defined(TARGET_HAIKU)
+    char iface[PATH_MAX]; /* iface names are full /dev path with driver name */
 #else
     char iface[16]; /* interface name (null terminated), may be empty */
 #endif
@@ -186,8 +188,13 @@
 #else
     /* non linux platform don't have this constant defined */
 #ifndef IFNAMSIZ
+#if defined(TARGET_HAIKU)
+/* iface names are full /dev path with driver name */
+#define IFNAMSIZ PATH_MAX
+#else
 #define IFNAMSIZ 16
 #endif
+#endif
     char iface[IFNAMSIZ]; /* interface name (null terminated), may be empty */
 #endif
 

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/689?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I6de60ed5c03ea45e1d7a3f7777bfc8ed5075e84d
Gerrit-Change-Number: 689
Gerrit-PatchSet: 2
Gerrit-Owner: kallisti5 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged