Skip to contentSkip to conversation

Change in openvpn[master]: Remove various unused structs

Openvpn-devel In review flichtenheld (Code Review) 2 participants 6 messages Apr 4 – Apr 5 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.1775321000000.I46499ff1f40dbdb94b84d58d17457d0ccdd75288@...2715...

#1 lore raw

Attention is currently required from: plaisthos.

Hello plaisthos,

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

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

to review the following change.

Change subject: Remove various unused structs
......................................................................

Remove various unused structs

Change-Id I46499ff1f40dbdb94b84d58d17457d0ccdd75288

---
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
M src/openvpn/networking_sitnl.c
M src/openvpn/route.c

4 files changed, 0 insertions(+), 31 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/07/1607/1

src/openvpn/mtcp.c +0 -8
index b7bef46..2eab7b7 100644
@@ -37,14 +37,6 @@
 #include <sys/inotify.h>
 #endif
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 struct multi_instance *
 multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock)
 {
src/openvpn/multi_io.c +0 -8
index f484fe2..e6f4e9c 100644
@@ -46,14 +46,6 @@
 #define MULTI_IO_FILE_CLOSE_WRITE ((void *)5)
 #define MULTI_IO_DCO              ((void *)6)
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 #ifdef ENABLE_DEBUG
 static const char *
 pract(int action)
src/openvpn/networking_sitnl.c +0 -9
index b88f03c..baf6f89 100644
@@ -124,15 +124,6 @@
 typedef int (*sitnl_parse_reply_cb)(struct nlmsghdr *msg, void *arg);
 
 /**
- * Object returned by route request operation
- */
-struct sitnl_route_data_cb
-{
-    unsigned int iface;
-    inet_address_t gw;
-};
-
-/**
  * Helper function used to easily add attributes to a rtnl message
  */
 static int
src/openvpn/route.c +0 -6
index 1cfbf80..3b18f74 100644
@@ -3257,12 +3257,6 @@
  * netlink(3), netlink(7), rtnetlink(7)
  * https://www.virtualbox.org/svn/vbox/trunk/src/VBox/NetworkServices/NAT/
  */
-struct rtreq
-{
-    struct nlmsghdr nh;
-    struct rtmsg rtm;
-    char attrbuf[512];
-};
 
 void
 get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, const struct in6_addr *dest,

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

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

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

Attention is currently required from: flichtenheld, plaisthos.

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

Change subject: Remove various unused structs
......................................................................

Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I46499ff1f40dbdb94b84d58d17457d0ccdd75288
Gerrit-Change-Number: 1607
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[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: Sat, 04 Apr 2026 20:36:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes

#3 lore raw

PATCH 1/1 Remove various unused structs

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

Change-Id I46499ff1f40dbdb94b84d58d17457d0ccdd75288

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1607
---

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/+/1607
This mail reflects revision 1 of this Change.

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

src/openvpn/mtcp.c +0 -8
index b7bef46..2eab7b7 100644
@@ -37,14 +37,6 @@
 #include <sys/inotify.h>
 #endif
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 struct multi_instance *
 multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock)
 {
src/openvpn/multi_io.c +0 -8
index f484fe2..e6f4e9c 100644
@@ -46,14 +46,6 @@
 #define MULTI_IO_FILE_CLOSE_WRITE ((void *)5)
 #define MULTI_IO_DCO              ((void *)6)
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 #ifdef ENABLE_DEBUG
 static const char *
 pract(int action)
src/openvpn/networking_sitnl.c +0 -9
index b88f03c..baf6f89 100644
@@ -124,15 +124,6 @@
 typedef int (*sitnl_parse_reply_cb)(struct nlmsghdr *msg, void *arg);
 
 /**
- * Object returned by route request operation
- */
-struct sitnl_route_data_cb
-{
-    unsigned int iface;
-    inet_address_t gw;
-};
-
-/**
  * Helper function used to easily add attributes to a rtnl message
  */
 static int
src/openvpn/route.c +0 -6
index 1cfbf80..3b18f74 100644
@@ -3257,12 +3257,6 @@
  * netlink(3), netlink(7), rtnetlink(7)
  * https://www.virtualbox.org/svn/vbox/trunk/src/VBox/NetworkServices/NAT/
  */
-struct rtreq
-{
-    struct nlmsghdr nh;
-    struct rtmsg rtm;
-    char attrbuf[512];
-};
 
 void
 get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, const struct in6_addr *dest,
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: Remove various unused structs

Easy to test for - "compile this on all relevant platforms and see if something *does* needs the structures". BB nicely did that for me :-) - so I just stared a bit at the diff and wondered.

I see no real convincing need for this to go to release/2.7, so applied to master only. If we want release/2.7 to be cppcheck clean, we could debate backporting these (but we didn't want to go there with the integer related cleanups either).

Your patch has been applied to the master branch.

commit b6cea99f4a36d170b2c11c89ba95b4dce255b3ee

Author: Frank Lichtenheld
Date:   Sat Apr 4 22:36:09 2026 +0200
     Remove various unused structs

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1607
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg36468.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 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 flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1607?usp=email )

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

Change subject: Remove various unused structs
......................................................................

Remove various unused structs

Change-Id I46499ff1f40dbdb94b84d58d17457d0ccdd75288

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1607
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36468.html

---
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
M src/openvpn/networking_sitnl.c
M src/openvpn/route.c

4 files changed, 0 insertions(+), 31 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/07/1607/2

src/openvpn/mtcp.c +0 -8
index b7bef46..2eab7b7 100644
@@ -37,14 +37,6 @@
 #include <sys/inotify.h>
 #endif
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 struct multi_instance *
 multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock)
 {
src/openvpn/multi_io.c +0 -8
index f484fe2..e6f4e9c 100644
@@ -46,14 +46,6 @@
 #define MULTI_IO_FILE_CLOSE_WRITE ((void *)5)
 #define MULTI_IO_DCO              ((void *)6)
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 #ifdef ENABLE_DEBUG
 static const char *
 pract(int action)
src/openvpn/networking_sitnl.c +0 -9
index b88f03c..baf6f89 100644
@@ -124,15 +124,6 @@
 typedef int (*sitnl_parse_reply_cb)(struct nlmsghdr *msg, void *arg);
 
 /**
- * Object returned by route request operation
- */
-struct sitnl_route_data_cb
-{
-    unsigned int iface;
-    inet_address_t gw;
-};
-
-/**
  * Helper function used to easily add attributes to a rtnl message
  */
 static int
src/openvpn/route.c +0 -6
index 1cfbf80..3b18f74 100644
@@ -3257,12 +3257,6 @@
  * netlink(3), netlink(7), rtnetlink(7)
  * https://www.virtualbox.org/svn/vbox/trunk/src/VBox/NetworkServices/NAT/
  */
-struct rtreq
-{
-    struct nlmsghdr nh;
-    struct rtmsg rtm;
-    char attrbuf[512];
-};
 
 void
 get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, const struct in6_addr *dest,

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

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

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

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

Change subject: Remove various unused structs
......................................................................

Remove various unused structs

Change-Id I46499ff1f40dbdb94b84d58d17457d0ccdd75288

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1607
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36468.html

---
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
M src/openvpn/networking_sitnl.c
M src/openvpn/route.c

4 files changed, 0 insertions(+), 31 deletions(-)
src/openvpn/mtcp.c +0 -8
index b7bef46..2eab7b7 100644
@@ -37,14 +37,6 @@
 #include <sys/inotify.h>
 #endif
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 struct multi_instance *
 multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock)
 {
src/openvpn/multi_io.c +0 -8
index f484fe2..e6f4e9c 100644
@@ -46,14 +46,6 @@
 #define MULTI_IO_FILE_CLOSE_WRITE ((void *)5)
 #define MULTI_IO_DCO              ((void *)6)
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 #ifdef ENABLE_DEBUG
 static const char *
 pract(int action)
src/openvpn/networking_sitnl.c +0 -9
index b88f03c..baf6f89 100644
@@ -124,15 +124,6 @@
 typedef int (*sitnl_parse_reply_cb)(struct nlmsghdr *msg, void *arg);
 
 /**
- * Object returned by route request operation
- */
-struct sitnl_route_data_cb
-{
-    unsigned int iface;
-    inet_address_t gw;
-};
-
-/**
  * Helper function used to easily add attributes to a rtnl message
  */
 static int
src/openvpn/route.c +0 -6
index 1cfbf80..3b18f74 100644
@@ -3257,12 +3257,6 @@
  * netlink(3), netlink(7), rtnetlink(7)
  * https://www.virtualbox.org/svn/vbox/trunk/src/VBox/NetworkServices/NAT/
  */
-struct rtreq
-{
-    struct nlmsghdr nh;
-    struct rtmsg rtm;
-    char attrbuf[512];
-};
 
 void
 get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, const struct in6_addr *dest,

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

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