[Openvpn-devel] [L] Change in openvpn[master]: Remove instances of constParameterPointer cppcheck warnings
"flichtenheld \(Code Review\) via Openvpn-devel" <[email protected]>
| Newsgroups | net.sourceforge.lists.openvpn-devel |
|---|---|
| Message-ID | <f661e93fe56fe9ce80ab3c9008ee46ff07e5f47d-EmailReplacePatchSet-HTML@gerrit.openvpn.net> |
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1663?usp=email
to look at the new patch set (#11).
Change subject: Remove instances of constParameterPointer cppcheck warnings
......................................................................
Remove instances of constParameterPointer cppcheck warnings
This requires a few suppressions since cppcheck
doesn't quite understand the different code-paths
implemented by preprocessor defines.
Change-Id: I56248cf6d199c2da770774b8fd1e5daf2b116f58
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M dev-tools/cppcheck-suppression
M sample/sample-plugins/client-connect/sample-client-connect.c
M sample/sample-plugins/defer/multi-auth.c
M sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c
M src/openvpn/buffer.c
M src/openvpn/buffer.h
M src/openvpn/clinat.c
M src/openvpn/clinat.h
M src/openvpn/comp.c
M src/openvpn/comp.h
M src/openvpn/crypto.c
M src/openvpn/crypto.h
M src/openvpn/dco.c
M src/openvpn/dco.h
M src/openvpn/dco_freebsd.c
M src/openvpn/dco_internal.h
M src/openvpn/dco_linux.c
M src/openvpn/dco_win.c
M src/openvpn/dhcp.c
M src/openvpn/dhcp.h
M src/openvpn/event.h
M src/openvpn/forward.c
M src/openvpn/forward.h
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/interval.h
M src/openvpn/list.c
M src/openvpn/list.h
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mbuf.c
M src/openvpn/mbuf.h
M src/openvpn/mss.c
M src/openvpn/mss.h
M src/openvpn/mtcp.c
M src/openvpn/mtcp.h
M src/openvpn/mudp.c
M src/openvpn/multi.c
M src/openvpn/multi.h
M src/openvpn/networking.h
M src/openvpn/networking_iproute2.c
M src/openvpn/networking_sitnl.c
M src/openvpn/occ.h
M src/openvpn/openssl_compat.h
M src/openvpn/options.c
M src/openvpn/options_parse.c
M src/openvpn/otime.c
M src/openvpn/otime.h
M src/openvpn/proto.h
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ps.c
M src/openvpn/ps.h
M src/openvpn/push.c
M src/openvpn/push.h
M src/openvpn/push_util.c
M src/openvpn/reliable.c
M src/openvpn/reliable.h
M src/openvpn/route.c
M src/openvpn/schedule.c
M src/openvpn/socket.c
M src/openvpn/socket.h
M src/openvpn/socket_util.h
M src/openvpn/socks.c
M src/openvpn/socks.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
M src/openvpn/ssl_backend.h
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_openssl.c
M src/openvpn/ssl_pkt.c
M src/openvpn/ssl_pkt.h
M src/openvpn/ssl_verify.c
M src/openvpn/ssl_verify.h
M src/openvpn/status.c
M src/openvpn/status.h
M src/openvpn/tun.c
M src/openvpn/tun.h
M src/openvpn/tun_afunix.c
M src/openvpn/tun_afunix.h
M src/openvpn/vlan.c
M src/openvpn/vlan.h
M src/openvpn/win32.h
M src/openvpnmsica/openvpnmsica.c
M src/openvpnserv/interactive.c
M tests/unit_tests/openvpn/mock_management.c
M tests/unit_tests/openvpn/test_misc.c
M tests/unit_tests/openvpn/test_user_pass.c
88 files changed, 333 insertions(+), 289 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/63/1663/11
diff --git a/dev-tools/cppcheck-suppression b/dev-tools/cppcheck-suppression
index 900e03c..5bc4b24 100644
--- a/dev-tools/cppcheck-suppression
+++ b/dev-tools/cppcheck-suppression
@@ -2,7 +2,6 @@
# occurences right now. They still should be fixed at some point
constParameter
constParameterCallback
-constParameterPointer
invalidPrintfArgType_sint
invalidPrintfArgType_uint
usleepCalled
@@ -33,6 +32,39 @@
badBitmaskCheck:tests/unit_tests/openvpn/test_pkt.c
# IGN: we store integers in pointers
CastAddressToIntegerAtReturn:src/openvpn/multi.c
+constParameterPointer:/usr/include/*
+# IGN: test files provide mocks/stubs that match prototypes from headers exactly
+constParameterPointer:tests/unit_tests/openvpn/mock_*
+constParameterPointer:tests/unit_tests/openvpn/test_*
+constParameterPointer:tests/unit_tests/openvpnserv/test_*
+# FP: different crypto implementations but same API
+constParameterPointer:src/openvpn/crypto_mbedtls_legacy.c:85
+constParameterPointer:src/openvpn/crypto_openssl.c:172
+constParameterPointer:src/openvpn/crypto_openssl.c:1456
+constParameterPointer:src/openvpn/cryptoapi.c:58
+constParameterPointer:src/openvpn/ssl_mbedtls.c
+constParameterPointer:src/openvpn/ssl_openssl.c
+constParameterPointer:src/openvpn/ssl_verify_mbedtls.c
+# IGN: too many different implementations, not worth it
+constParameterPointer:src/openvpn/dco*
+constParameterPointer:src/openvpn/socket.*
+# FP: parameters are modified on some platform only
+constParameterPointer:src/openvpn/dns.c:859
+constParameterPointer:src/openvpn/error.c:223
+constParameterPointer:src/openvpn/forward.c:1247
+constParameterPointer:src/openvpn/manage.c:344
+constParameterPointer:src/openvpn/manage.c:3332
+constParameterPointer:src/openvpn/misc.c:792
+constParameterPointer:src/openvpn/misc.c:812
+constParameterPointer:src/openvpn/options.c:3205
+constParameterPointer:src/openvpn/route.c:3947
+constParameterPointer:src/openvpn/tun.c:560
+constParameterPointer:src/openvpn/tun.c:2188
+constParameterPointer:src/openvpn/tun_afunix.c
+# IGN: not a FP but the documentation for the FP_ISSET claims this is not const...
+constParameterPointer:src/openvpn/event.c:1015
+# IGN: MinGW Debug build doesn't like this, causes -Wmaybe-uninitialized
+constParameterPointer:src/openvpn/buffer.h:1105
# IGN: event code uses a pointer to store integers
intToPointerCast:src/openvpn/forward.c
intToPointerCast:src/openvpn/multi_io.c
diff --git a/sample/sample-plugins/client-connect/sample-client-connect.c b/sample/sample-plugins/client-connect/sample-client-connect.c
index 420de61..cbd98e8 100644
--- a/sample/sample-plugins/client-connect/sample-client-connect.c
+++ b/sample/sample-plugins/client-connect/sample-client-connect.c
@@ -344,7 +344,7 @@
}
int
-openvpn_plugin_client_connect(struct plugin_context *context, const char **argv, const char **envp)
+openvpn_plugin_client_connect(const struct plugin_context *context, const char **argv, const char **envp)
{
/* log environment variables handed to us by OpenVPN, but
* only if "setenv verb" is 3 or higher (arbitrary number)
@@ -465,7 +465,7 @@
int
openvpn_plugin_client_connect_defer_v2(struct plugin_context *context,
- struct plugin_per_client_context *pcc,
+ const struct plugin_per_client_context *pcc,
struct openvpn_plugin_string_list **return_list)
{
time_t time_left = pcc->sleep_until - time(NULL);
diff --git a/sample/sample-plugins/defer/multi-auth.c b/sample/sample-plugins/defer/multi-auth.c
index bacf557..cdd616f 100644
--- a/sample/sample-plugins/defer/multi-auth.c
+++ b/sample/sample-plugins/defer/multi-auth.c
@@ -255,7 +255,7 @@
}
static bool
-do_auth_user_pass(struct plugin_context *context, const char *username, const char *password)
+do_auth_user_pass(const struct plugin_context *context, const char *username, const char *password)
{
plog(context, PLOG_NOTE, "expect_user=%s, received_user=%s, expect_passw=%s, received_passw=%s",
np(context->test_valid_user), np(username), np(context->test_valid_pass), np(password));
@@ -279,7 +279,7 @@
static int
-auth_user_pass_verify(struct plugin_context *context, struct plugin_per_client_context *pcc,
+auth_user_pass_verify(const struct plugin_context *context, struct plugin_per_client_context *pcc,
const char *argv[], const char *envp[])
{
/* get username/password from envp string array */
diff --git a/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c b/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c
index 25c9ff5..512861a 100644
--- a/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c
+++ b/sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c
@@ -186,7 +186,7 @@
}
static void
-file_store(char *file, char *content)
+file_store(const char *file, const char *content)
{
FILE *f;
if (!(f = fopen(file, "w+")))
@@ -202,7 +202,7 @@
server_store(struct openvpn_plugin_args_func_in const *args)
{
struct plugin *plugin = (struct plugin *)args->handle;
- struct session *sess = (struct session *)args->per_client_context;
+ const struct session *sess = (struct session *)args->per_client_context;
char file[MAXPATH];
snprintf(file, sizeof(file) - 1, "/tmp/openvpn_sso_%s", sess->key);
@@ -214,7 +214,7 @@
client_store(struct openvpn_plugin_args_func_in const *args)
{
struct plugin *plugin = (struct plugin *)args->handle;
- struct session *sess = (struct session *)args->per_client_context;
+ const struct session *sess = (struct session *)args->per_client_context;
char *file = "/tmp/openvpn_sso_user";
ovpn_note("app session file: %s", file);
diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index f57c8c2..2f4d037 100644
--- a/src/openvpn/buffer.c
+++ b/src/openvpn/buffer.c
@@ -290,7 +290,7 @@
* truncated by buf_printf
*/
void
-buf_catrunc(struct buffer *buf, const char *str)
+buf_catrunc(const struct buffer *buf, const char *str)
{
if (buf_forward_capacity(buf) <= 1)
{
@@ -1091,7 +1091,7 @@
}
bool
-string_check_buf(struct buffer *buf, const unsigned int inclusive, const unsigned int exclusive)
+string_check_buf(const struct buffer *buf, const unsigned int inclusive, const unsigned int exclusive)
{
ASSERT(buf);
diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h
index 93aa786..a425737 100644
--- a/src/openvpn/buffer.h
+++ b/src/openvpn/buffer.h
@@ -488,7 +488,7 @@
* write a string to the end of a buffer that was
* truncated by buf_printf
*/
-void buf_catrunc(struct buffer *buf, const char *str);
+void buf_catrunc(const struct buffer *buf, const char *str);
/*
* Parse a string based on a given delimiter char
@@ -782,7 +782,7 @@
}
static inline int
-buf_peek_u8(struct buffer *buf)
+buf_peek_u8(const struct buffer *buf)
{
int ret;
if (BLEN(buf) < 1)
@@ -955,7 +955,7 @@
* @param exclusive Character classes that are not allowed even if they are also in inclusive.
* @return True if the string consists only of allowed characters, false otherwise.
*/
-bool string_check_buf(struct buffer *buf, const unsigned int inclusive,
+bool string_check_buf(const struct buffer *buf, const unsigned int inclusive,
const unsigned int exclusive);
/**
diff --git a/src/openvpn/clinat.c b/src/openvpn/clinat.c
index 32c1325..b465950 100644
--- a/src/openvpn/clinat.c
+++ b/src/openvpn/clinat.c
@@ -159,7 +159,7 @@
#endif
static void
-print_pkt(struct openvpn_iphdr *iph, const char *prefix, const int direction, const msglvl_t msglevel)
+print_pkt(const struct openvpn_iphdr *iph, const char *prefix, const int direction, const msglvl_t msglevel)
{
struct gc_arena gc = gc_new();
@@ -181,7 +181,7 @@
}
void
-client_nat_transform(const struct client_nat_option_list *list, struct buffer *ipbuf,
+client_nat_transform(const struct client_nat_option_list *list, const struct buffer *ipbuf,
const int direction)
{
struct ip_tcp_udp_hdr *h = (struct ip_tcp_udp_hdr *)BPTR(ipbuf);
diff --git a/src/openvpn/clinat.h b/src/openvpn/clinat.h
index 1e8ceb3..bc56037 100644
--- a/src/openvpn/clinat.h
+++ b/src/openvpn/clinat.h
@@ -60,7 +60,7 @@
const char *network, const char *netmask,
const char *foreign_network, msglvl_t msglevel);
-void client_nat_transform(const struct client_nat_option_list *list, struct buffer *ipbuf,
+void client_nat_transform(const struct client_nat_option_list *list, const struct buffer *ipbuf,
const int direction);
#endif /* if !defined(CLINAT_H) */
diff --git a/src/openvpn/comp.c b/src/openvpn/comp.c
index b88b79f..387a7c4 100644
--- a/src/openvpn/comp.c
+++ b/src/openvpn/comp.c
@@ -159,7 +159,7 @@
#endif /* USE_COMP */
bool
-check_compression_settings_valid(struct compress_options *info, msglvl_t msglevel)
+check_compression_settings_valid(const struct compress_options *info, msglvl_t msglevel)
{
/*
* We also allow comp-stub-v2 here as it technically allows escaping of
diff --git a/src/openvpn/comp.h b/src/openvpn/comp.h
index 29a90a2..ad80243 100644
--- a/src/openvpn/comp.h
+++ b/src/openvpn/comp.h
@@ -91,7 +91,7 @@
* flags of allow-compression and also the whether algorithms are compiled
* in
*/
-bool check_compression_settings_valid(struct compress_options *info, msglvl_t msglevel);
+bool check_compression_settings_valid(const struct compress_options *info, msglvl_t msglevel);
#ifdef USE_COMP
#include "buffer.h"
diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
index 67ff0d3..5753e4f 100644
--- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@ -1105,7 +1105,7 @@
}
static bool
-key_is_zero(struct key *key, const struct key_type *kt)
+key_is_zero(const struct key *key, const struct key_type *kt)
{
size_t cipher_length = cipher_kt_key_size(kt->cipher);
for (size_t i = 0; i < cipher_length; ++i)
@@ -1123,7 +1123,7 @@
* Make sure that cipher key is a valid key for current key_type.
*/
bool
-check_key(struct key *key, const struct key_type *kt)
+check_key(const struct key *key, const struct key_type *kt)
{
if (cipher_defined(kt->cipher))
{
@@ -1196,7 +1196,7 @@
}
void
-test_crypto(struct crypto_options *co, struct frame *frame)
+test_crypto(struct crypto_options *co, const struct frame *frame)
{
int i, j;
struct gc_arena gc = gc_new();
diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h
index ee5b50f..e3c1c6a 100644
--- a/src/openvpn/crypto.h
+++ b/src/openvpn/crypto.h
@@ -414,7 +414,7 @@
*/
int write_key_file(const int nkeys, const char *filename);
-bool check_key(struct key *key, const struct key_type *kt);
+bool check_key(const struct key *key, const struct key_type *kt);
/**
* Initialize a key_type structure with.
@@ -614,7 +614,7 @@
/** Print a cipher list entry */
void print_cipher(const char *cipher);
-void test_crypto(struct crypto_options *co, struct frame *f);
+void test_crypto(struct crypto_options *co, const struct frame *f);
/* key direction functions */
diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c
index f5d409d..fd56787 100644
--- a/src/openvpn/dco.c
+++ b/src/openvpn/dco.c
@@ -572,7 +572,7 @@
}
static bool
-dco_multi_get_localaddr(struct multi_context *m, struct multi_instance *mi,
+dco_multi_get_localaddr(const struct multi_context *m, const struct multi_instance *mi,
struct sockaddr_storage *local)
{
#if ENABLE_IP_PKTINFO
@@ -584,7 +584,7 @@
return false;
}
- struct link_socket_actual *actual = &c->c2.link_socket_infos[0]->lsa->actual;
+ const struct link_socket_actual *actual = &c->c2.link_socket_infos[0]->lsa->actual;
switch (actual->dest.addr.sa.sa_family)
{
@@ -622,7 +622,7 @@
}
int
-dco_multi_add_new_peer(struct multi_context *m, struct multi_instance *mi)
+dco_multi_add_new_peer(const struct multi_context *m, struct multi_instance *mi)
{
const struct context *c = &mi->context;
@@ -676,7 +676,7 @@
}
void
-dco_install_iroute(struct multi_context *m, struct multi_instance *mi, struct mroute_addr *addr)
+dco_install_iroute(struct multi_context *m, struct multi_instance *mi, const struct mroute_addr *addr)
{
#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) || defined(_WIN32)
if (!dco_enabled(&m->top.options))
@@ -795,7 +795,7 @@
/* Checked if we added a host route as the assigned client IP address was
* outside the --ifconfig-ipv6 tun interface config */
#if !defined(_WIN32)
- struct in6_addr *dest = &mi->context.c2.push_ifconfig_ipv6_local;
+ const struct in6_addr *dest = &mi->context.c2.push_ifconfig_ipv6_local;
if (multi_check_push_ifconfig_ipv6_extra_route(mi, dest))
{
/* On windows we do not install these routes, so we also do not need to delete them */
diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h
index 4e5aad5..694875c 100644
--- a/src/openvpn/dco.h
+++ b/src/openvpn/dco.h
@@ -204,7 +204,7 @@
* @param mi the client instance
* @return 0 on success or a negative error code otherwise
*/
-int dco_multi_add_new_peer(struct multi_context *m, struct multi_instance *mi);
+int dco_multi_add_new_peer(const struct multi_context *m, struct multi_instance *mi);
/**
* Install an iroute in DCO, which means adding a route to the system routing
@@ -215,7 +215,7 @@
* @param addr the route to add
*/
void dco_install_iroute(struct multi_context *m, struct multi_instance *mi,
- struct mroute_addr *addr);
+ const struct mroute_addr *addr);
/**
* Remove all routes added through the specified client
@@ -253,7 +253,7 @@
* a 64 bit packet counter and AEAD tag at the end.
*/
bool
-dco_supports_epoch_data(struct context *c);
+dco_supports_epoch_data(const struct context *c);
#else /* if defined(ENABLE_DCO) */
typedef void *dco_context_t;
@@ -350,7 +350,7 @@
}
static inline int
-dco_multi_add_new_peer(struct multi_context *m, struct multi_instance *mi)
+dco_multi_add_new_peer(const struct multi_context *m, struct multi_instance *mi)
{
return 0;
}
@@ -384,7 +384,7 @@
}
static inline bool
-dco_supports_epoch_data(struct context *c)
+dco_supports_epoch_data(const struct context *c)
{
return false;
}
diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c
index d933aaf..7346903 100644
--- a/src/openvpn/dco_freebsd.c
+++ b/src/openvpn/dco_freebsd.c
@@ -930,7 +930,7 @@
}
bool
-dco_supports_epoch_data(struct context *c)
+dco_supports_epoch_data(const struct context *c)
{
return false;
}
diff --git a/src/openvpn/dco_internal.h b/src/openvpn/dco_internal.h
index fcf8aca..1022e66 100644
--- a/src/openvpn/dco_internal.h
+++ b/src/openvpn/dco_internal.h
@@ -59,8 +59,9 @@
* They are implemented by dco_linux.c
*/
-int dco_new_peer(dco_context_t *dco, unsigned int peerid, socket_descriptor_t sd, struct sockaddr *localaddr,
- struct sockaddr *remoteaddr, const struct in_addr *vpn_ipv4, const struct in6_addr *vpn_ipv6);
+int dco_new_peer(dco_context_t *dco, unsigned int peerid, socket_descriptor_t sd,
+ struct sockaddr *localaddr, struct sockaddr *remoteaddr,
+ const struct in_addr *vpn_ipv4, const struct in6_addr *vpn_ipv6);
int dco_del_peer(dco_context_t *dco, unsigned int peerid);
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 56f6259..31bbe87 100644
--- a/src/openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -114,7 +114,7 @@
}
static struct nl_msg *
-ovpn_dco_nlmsg_create(dco_context_t *dco, uint8_t cmd)
+ovpn_dco_nlmsg_create(const dco_context_t *dco, uint8_t cmd)
{
struct nl_msg *nl_msg = nlmsg_alloc();
if (!nl_msg)
@@ -804,7 +804,7 @@
/* libnl < 3.11.0 does not implement nla_get_uint() */
static uint64_t
-ovpn_nla_get_uint(struct nlattr *attr)
+ovpn_nla_get_uint(const struct nlattr *attr)
{
if (nla_len(attr) == sizeof(uint32_t))
{
@@ -916,7 +916,7 @@
}
static bool
-ovpn_iface_check(dco_context_t *dco, struct nlattr *attrs[])
+ovpn_iface_check(const dco_context_t *dco, struct nlattr *attrs[])
{
/* we must know which interface this message is referring to in order to
* avoid mixing messages for other instances
@@ -1340,7 +1340,7 @@
}
bool
-dco_supports_epoch_data(struct context *c)
+dco_supports_epoch_data(const struct context *c)
{
return false;
}
diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c
index b3268bc..8deb9d8 100644
--- a/src/openvpn/dco_win.c
+++ b/src/openvpn/dco_win.c
@@ -1100,7 +1100,7 @@
}
bool
-dco_supports_epoch_data(struct context *c)
+dco_supports_epoch_data(const struct context *c)
{
OVPN_VERSION ver = { 0 };
return dco_get_version(&ver) && ((ver.Major == 2 && ver.Minor >= 8) || (ver.Major > 2));
diff --git a/src/openvpn/dhcp.c b/src/openvpn/dhcp.c
index a54ab3f..68173e6 100644
--- a/src/openvpn/dhcp.c
+++ b/src/openvpn/dhcp.c
@@ -145,7 +145,7 @@
}
in_addr_t
-dhcp_extract_router_msg(struct buffer *ipbuf)
+dhcp_extract_router_msg(const struct buffer *ipbuf)
{
struct dhcp_full *df = (struct dhcp_full *)BPTR(ipbuf);
const int optlen =
diff --git a/src/openvpn/dhcp.h b/src/openvpn/dhcp.h
index 38ebf8d..ed8a0c9 100644
--- a/src/openvpn/dhcp.h
+++ b/src/openvpn/dhcp.h
@@ -91,7 +91,7 @@
#pragma pack()
-in_addr_t dhcp_extract_router_msg(struct buffer *ipbuf);
+in_addr_t dhcp_extract_router_msg(const struct buffer *ipbuf);
#if defined(_WIN32) || defined(DHCP_UNIT_TEST)
#include "tun.h"
diff --git a/src/openvpn/event.h b/src/openvpn/event.h
index b784dfe..0940a1d 100644
--- a/src/openvpn/event.h
+++ b/src/openvpn/event.h
@@ -204,7 +204,7 @@
#else /* ifdef _WIN32 */
static inline void
-wait_signal(struct event_set *es, void *arg)
+wait_signal(const struct event_set *es, const void *arg)
{
}
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 6581998..4ddac11 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -231,7 +231,7 @@
}
static void
-parse_incoming_control_channel_command(struct context *c, struct buffer *buf)
+parse_incoming_control_channel_command(struct context *c, const struct buffer *buf)
{
if (buf_string_match_head_str(buf, "AUTH_FAILED"))
{
@@ -501,7 +501,7 @@
}
int
-get_server_poll_remaining_time(struct event_timeout *server_poll_timeout)
+get_server_poll_remaining_time(const struct event_timeout *server_poll_timeout)
{
update_time();
int remaining = event_timeout_remaining(server_poll_timeout);
@@ -598,7 +598,7 @@
* Buffer reallocation, for use with null encryption.
*/
static inline void
-buffer_turnover(const uint8_t *orig_buf, struct buffer *dest_stub, struct buffer *src_stub,
+buffer_turnover(const uint8_t *orig_buf, struct buffer *dest_stub, const struct buffer *src_stub,
struct buffer *storage)
{
if (orig_buf == src_stub->data && src_stub->data != storage->data)
@@ -885,7 +885,7 @@
*/
static inline void
-socks_postprocess_incoming_link(struct context *c, struct link_socket *sock)
+socks_postprocess_incoming_link(struct context *c, const struct link_socket *sock)
{
if (sock->socks_proxy && sock->info.proto == PROTO_UDP)
{
@@ -982,7 +982,7 @@
}
bool
-process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, bool floated)
+process_incoming_link_part1(struct context *c, const struct link_socket_info *lsi, bool floated)
{
struct gc_arena gc = gc_new();
bool decrypt_status = false;
@@ -1532,7 +1532,7 @@
* @param client Determines whether to the send packet back via tun or link
*/
void
-ipv6_send_icmp_unreachable(struct context *c, struct buffer *buf, bool client)
+ipv6_send_icmp_unreachable(struct context *c, const struct buffer *buf, bool client)
{
#define MAX_ICMPV6LEN 1280
struct openvpn_icmp6hdr icmp6out;
diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h
index 324c0b4..ee7d2e2 100644
--- a/src/openvpn/forward.h
+++ b/src/openvpn/forward.h
@@ -127,7 +127,7 @@
*/
void encrypt_sign(struct context *c, bool comp_frag);
-int get_server_poll_remaining_time(struct event_timeout *server_poll_timeout);
+int get_server_poll_remaining_time(const struct event_timeout *server_poll_timeout);
/**********************************************************************/
/**
@@ -178,7 +178,7 @@
*
* @return true if packet is authenticated, false otherwise.
*/
-bool process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, bool floated);
+bool process_incoming_link_part1(struct context *c, const struct link_socket_info *lsi, bool floated);
/**
* Continues processing a packet read from the external network interface.
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 218a663..11042f0 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -818,7 +818,7 @@
}
static void
-init_port_share(struct context *c)
+init_port_share(const struct context *c)
{
if (!port_share && (c->options.port_share_host && c->options.port_share_port))
{
@@ -1265,7 +1265,7 @@
* prepending to msg() output.
*/
const char *
-format_common_name(struct context *c, struct gc_arena *gc)
+format_common_name(const struct context *c, struct gc_arena *gc)
{
struct buffer out = alloc_buf_gc(256, gc);
if (c->c2.tls_multi)
@@ -1751,7 +1751,7 @@
static bool
-can_preserve_tun(struct tuntap *tt)
+can_preserve_tun(const struct tuntap *tt)
{
if (tt && tt->backend_driver == DRIVER_AFUNIX)
{
@@ -1773,7 +1773,7 @@
* @param c pointer to the connection context
*/
static void
-add_wfp_block(struct context *c)
+add_wfp_block(const struct context *c)
{
#if defined(_WIN32)
/* Fortify 'redirect-gateway block-local' with firewall rules? */
@@ -1799,7 +1799,7 @@
* @param adapter_index the VPN adapter index
*/
static void
-del_wfp_block(struct context *c, unsigned long adapter_index)
+del_wfp_block(const struct context *c, unsigned long adapter_index)
{
#if defined(_WIN32)
if (c->options.block_outside_dns || block_local_needed(c->c1.route_list))
diff --git a/src/openvpn/init.h b/src/openvpn/init.h
index 9d5050d..af4393c 100644
--- a/src/openvpn/init.h
+++ b/src/openvpn/init.h
@@ -91,7 +91,7 @@
unsigned int pull_permission_mask(const struct context *c);
-const char *format_common_name(struct context *c, struct gc_arena *gc);
+const char *format_common_name(const struct context *c, struct gc_arena *gc);
void reset_coarse_timers(struct context *c);
diff --git a/src/openvpn/interval.h b/src/openvpn/interval.h
index 59051bd..0cfe202 100644
--- a/src/openvpn/interval.h
+++ b/src/openvpn/interval.h
@@ -89,7 +89,7 @@
}
static inline void
-interval_schedule_wakeup(struct interval *top, interval_t *wakeup)
+interval_schedule_wakeup(const struct interval *top, interval_t *wakeup)
{
const time_t local_now = now;
interval_earliest_wakeup(wakeup, top->last_test_true + top->refresh, local_now);
@@ -214,7 +214,7 @@
* This function does not check if the timeout is actually valid.
*/
static inline interval_t
-event_timeout_remaining(struct event_timeout *et)
+event_timeout_remaining(const struct event_timeout *et)
{
return (interval_t)((et->last + et->n) - now);
}
diff --git a/src/openvpn/list.c b/src/openvpn/list.c
index 2553579..45b4f54 100644
--- a/src/openvpn/list.c
+++ b/src/openvpn/list.c
@@ -167,7 +167,7 @@
}
void
-hash_remove_by_value(struct hash *hash, void *value)
+hash_remove_by_value(struct hash *hash, const void *value)
{
struct hash_iterator hi;
const struct hash_element *he;
diff --git a/src/openvpn/list.h b/src/openvpn/list.h
index cbf1abf..07df3c14 100644
--- a/src/openvpn/list.h
+++ b/src/openvpn/list.h
@@ -78,7 +78,7 @@
bool hash_remove_fast(struct hash *hash, struct hash_bucket *bucket, const void *key, uint64_t hv);
-void hash_remove_by_value(struct hash *hash, void *value);
+void hash_remove_by_value(struct hash *hash, const void *value);
struct hash_iterator
{
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 604bbcd..17abfd8 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -330,7 +330,7 @@
}
static void
-man_delete_unix_socket(struct management *man)
+man_delete_unix_socket(const struct management *man)
{
#if UNIX_SOCK_SUPPORT
if ((man->settings.flags & (MF_UNIX_SOCK | MF_CONNECT_AS_CLIENT)) == MF_UNIX_SOCK)
@@ -675,7 +675,7 @@
* for the log and echo commands.
*/
static void
-man_history(struct management *man, const char *parm, const char *type, struct log_history *log,
+man_history(struct management *man, const char *parm, const char *type, const struct log_history *log,
bool *realtime, const unsigned int lep_flags)
{
struct gc_arena gc = gc_new();
@@ -843,7 +843,7 @@
}
static void
-man_forget_passwords(struct management *man)
+man_forget_passwords(const struct management *man)
{
ssl_purge_auth(false);
(void)ssl_clean_auth_token();
@@ -851,7 +851,7 @@
}
static void
-man_net(struct management *man)
+man_net(const struct management *man)
{
if (man->persist.callback.show_net)
{
@@ -887,7 +887,7 @@
#ifdef ENABLE_PKCS11
static void
-man_pkcs11_id_count(struct management *man)
+man_pkcs11_id_count(const struct management *man)
{
msg(M_CLIENT, ">PKCS11ID-COUNT:%d", pkcs11_management_id_count());
}
@@ -1350,7 +1350,7 @@
* @return Return whether p has n (or at least n) parameters
*/
static bool
-man_need(struct management *man, const char **p, const int n, unsigned int flags)
+man_need(const struct management *man, const char **p, const int n, unsigned int flags)
{
int i;
ASSERT(p[0]);
@@ -2365,7 +2365,7 @@
* the route/ifconfig/open tun command. See doc/android.txt for details.
*/
bool
-management_android_control(struct management *man, const char *command, const char *msg)
+management_android_control(const struct management *man, const char *command, const char *msg)
{
if (!man)
{
@@ -3013,7 +3013,7 @@
}
void
-management_up_down(struct management *man, const char *updown, const struct env_set *es)
+management_up_down(const struct management *man, const char *updown, const struct env_set *es)
{
if (man->settings.flags & MF_UP_DOWN)
{
@@ -3023,13 +3023,13 @@
}
void
-management_notify(struct management *man, const char *severity, const char *type, const char *text)
+management_notify(const struct management *man, const char *severity, const char *type, const char *text)
{
msg(M_CLIENT, ">NOTIFY:%s,%s,%s", severity, type, text);
}
void
-management_notify_generic(struct management *man, const char *str)
+management_notify_generic(const struct management *man, const char *str)
{
msg(M_CLIENT, "%s", str);
}
@@ -3115,7 +3115,8 @@
}
void
-management_notify_client_close(struct management *management, struct man_def_auth_context *mdac,
+management_notify_client_close(const struct management *management,
+ struct man_def_auth_context *mdac,
const struct env_set *es)
{
if ((mdac->flags & DAF_INITIAL_AUTH) && !(mdac->flags & DAF_CONNECTION_CLOSED))
@@ -3206,7 +3207,7 @@
}
void
-management_auth_failure(struct management *man, const char *type, const char *reason)
+management_auth_failure(const struct management *man, const char *type, const char *reason)
{
if (reason)
{
@@ -3219,7 +3220,7 @@
}
void
-management_auth_token(struct management *man, const char *token)
+management_auth_token(const struct management *man, const char *token)
{
msg(M_CLIENT, ">PASSWORD:Auth-Token:%s", token);
}
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index 1be3549..71680a6 100644
--- a/src/openvpn/manage.h
+++ b/src/openvpn/manage.h
@@ -362,7 +362,7 @@
const unsigned int flags, const char *static_challenge);
#ifdef TARGET_ANDROID
-bool management_android_control(struct management *man, const char *command, const char *msg);
+bool management_android_control(const struct management *man, const char *command, const char *msg);
#define ANDROID_KEEP_OLD_TUN 1
#define ANDROID_OPEN_BEFORE_CLOSE 2
@@ -376,12 +376,12 @@
void management_event_loop_n_seconds(struct management *man, int sec);
-void management_up_down(struct management *man, const char *updown, const struct env_set *es);
+void management_up_down(const struct management *man, const char *updown, const struct env_set *es);
-void management_notify(struct management *man, const char *severity, const char *type,
+void management_notify(const struct management *man, const char *severity, const char *type,
const char *text);
-void management_notify_generic(struct management *man, const char *str);
+void management_notify_generic(const struct management *man, const char *str);
void management_notify_client_needing_auth(struct management *management,
const unsigned int auth_id,
@@ -391,7 +391,7 @@
void management_connection_established(struct management *management,
struct man_def_auth_context *mdac, const struct env_set *es);
-void management_notify_client_close(struct management *management,
+void management_notify_client_close(const struct management *management,
struct man_def_auth_context *mdac, const struct env_set *es);
void management_learn_addr(struct management *management, struct man_def_auth_context *mdac,
@@ -476,12 +476,12 @@
* OpenVPN calls here to indicate a password failure
*/
-void management_auth_failure(struct management *man, const char *type, const char *reason);
+void management_auth_failure(const struct management *man, const char *type, const char *reason);
/*
* Echo an authentication token to management interface
*/
-void management_auth_token(struct management *man, const char *token);
+void management_auth_token(const struct management *man, const char *token);
/*
* These functions drive the bytecount in/out counters.
diff --git a/src/openvpn/mbuf.c b/src/openvpn/mbuf.c
index 7b790ed..9a37e30 100644
--- a/src/openvpn/mbuf.c
+++ b/src/openvpn/mbuf.c
@@ -149,7 +149,7 @@
}
void
-mbuf_dereference_instance(struct mbuf_set *ms, struct multi_instance *mi)
+mbuf_dereference_instance(struct mbuf_set *ms, const struct multi_instance *mi)
{
if (ms)
{
diff --git a/src/openvpn/mbuf.h b/src/openvpn/mbuf.h
index cfe698c..e368054 100644
--- a/src/openvpn/mbuf.h
+++ b/src/openvpn/mbuf.h
@@ -75,7 +75,7 @@
bool mbuf_extract_item(struct mbuf_set *ms, struct mbuf_item *item);
-void mbuf_dereference_instance(struct mbuf_set *ms, struct multi_instance *mi);
+void mbuf_dereference_instance(struct mbuf_set *ms, const struct multi_instance *mi);
static inline bool
mbuf_defined(const struct mbuf_set *ms)
diff --git a/src/openvpn/mss.c b/src/openvpn/mss.c
index 36bbb43..a7242a8 100644
--- a/src/openvpn/mss.c
+++ b/src/openvpn/mss.c
@@ -43,7 +43,7 @@
* if yes, hand to mss_fixup_dowork()
*/
void
-mss_fixup_ipv4(struct buffer *buf, uint16_t maxmss)
+mss_fixup_ipv4(const struct buffer *buf, uint16_t maxmss)
{
const struct openvpn_iphdr *pip;
int hlen;
@@ -80,7 +80,7 @@
* (IPv6 header structure is sufficiently different from IPv4...)
*/
void
-mss_fixup_ipv6(struct buffer *buf, uint16_t maxmss)
+mss_fixup_ipv6(const struct buffer *buf, uint16_t maxmss)
{
const struct openvpn_ipv6hdr *pip6;
struct buffer newbuf;
@@ -136,7 +136,7 @@
*/
void
-mss_fixup_dowork(struct buffer *buf, uint16_t maxmss)
+mss_fixup_dowork(const struct buffer *buf, uint16_t maxmss)
{
int olen, optlen;
uint8_t *opt;
@@ -239,8 +239,8 @@
}
static void
-frame_calculate_fragment(struct frame *frame, struct key_type *kt, const struct options *options,
- struct link_socket_info *lsi)
+frame_calculate_fragment(struct frame *frame, const struct key_type *kt, const struct options *options,
+ const struct link_socket_info *lsi)
{
#if defined(ENABLE_FRAGMENT)
size_t overhead;
@@ -269,8 +269,8 @@
}
static void
-frame_calculate_mssfix(struct frame *frame, struct key_type *kt, const struct options *options,
- struct link_socket_info *lsi)
+frame_calculate_mssfix(struct frame *frame, const struct key_type *kt, const struct options *options,
+ const struct link_socket_info *lsi)
{
if (options->ce.mssfix_fixed)
{
@@ -314,8 +314,8 @@
}
void
-frame_calculate_dynamic(struct frame *frame, struct key_type *kt, const struct options *options,
- struct link_socket_info *lsi)
+frame_calculate_dynamic(struct frame *frame, const struct key_type *kt, const struct options *options,
+ const struct link_socket_info *lsi)
{
if (options->ce.fragment > 0)
{
diff --git a/src/openvpn/mss.h b/src/openvpn/mss.h
index 1d092bb..6b832a2 100644
--- a/src/openvpn/mss.h
+++ b/src/openvpn/mss.h
@@ -29,15 +29,15 @@
#include "socket.h"
#include "ssl_common.h"
-void mss_fixup_ipv4(struct buffer *buf, uint16_t maxmss);
+void mss_fixup_ipv4(const struct buffer *buf, uint16_t maxmss);
-void mss_fixup_ipv6(struct buffer *buf, uint16_t maxmss);
+void mss_fixup_ipv6(const struct buffer *buf, uint16_t maxmss);
-void mss_fixup_dowork(struct buffer *buf, uint16_t maxmss);
+void mss_fixup_dowork(const struct buffer *buf, uint16_t maxmss);
/** Set the --mssfix option. */
-void frame_calculate_dynamic(struct frame *frame, struct key_type *kt,
- const struct options *options, struct link_socket_info *lsi);
+void frame_calculate_dynamic(struct frame *frame, const struct key_type *kt,
+ const struct options *options, const struct link_socket_info *lsi);
/**
* Checks and adjusts the fragment and mssfix value according to the
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 5d88f8a..922db3f 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -91,7 +91,7 @@
}
bool
-multi_tcp_instance_specific_init(struct multi_context *m, struct multi_instance *mi)
+multi_tcp_instance_specific_init(const struct multi_context *m, struct multi_instance *mi)
{
/* buffer for queued TCP socket output packets */
mi->tcp_link_out_deferred = mbuf_init(m->top.options.n_bcast_buf);
diff --git a/src/openvpn/mtcp.h b/src/openvpn/mtcp.h
index 9b7d1d2..bb117fa 100644
--- a/src/openvpn/mtcp.h
+++ b/src/openvpn/mtcp.h
@@ -35,7 +35,7 @@
void multi_tcp_dereference_instance(struct multi_io *multi_io, struct multi_instance *mi);
-bool multi_tcp_instance_specific_init(struct multi_context *m, struct multi_instance *mi);
+bool multi_tcp_instance_specific_init(const struct multi_context *m, struct multi_instance *mi);
void multi_tcp_instance_specific_free(struct multi_instance *mi);
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index def4769..02f111d 100644
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -74,7 +74,7 @@
static void
send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state,
- struct tls_auth_standalone *tas, struct session_id *sid,
+ const struct tls_auth_standalone *tas, const struct session_id *sid,
bool request_resend_wkc, struct link_socket *sock)
{
reset_packet_id_send(&state->tls_wrap_tmp.opt.packet_id.send);
@@ -97,7 +97,7 @@
enum first_packet_verdict verdict;
- struct tls_auth_standalone *tas = m->top.c2.tls_auth_standalone;
+ const struct tls_auth_standalone *tas = m->top.c2.tls_auth_standalone;
verdict = tls_pre_decrypt_lite(tas, state, &m->top.c2.from, &m->top.c2.buf);
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 862d5da..fae3d5f 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -57,7 +57,7 @@
#ifdef MULTI_DEBUG_EVENT_LOOP
static const char *
-id(struct multi_instance *mi)
+id(const struct multi_instance *mi)
{
if (mi)
{
@@ -1315,7 +1315,7 @@
* same common name.
*/
static void
-multi_delete_dup(struct multi_context *m, struct multi_instance *new_mi)
+multi_delete_dup(struct multi_context *m, const struct multi_instance *new_mi)
{
if (new_mi)
{
@@ -2260,7 +2260,7 @@
}
static bool
-multi_client_setup_dco_initial(struct multi_context *m, struct multi_instance *mi,
+multi_client_setup_dco_initial(const struct multi_context *m, struct multi_instance *mi,
struct gc_arena *gc)
{
if (!dco_enabled(&mi->context.options))
@@ -3195,7 +3195,7 @@
#if defined(ENABLE_DCO)
static void
-process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi, dco_context_t *dco)
+process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi, const dco_context_t *dco)
{
const char *reason = "ovpn-dco: unknown reason";
switch (dco->dco_del_peer_reason)
@@ -4239,7 +4239,7 @@
/* Searches for the address and deletes it if it is owned by the multi_instance */
static void
-multi_unlearn_addr(struct multi_context *m, struct multi_instance *mi, const struct mroute_addr *addr)
+multi_unlearn_addr(struct multi_context *m, const struct multi_instance *mi, const struct mroute_addr *addr)
{
struct hash_element *he;
const uint64_t hv = hash_value(m->vhash, addr);
@@ -4274,7 +4274,7 @@
* @param a The new IPv4 address in network byte order
*/
static void
-multi_unlearn_in_addr_t(struct multi_context *m, struct multi_instance *mi, in_addr_t a)
+multi_unlearn_in_addr_t(struct multi_context *m, const struct multi_instance *mi, in_addr_t a)
{
struct mroute_addr addr;
CLEAR(addr);
@@ -4292,7 +4292,7 @@
* @param a6 The new IPv6 address
*/
static void
-multi_unlearn_in6_addr(struct multi_context *m, struct multi_instance *mi, struct in6_addr a6)
+multi_unlearn_in6_addr(struct multi_context *m, const struct multi_instance *mi, struct in6_addr a6)
{
struct mroute_addr addr;
CLEAR(addr);
@@ -4408,7 +4408,7 @@
bool
multi_check_push_ifconfig_ipv6_extra_route(struct multi_instance *mi,
- struct in6_addr *dest)
+ const struct in6_addr *dest)
{
const struct options *o = &mi->context.options;
diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h
index 8b837fa..c285fc3 100644
--- a/src/openvpn/multi.h
+++ b/src/openvpn/multi.h
@@ -516,7 +516,7 @@
*/
static inline void
-set_prefix(struct multi_instance *mi)
+set_prefix(const struct multi_instance *mi)
{
#ifdef MULTI_DEBUG_EVENT_LOOP
if (mi->msg_prefix[0])
@@ -690,7 +690,7 @@
*/
bool
multi_check_push_ifconfig_ipv6_extra_route(struct multi_instance *mi,
- struct in6_addr *dest);
+ const struct in6_addr *dest);
/*
* Check for signals.
diff --git a/src/openvpn/networking.h b/src/openvpn/networking.h
index bce0c19..25233c8 100644
--- a/src/openvpn/networking.h
+++ b/src/openvpn/networking.h
@@ -44,7 +44,7 @@
*/
#if !defined(ENABLE_IPROUTE)
static inline int
-net_ctx_init(struct context *c, openvpn_net_ctx_t *ctx)
+net_ctx_init(const struct context *c, openvpn_net_ctx_t *ctx)
{
(void)c;
(void)ctx;
@@ -75,7 +75,7 @@
*
* @return 0 on success, a negative error code otherwise
*/
-int net_ctx_init(struct context *c, openvpn_net_ctx_t *ctx);
+int net_ctx_init(const struct context *c, openvpn_net_ctx_t *ctx);
/**
* Release resources allocated by the internal garbage collector
@@ -102,7 +102,7 @@
* @return 0 on success, negative error code on error
*/
int net_iface_new(openvpn_net_ctx_t *ctx, const openvpn_net_iface_t *iface, const char *type,
- void *arg);
+ const void *arg);
/**
* Retrieve the interface type
diff --git a/src/openvpn/networking_iproute2.c b/src/openvpn/networking_iproute2.c
index a1f3525..f091fb3 100644
--- a/src/openvpn/networking_iproute2.c
+++ b/src/openvpn/networking_iproute2.c
@@ -36,7 +36,7 @@
#include <netinet/in.h>
int
-net_ctx_init(struct context *c, openvpn_net_ctx_t *ctx)
+net_ctx_init(const struct context *c, openvpn_net_ctx_t *ctx)
{
ctx->es = NULL;
if (c)
@@ -61,7 +61,7 @@
}
int
-net_iface_new(openvpn_net_ctx_t *ctx, const char *iface, const char *type, void *arg)
+net_iface_new(openvpn_net_ctx_t *ctx, const char *iface, const char *type, const void *arg)
{
struct argv argv = argv_new();
diff --git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sitnl.c
index e6e72d0..a1d220f 100644
--- a/src/openvpn/networking_sitnl.c
+++ b/src/openvpn/networking_sitnl.c
@@ -987,7 +987,7 @@
}
static int
-sitnl_addr_del(sa_family_t af_family, const char *iface, inet_address_t *addr, int prefixlen)
+sitnl_addr_del(sa_family_t af_family, const char *iface, const inet_address_t *addr, int prefixlen)
{
int ifindex;
@@ -1230,8 +1230,8 @@
}
static int
-sitnl_route_del(const char *iface, sa_family_t af_family, inet_address_t *dst, int prefixlen,
- inet_address_t *gw, uint32_t table, int metric)
+sitnl_route_del(const char *iface, sa_family_t af_family, const inet_address_t *dst, int prefixlen,
+ const inet_address_t *gw, uint32_t table, int metric)
{
int ifindex = 0;
@@ -1308,7 +1308,7 @@
int
-net_iface_new(openvpn_net_ctx_t *ctx, const char *iface, const char *type, void *arg)
+net_iface_new(openvpn_net_ctx_t *ctx, const char *iface, const char *type, const void *arg)
{
struct sitnl_link_req req = {};
int ret = -1;
diff --git a/src/openvpn/occ.h b/src/openvpn/occ.h
index bda4f18..49def4d 100644
--- a/src/openvpn/occ.h
+++ b/src/openvpn/occ.h
@@ -156,7 +156,7 @@
* via control channel.
* @return control channel exit message should be used */
static inline bool
-cc_exit_notify_enabled(struct context *c)
+cc_exit_notify_enabled(const struct context *c)
{
/* Check if we have TLS active at all */
if (!c->c2.tls_multi)
diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h
index 098bdd5..1a934db 100644
--- a/src/openvpn/openssl_compat.h
+++ b/src/openvpn/openssl_compat.h
@@ -127,7 +127,7 @@
/* Mimics the functions but only when the default context without
* options is chosen */
static inline const EVP_CIPHER *
-EVP_CIPHER_fetch(void *ctx, const char *algorithm, const char *properties)
+EVP_CIPHER_fetch(const void *ctx, const char *algorithm, const char *properties)
{
ASSERT(!ctx);
ASSERT(!properties);
@@ -135,7 +135,7 @@
}
static inline const EVP_MD *
-EVP_MD_fetch(void *ctx, const char *algorithm, const char *properties)
+EVP_MD_fetch(const void *ctx, const char *algorithm, const char *properties)
{
ASSERT(!ctx);
ASSERT(!properties);
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 5451f86..5e74a41 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3076,7 +3076,7 @@
}
static void
-options_postprocess_mutate_le(struct connection_entry *ce, struct local_entry *le, int mode)
+options_postprocess_mutate_le(const struct connection_entry *ce, struct local_entry *le, int mode)
{
/* use the global port if none is specified */
if (!le->port)
@@ -5006,7 +5006,7 @@
static bool
verify_permission(const char *name, const char *file, int line, const uint64_t type,
const uint64_t allowed, uint64_t *found, const msglvl_t msglevel,
- struct options *options, bool is_inline)
+ const struct options *options, bool is_inline)
{
if (!(type & allowed))
{
@@ -5573,7 +5573,7 @@
}
static void
-show_compression_warning(struct compress_options *info)
+show_compression_warning(const struct compress_options *info)
{
if (comp_non_stub_enabled(info))
{
diff --git a/src/openvpn/options_parse.c b/src/openvpn/options_parse.c
index 88ab4d2..0e94522 100644
--- a/src/openvpn/options_parse.c
+++ b/src/openvpn/options_parse.c
@@ -258,7 +258,7 @@
}
static char *
-read_inline_file(struct in_src *is, const char *close_tag, int *num_lines, struct gc_arena *gc)
+read_inline_file(const struct in_src *is, const char *close_tag, int *num_lines, struct gc_arena *gc)
{
char line[OPTION_LINE_SIZE];
struct buffer buf = alloc_buf(8 * OPTION_LINE_SIZE);
@@ -302,7 +302,7 @@
}
static int
-check_inline_file(struct in_src *is, char *p[], struct gc_arena *gc)
+check_inline_file(const struct in_src *is, char *p[], struct gc_arena *gc)
{
int num_inline_lines = 0;
diff --git a/src/openvpn/otime.c b/src/openvpn/otime.c
index 1608458..5d3633c 100644
--- a/src/openvpn/otime.c
+++ b/src/openvpn/otime.c
@@ -66,7 +66,7 @@
}
void
-update_now_usec(struct timeval *tv)
+update_now_usec(const struct timeval *tv)
{
const time_t last = now;
update_now(tv->tv_sec);
diff --git a/src/openvpn/otime.h b/src/openvpn/otime.h
index f02cc31..cc92bf7 100644
--- a/src/openvpn/otime.h
+++ b/src/openvpn/otime.h
@@ -65,7 +65,7 @@
void update_now(const time_t system_time);
extern time_t now_usec;
-void update_now_usec(struct timeval *tv);
+void update_now_usec(const struct timeval *tv);
static inline int
openvpn_gettimeofday(struct timeval *tv, void *tz)
diff --git a/src/openvpn/proto.h b/src/openvpn/proto.h
index 3570582..33bf4ea 100644
--- a/src/openvpn/proto.h
+++ b/src/openvpn/proto.h
@@ -248,7 +248,7 @@
* and offset of IP header (via parameter).
*/
static inline int
-get_tun_ip_ver(int tunnel_type, struct buffer *buf, int *ip_hdr_offset)
+get_tun_ip_ver(int tunnel_type, const struct buffer *buf, int *ip_hdr_offset)
{
int ip_ver = -1;
diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c
index 4de7615..d4e0a8b 100644
--- a/src/openvpn/proxy.c
+++ b/src/openvpn/proxy.c
@@ -527,8 +527,9 @@
}
static bool
-add_proxy_headers(struct http_proxy_info *p, socket_descriptor_t sd, /* already open to proxy */
- const char *host /* openvpn server remote */
+add_proxy_headers(const struct http_proxy_info *p,
+ socket_descriptor_t sd, /* already open to proxy */
+ const char *host /* openvpn server remote */
)
{
char buf[512];
@@ -597,8 +598,8 @@
socket_descriptor_t sd, /* already open to proxy */
const char *host, /* openvpn server remote */
const char *port, /* openvpn server port */
- struct event_timeout *server_poll_timeout, struct buffer *lookahead,
- struct signal_info *sig_info)
+ const struct event_timeout *server_poll_timeout,
+ struct buffer *lookahead, struct signal_info *sig_info)
{
struct gc_arena gc = gc_new();
char buf[512];
diff --git a/src/openvpn/proxy.h b/src/openvpn/proxy.h
index e662e7d..a2f4e47 100644
--- a/src/openvpn/proxy.h
+++ b/src/openvpn/proxy.h
@@ -89,7 +89,7 @@
socket_descriptor_t sd, /* already open to proxy */
const char *host, /* openvpn server remote */
const char *port, /* openvpn server port */
- struct event_timeout *server_poll_timeout,
+ const struct event_timeout *server_poll_timeout,
struct buffer *lookahead, struct signal_info *sig_info);
uint8_t *make_base64_string2(const uint8_t *str, int str_len, struct gc_arena *gc);
diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c
index 57afacd..0e581e5 100644
--- a/src/openvpn/ps.c
+++ b/src/openvpn/ps.c
@@ -332,7 +332,7 @@
* the proxy can determine true client origin.
*/
static void
-journal_add(const char *journal_dir, struct proxy_connection *pc, struct proxy_connection *cp)
+journal_add(const char *journal_dir, const struct proxy_connection *pc, struct proxy_connection *cp)
{
struct openvpn_sockaddr from, to;
@@ -410,7 +410,7 @@
static bool
proxy_entry_new(struct proxy_connection **list, struct event_set *es,
const struct openvpn_sockaddr server_addr, const socket_descriptor_t sd_client,
- struct buffer *initial_data, const char *journal_dir)
+ const struct buffer *initial_data, const char *journal_dir)
{
socket_descriptor_t sd_server;
int status;
@@ -1013,7 +1013,7 @@
* call.
*/
void
-port_share_redirect(struct port_share *ps, const struct buffer *head, socket_descriptor_t sd)
+port_share_redirect(const struct port_share *ps, const struct buffer *head, socket_descriptor_t sd)
{
if (ps)
{
diff --git a/src/openvpn/ps.h b/src/openvpn/ps.h
index 557ecf5..918ceb6 100644
--- a/src/openvpn/ps.h
+++ b/src/openvpn/ps.h
@@ -49,7 +49,7 @@
bool is_openvpn_protocol(const struct buffer *buf);
-void port_share_redirect(struct port_share *ps, const struct buffer *head, socket_descriptor_t sd);
+void port_share_redirect(const struct port_share *ps, const struct buffer *head, socket_descriptor_t sd);
#endif /* if PORT_SHARE */
#endif /* ifndef PS_H */
diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index 79f20e1..2daee77 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -430,7 +430,7 @@
}
bool
-send_auth_pending_messages(struct tls_multi *tls_multi, struct tls_session *session,
+send_auth_pending_messages(const struct tls_multi *tls_multi, struct tls_session *session,
const char *extra, unsigned int timeout)
{
struct key_state *ks = &session->key[KS_PRIMARY];
diff --git a/src/openvpn/push.h b/src/openvpn/push.h
index dff945f..39302f6 100644
--- a/src/openvpn/push.h
+++ b/src/openvpn/push.h
@@ -117,7 +117,7 @@
* doc/management-notes.txt under client-pending-auth for
* more details on message format
*/
-bool send_auth_pending_messages(struct tls_multi *tls_multi, struct tls_session *session,
+bool send_auth_pending_messages(const struct tls_multi *tls_multi, struct tls_session *session,
const char *extra, unsigned int timeout);
void send_restart(struct context *c, const char *kill_msg);
diff --git a/src/openvpn/push_util.c b/src/openvpn/push_util.c
index af22af5..008d45f 100644
--- a/src/openvpn/push_util.c
+++ b/src/openvpn/push_util.c
@@ -222,7 +222,7 @@
/* Return true if the client supports push-update */
static bool
-support_push_update(struct multi_instance *mi)
+support_push_update(const struct multi_instance *mi)
{
ASSERT(mi->context.c2.tls_multi);
const unsigned int iv_proto_peer = extract_iv_proto(mi->context.c2.tls_multi->peer_info);
diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c
index 52adacf..3588483 100644
--- a/src/openvpn/reliable.c
+++ b/src/openvpn/reliable.c
@@ -92,7 +92,7 @@
/* check if a particular packet_id is present in ack */
static inline bool
-reliable_ack_packet_id_present(struct reliable_ack *ack, packet_id_type pid)
+reliable_ack_packet_id_present(const struct reliable_ack *ack, packet_id_type pid)
{
for (int i = 0; i < ack->len; ++i)
{
@@ -733,7 +733,7 @@
*/
void
-reliable_mark_active_incoming(struct reliable *rel, struct buffer *buf, packet_id_type pid,
+reliable_mark_active_incoming(struct reliable *rel, const struct buffer *buf, packet_id_type pid,
int opcode)
{
for (int i = 0; i < rel->size; ++i)
@@ -793,7 +793,7 @@
/* delete a buffer previously activated by reliable_mark_active() */
void
-reliable_mark_deleted(struct reliable *rel, struct buffer *buf)
+reliable_mark_deleted(struct reliable *rel, const struct buffer *buf)
{
for (int i = 0; i < rel->size; ++i)
{
diff --git a/src/openvpn/reliable.h b/src/openvpn/reliable.h
index a5ed75c..8d9e2e3 100644
--- a/src/openvpn/reliable.h
+++ b/src/openvpn/reliable.h
@@ -173,7 +173,7 @@
* @li False, if there are packet IDs to be acknowledged.
*/
static inline bool
-reliable_ack_empty(struct reliable_ack *ack)
+reliable_ack_empty(const struct reliable_ack *ack)
{
return !ack->len;
}
@@ -186,7 +186,7 @@
* @returns the number of outstanding acks
*/
static inline int
-reliable_ack_outstanding(struct reliable_ack *ack)
+reliable_ack_outstanding(const struct reliable_ack *ack)
{
return ack->len;
}
@@ -336,7 +336,7 @@
* @param pid The packet's packet ID.
* @param opcode The packet's opcode.
*/
-void reliable_mark_active_incoming(struct reliable *rel, struct buffer *buf, packet_id_type pid,
+void reliable_mark_active_incoming(struct reliable *rel, const struct buffer *buf, packet_id_type pid,
int opcode);
/**
@@ -389,7 +389,7 @@
* @param rel The reliable structure associated with the given buffer.
* @param buf The buffer of the reliable entry which is to be removed.
*/
-void reliable_mark_deleted(struct reliable *rel, struct buffer *buf);
+void reliable_mark_deleted(struct reliable *rel, const struct buffer *buf);
/** @} name Functions for extracting incoming packets */
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 03a2526..078bb7e 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -898,8 +898,9 @@
}
static bool
-add_bypass_routes(struct route_bypass *rb, in_addr_t gateway, const struct tuntap *tt,
- unsigned int flags, const struct route_gateway_info *rgi,
+add_bypass_routes(const struct route_bypass *rb, in_addr_t gateway,
+ const struct tuntap *tt, unsigned int flags,
+ const struct route_gateway_info *rgi,
const struct env_set *es, openvpn_net_ctx_t *ctx)
{
int ret = true;
@@ -916,8 +917,9 @@
}
static void
-del_bypass_routes(struct route_bypass *rb, in_addr_t gateway, const struct tuntap *tt,
- unsigned int flags, const struct route_gateway_info *rgi,
+del_bypass_routes(const struct route_bypass *rb, in_addr_t gateway,
+ const struct tuntap *tt, unsigned int flags,
+ const struct route_gateway_info *rgi,
const struct env_set *es, openvpn_net_ctx_t *ctx)
{
int i;
@@ -3942,7 +3944,7 @@
#else /* if defined(_WIN32) */
static void
-get_bypass_addresses(struct route_bypass *rb, const unsigned int flags) /* PLATFORM-SPECIFIC */
+get_bypass_addresses(struct route_bypass *rb, const unsigned int flags)
{
}
diff --git a/src/openvpn/schedule.c b/src/openvpn/schedule.c
index 6772ad6..694f4d1 100644
--- a/src/openvpn/schedule.c
+++ b/src/openvpn/schedule.c
@@ -389,4 +389,4 @@
{
s->earliest_wakeup = NULL; /* invalidate cache */
schedule_remove_node(s, e);
-}
\ No newline at end of file
+}
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 50126bf..6684350 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -619,7 +619,7 @@
}
static void
-bind_local(struct link_socket *sock, const sa_family_t ai_family)
+bind_local(const struct link_socket *sock, const sa_family_t ai_family)
{
/* bind to local address/port */
if (sock->bind_local)
@@ -886,8 +886,8 @@
}
void
-socket_bind(socket_descriptor_t sd, struct addrinfo *local, int ai_family, const char *prefix,
- bool ipv6only)
+socket_bind(socket_descriptor_t sd, const struct addrinfo *local, int ai_family,
+ const char *prefix, bool ipv6only)
{
struct gc_arena gc = gc_new();
@@ -1095,8 +1095,8 @@
* such as TCP.
*/
-static void stream_buf_init(struct stream_buf *sb, struct buffer *buf, const unsigned int sockflags,
- const int proto);
+static void stream_buf_init(struct stream_buf *sb, const struct buffer *buf,
+ const unsigned int sockflags, const int proto);
static void stream_buf_close(struct stream_buf *sb);
@@ -1453,7 +1453,7 @@
}
static void
-phase2_set_socket_flags(struct link_socket *sock)
+phase2_set_socket_flags(const struct link_socket *sock)
{
/* TCP_NODELAY is enabled by default on every TCP socket; dco-win is
* skipped as it manages its own socket */
@@ -2053,7 +2053,7 @@
}
static void
-stream_buf_init(struct stream_buf *sb, struct buffer *buf, const unsigned int sockflags,
+stream_buf_init(struct stream_buf *sb, const struct buffer *buf, const unsigned int sockflags,
const int proto)
{
sb->buf_init = *buf;
@@ -2319,7 +2319,7 @@
#endif
static ssize_t
-link_socket_read_udp_posix_recvmsg(struct link_socket *sock, struct buffer *buf,
+link_socket_read_udp_posix_recvmsg(const struct link_socket *sock, struct buffer *buf,
struct link_socket_actual *from, socklen_t *fromlen)
{
struct iovec iov;
@@ -2391,7 +2391,7 @@
#endif /* if ENABLE_IP_PKTINFO */
ssize_t
-link_socket_read_udp_posix(struct link_socket *sock, struct buffer *buf,
+link_socket_read_udp_posix(const struct link_socket *sock, struct buffer *buf,
struct link_socket_actual *from)
{
ssize_t recvlen;
@@ -2454,7 +2454,7 @@
#if ENABLE_IP_PKTINFO
ssize_t
-link_socket_write_udp_posix_sendmsg(struct link_socket *sock, struct buffer *buf,
+link_socket_write_udp_posix_sendmsg(const struct link_socket *sock, const struct buffer *buf,
struct link_socket_actual *to)
{
struct iovec iov;
@@ -2648,7 +2648,7 @@
}
int
-socket_send_queue(struct link_socket *sock, struct buffer *buf, const struct link_socket_actual *to)
+socket_send_queue(struct link_socket *sock, const struct buffer *buf, const struct link_socket_actual *to)
{
if (sock->writes.iostate == IOSTATE_INITIAL)
{
@@ -2748,8 +2748,8 @@
return sock->writes.iostate;
}
-void
-read_sockaddr_from_overlapped(struct overlapped_io *io, struct sockaddr *dst, int overlapped_ret)
+static void
+read_sockaddr_from_overlapped(const struct overlapped_io *io, struct sockaddr *dst, int overlapped_ret)
{
if (overlapped_ret >= 0 && io->addr_defined)
{
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index 89465bc..c6bcd86 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -268,7 +268,7 @@
int socket_recv_queue(struct link_socket *sock, int maxsize);
-int socket_send_queue(struct link_socket *sock, struct buffer *buf,
+int socket_send_queue(struct link_socket *sock, const struct buffer *buf,
const struct link_socket_actual *to);
typedef struct
@@ -348,8 +348,8 @@
struct link_socket *link_socket_new(void);
-void socket_bind(socket_descriptor_t sd, struct addrinfo *local, int af_family, const char *prefix,
- bool ipv6only);
+void socket_bind(socket_descriptor_t sd, const struct addrinfo *local, int af_family,
+ const char *prefix, bool ipv6only);
int openvpn_connect(socket_descriptor_t sd, const struct sockaddr *remote, int connect_timeout,
volatile int *signal_received);
@@ -483,7 +483,7 @@
}
static inline bool
-link_socket_verify_incoming_addr(struct buffer *buf, const struct link_socket_info *info,
+link_socket_verify_incoming_addr(const struct buffer *buf, const struct link_socket_info *info,
const struct link_socket_actual *from_addr)
{
if (buf->len > 0)
@@ -607,7 +607,7 @@
#else /* ifdef _WIN32 */
-ssize_t link_socket_read_udp_posix(struct link_socket *sock, struct buffer *buf,
+ssize_t link_socket_read_udp_posix(const struct link_socket *sock, struct buffer *buf,
struct link_socket_actual *from);
#endif /* ifdef _WIN32 */
@@ -693,12 +693,12 @@
#else /* ifdef _WIN32 */
-ssize_t link_socket_write_udp_posix_sendmsg(struct link_socket *sock, struct buffer *buf,
+ssize_t link_socket_write_udp_posix_sendmsg(const struct link_socket *sock, const struct buffer *buf,
struct link_socket_actual *to);
static inline ssize_t
-link_socket_write_udp_posix(struct link_socket *sock, struct buffer *buf,
+link_socket_write_udp_posix(const struct link_socket *sock, const struct buffer *buf,
struct link_socket_actual *to)
{
#if ENABLE_IP_PKTINFO
@@ -714,7 +714,7 @@
}
static inline ssize_t
-link_socket_write_tcp_posix(struct link_socket *sock, struct buffer *buf)
+link_socket_write_tcp_posix(const struct link_socket *sock, const struct buffer *buf)
{
return send(sock->sd, BPTR(buf), BLENZ(buf), MSG_NOSIGNAL);
}
@@ -772,7 +772,7 @@
* from tunnel packet.
*/
static inline void
-link_socket_set_tos(struct link_socket *sock)
+link_socket_set_tos(const struct link_socket *sock)
{
if (sock && sock->ptos_defined)
{
@@ -818,6 +818,8 @@
}
}
+/* cppcheck-suppress constParameterPointer
+ * sock is modified on Windows via &sock->listen_handle */
static inline void
socket_reset_listen_persistent(struct link_socket *sock)
{
diff --git a/src/openvpn/socket_util.h b/src/openvpn/socket_util.h
index 13f5962..add08ba 100644
--- a/src/openvpn/socket_util.h
+++ b/src/openvpn/socket_util.h
@@ -439,7 +439,7 @@
static inline bool
-addrlist_match_proto(const struct openvpn_sockaddr *a1, struct addrinfo *addr_list, const int proto)
+addrlist_match_proto(const struct openvpn_sockaddr *a1, const struct addrinfo *addr_list, const int proto)
{
return link_socket_proto_connection_oriented(proto) ? addrlist_match(a1, addr_list)
: addrlist_port_match(a1, addr_list);
diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c
index 19f3d54..77ca863 100644
--- a/src/openvpn/socks.c
+++ b/src/openvpn/socks.c
@@ -82,7 +82,7 @@
static bool
socks_proxy_recv_char(uint8_t *c, const char *name, socket_descriptor_t sd,
- struct event_timeout *server_poll_timeout,
+ const struct event_timeout *server_poll_timeout,
volatile int *signal_received)
{
fd_set reads;
@@ -97,8 +97,8 @@
}
static bool
-socks_username_password_auth(struct socks_proxy_info *p, socket_descriptor_t sd,
- struct event_timeout *server_poll_timeout,
+socks_username_password_auth(const struct socks_proxy_info *p, socket_descriptor_t sd,
+ const struct event_timeout *server_poll_timeout,
volatile int *signal_received)
{
char to_send[516];
@@ -156,8 +156,8 @@
}
static bool
-socks_handshake(struct socks_proxy_info *p, socket_descriptor_t sd,
- struct event_timeout *server_poll_timeout, volatile int *signal_received)
+socks_handshake(const struct socks_proxy_info *p, socket_descriptor_t sd,
+ const struct event_timeout *server_poll_timeout, volatile int *signal_received)
{
uint8_t buf[2];
int len = 0;
@@ -231,7 +231,7 @@
static bool
recv_socks_reply(socket_descriptor_t sd, struct openvpn_sockaddr *addr,
- struct event_timeout *server_poll_timeout, volatile int *signal_received)
+ const struct event_timeout *server_poll_timeout, volatile int *signal_received)
{
uint8_t atyp = 0;
int alen = 0;
@@ -334,11 +334,11 @@
}
void
-establish_socks_proxy_passthru(struct socks_proxy_info *p,
+establish_socks_proxy_passthru(const struct socks_proxy_info *p,
socket_descriptor_t sd, /* already open to proxy */
const char *host, /* openvpn server remote */
const char *servname, /* openvpn server port */
- struct event_timeout *server_poll_timeout,
+ const struct event_timeout *server_poll_timeout,
struct signal_info *sig_info)
{
char buf[270];
@@ -392,10 +392,10 @@
}
void
-establish_socks_proxy_udpassoc(struct socks_proxy_info *p,
+establish_socks_proxy_udpassoc(const struct socks_proxy_info *p,
socket_descriptor_t ctrl_sd, /* already open to proxy */
struct openvpn_sockaddr *relay_addr,
- struct event_timeout *server_poll_timeout,
+ const struct event_timeout *server_poll_timeout,
struct signal_info *sig_info)
{
if (!socks_handshake(p, ctrl_sd, server_poll_timeout, &sig_info->signal_received))
diff --git a/src/openvpn/socks.h b/src/openvpn/socks.h
index 846113d..f7c93b6 100644
--- a/src/openvpn/socks.h
+++ b/src/openvpn/socks.h
@@ -47,17 +47,17 @@
void socks_proxy_close(struct socks_proxy_info *sp);
-void establish_socks_proxy_passthru(struct socks_proxy_info *p,
+void establish_socks_proxy_passthru(const struct socks_proxy_info *p,
socket_descriptor_t sd, /* already open to proxy */
const char *host, /* openvpn server remote */
const char *servname, /* openvpn server port */
- struct event_timeout *server_poll_timeout,
+ const struct event_timeout *server_poll_timeout,
struct signal_info *sig_info);
-void establish_socks_proxy_udpassoc(struct socks_proxy_info *p,
+void establish_socks_proxy_udpassoc(const struct socks_proxy_info *p,
socket_descriptor_t ctrl_sd, /* already open to proxy */
struct openvpn_sockaddr *relay_addr,
- struct event_timeout *server_poll_timeout,
+ const struct event_timeout *server_poll_timeout,
struct signal_info *sig_info);
void socks_process_incoming_udp(struct buffer *buf, struct link_socket_actual *from);
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 5e12135..a13a71a 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1159,7 +1159,7 @@
}
struct tls_multi *
-tls_multi_init(struct tls_options *tls_options)
+tls_multi_init(const struct tls_options *tls_options)
{
struct tls_multi *ret;
@@ -1188,7 +1188,7 @@
*/
struct tls_auth_standalone *
-tls_auth_standalone_init(struct tls_options *tls_options, struct gc_arena *gc)
+tls_auth_standalone_init(const struct tls_options *tls_options, struct gc_arena *gc)
{
struct tls_auth_standalone *tas;
@@ -1336,7 +1336,7 @@
static void
init_epoch_keys(struct key_state *ks, struct tls_multi *multi, const struct key_type *key_type,
- bool server, struct key2 *key2)
+ bool server, const struct key2 *key2)
{
/* For now we hardcode this to be 16 for the software based data channel
* DCO based implementations/HW implementation might adjust this number
@@ -1375,7 +1375,7 @@
static void
init_key_contexts(struct key_state *ks, struct tls_multi *multi, const struct key_type *key_type,
- bool server, struct key2 *key2, bool dco_enabled)
+ bool server, const struct key2 *key2, bool dco_enabled)
{
struct key_ctx_bi *key = &ks->crypto_options.key_ctx_bi;
@@ -1573,8 +1573,9 @@
bool
tls_session_update_crypto_params_do_work(struct tls_multi *multi, struct tls_session *session,
- struct options *options, struct frame *frame,
- struct frame *frame_fragment, struct link_socket_info *lsi,
+ const struct options *options, struct frame *frame,
+ struct frame *frame_fragment,
+ const struct link_socket_info *lsi,
dco_context_t *dco)
{
if (session->key[KS_PRIMARY].crypto_options.key_ctx_bi.initialized)
@@ -1643,7 +1644,7 @@
bool
tls_session_update_crypto_params(struct tls_multi *multi, struct tls_session *session,
struct options *options, struct frame *frame,
- struct frame *frame_fragment, struct link_socket_info *lsi,
+ struct frame *frame_fragment, const struct link_socket_info *lsi,
dco_context_t *dco)
{
if (!check_session_cipher(session, options))
@@ -2495,8 +2496,8 @@
}
bool
-session_skip_to_pre_start(struct tls_session *session, struct tls_pre_decrypt_state *state,
- struct link_socket_actual *from)
+session_skip_to_pre_start(struct tls_session *session, const struct tls_pre_decrypt_state *state,
+ const struct link_socket_actual *from)
{
struct key_state *ks = &session->key[KS_PRIMARY];
ks->session_id_remote = state->peer_session_id;
@@ -4036,7 +4037,7 @@
}
void
-tls_post_encrypt(struct tls_multi *multi, struct buffer *buf)
+tls_post_encrypt(struct tls_multi *multi, const struct buffer *buf)
{
struct key_state *ks = multi->save_ks;
multi->save_ks = NULL;
@@ -4167,7 +4168,7 @@
* into a garbage collectable string which is returned.
*/
const char *
-protocol_dump(struct buffer *buffer, unsigned int flags, struct gc_arena *gc)
+protocol_dump(const struct buffer *buffer, unsigned int flags, struct gc_arena *gc)
{
struct buffer out = alloc_buf_gc(256, gc);
struct buffer buf = *buffer;
diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h
index 7ddf965..93e6200 100644
--- a/src/openvpn/ssl.h
+++ b/src/openvpn/ssl.h
@@ -166,7 +166,7 @@
*
* @return A newly allocated and initialized \c tls_multi structure.
*/
-struct tls_multi *tls_multi_init(struct tls_options *tls_options);
+struct tls_multi *tls_multi_init(const struct tls_options *tls_options);
/**
* Finalize initialization of a \c tls_multi structure.
@@ -187,7 +187,7 @@
/*
* Initialize a standalone tls-auth verification object.
*/
-struct tls_auth_standalone *tls_auth_standalone_init(struct tls_options *tls_options,
+struct tls_auth_standalone *tls_auth_standalone_init(const struct tls_options *tls_options,
struct gc_arena *gc);
/**
@@ -371,7 +371,7 @@
* @param multi - The TLS state for this packet's destination VPN tunnel.
* @param buf - The buffer containing the outgoing packet.
*/
-void tls_post_encrypt(struct tls_multi *multi, struct buffer *buf);
+void tls_post_encrypt(struct tls_multi *multi, const struct buffer *buf);
/** @} name Functions for managing security parameter state for data channel packets */
@@ -461,7 +461,8 @@
*/
bool tls_session_update_crypto_params(struct tls_multi *multi, struct tls_session *session,
struct options *options, struct frame *frame,
- struct frame *frame_fragment, struct link_socket_info *lsi,
+ struct frame *frame_fragment,
+ const struct link_socket_info *lsi,
dco_context_t *dco);
/*
@@ -525,7 +526,7 @@
#define PD_VERBOSE (1 << 10)
#define PD_TLS_CRYPT (1 << 11)
-const char *protocol_dump(struct buffer *buffer, unsigned int flags, struct gc_arena *gc);
+const char *protocol_dump(const struct buffer *buffer, unsigned int flags, struct gc_arena *gc);
/*
* debugging code
@@ -573,7 +574,7 @@
/* Special method to skip the three way handshake RESET stages. This is
* used by the HMAC code when seeing a packet that matches the previous
* HMAC based stateless server state */
-bool session_skip_to_pre_start(struct tls_session *session, struct tls_pre_decrypt_state *state,
- struct link_socket_actual *from);
+bool session_skip_to_pre_start(struct tls_session *session, const struct tls_pre_decrypt_state *state,
+ const struct link_socket_actual *from);
#endif /* ifndef OPENVPN_SSL_H */
diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h
index 816fb9c..ed395e7 100644
--- a/src/openvpn/ssl_backend.h
+++ b/src/openvpn/ssl_backend.h
@@ -144,7 +144,7 @@
*
* @return true if the context is initialised, false if not.
*/
-bool tls_ctx_initialised(struct tls_root_ctx *ctx);
+bool tls_ctx_initialised(const struct tls_root_ctx *ctx);
/**
* Set any library specific options.
@@ -177,7 +177,7 @@
* @param ciphers String containing : delimited cipher names, or NULL to use
* sane defaults.
*/
-void tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers);
+void tls_ctx_restrict_ciphers_tls13(const struct tls_root_ctx *ctx, const char *ciphers);
/**
* Set the TLS certificate profile. The profile defines which crypto
diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c
index d5c9e5c..49ea0bc 100644
--- a/src/openvpn/ssl_mbedtls.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -161,7 +161,7 @@
}
bool
-tls_ctx_initialised(struct tls_root_ctx *ctx)
+tls_ctx_initialised(const struct tls_root_ctx *ctx)
{
/* either this should be NULL or should be non-null and then have a
* valid TLS ctx inside as well */
@@ -284,7 +284,7 @@
}
void
-tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers)
+tls_ctx_restrict_ciphers_tls13(const struct tls_root_ctx *ctx, const char *ciphers)
{
if (ciphers == NULL)
{
diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index d31f78f..401bd1b 100644
--- a/src/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -147,7 +147,7 @@
}
bool
-tls_ctx_initialised(struct tls_root_ctx *ctx)
+tls_ctx_initialised(const struct tls_root_ctx *ctx)
{
/* either this should be NULL or should be non-null and then have a
* valid TLS ctx inside as well */
@@ -464,7 +464,7 @@
#endif
void
-tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers)
+tls_ctx_restrict_ciphers_tls13(const struct tls_root_ctx *ctx, const char *ciphers)
{
if (ciphers == NULL)
{
@@ -1111,7 +1111,7 @@
}
static void
-tls_ctx_load_cert_uri(struct tls_root_ctx *tls_ctx, const char *uri)
+tls_ctx_load_cert_uri(const struct tls_root_ctx *tls_ctx, const char *uri)
{
#if defined(HAVE_OPENSSL_STORE_API)
X509 *x = NULL;
@@ -2026,7 +2026,7 @@
}
static void
-bio_debug_data(const char *mode, BIO *bio, const uint8_t *buf, int len, const char *desc)
+bio_debug_data(const char *mode, const BIO *bio, const uint8_t *buf, int len, const char *desc)
{
struct gc_arena gc = gc_new();
if (len > 0)
@@ -2040,7 +2040,7 @@
}
static void
-bio_debug_oc(const char *mode, BIO *bio)
+bio_debug_oc(const char *mode, const BIO *bio)
{
open_biofp();
fprintf(biofp, "BIO %s time=%" PRIi64 " bio=" ptr_format "\n", mode, (int64_t)time(NULL),
diff --git a/src/openvpn/ssl_pkt.c b/src/openvpn/ssl_pkt.c
index f8444451..e2a0c62 100644
--- a/src/openvpn/ssl_pkt.c
+++ b/src/openvpn/ssl_pkt.c
@@ -57,7 +57,7 @@
* @return if the swap was successful (buf was large enough)
*/
static bool
-swap_hmac(struct buffer *buf, const struct crypto_options *co, bool incoming)
+swap_hmac(const struct buffer *buf, const struct crypto_options *co, bool incoming)
{
ASSERT(co);
@@ -117,7 +117,7 @@
*/
static void
tls_wrap_control(struct tls_wrap_ctx *ctx, uint8_t header, struct buffer *buf,
- struct session_id *session_id)
+ const struct session_id *session_id)
{
if (ctx->mode == TLS_WRAP_AUTH || ctx->mode == TLS_WRAP_NONE)
{
@@ -401,9 +401,9 @@
struct buffer
-tls_reset_standalone(struct tls_wrap_ctx *ctx, struct tls_auth_standalone *tas,
- struct session_id *own_sid, struct session_id *remote_sid, uint8_t header,
- bool request_resend_wkc)
+tls_reset_standalone(struct tls_wrap_ctx *ctx, const struct tls_auth_standalone *tas,
+ const struct session_id *own_sid, const struct session_id *remote_sid,
+ uint8_t header, bool request_resend_wkc)
{
/* Copy buffer here to point at the same data but allow tls_wrap_control
* to potentially change buf to point to another buffer without
diff --git a/src/openvpn/ssl_pkt.h b/src/openvpn/ssl_pkt.h
index 82cb5b1..9107ae1 100644
--- a/src/openvpn/ssl_pkt.h
+++ b/src/openvpn/ssl_pkt.h
@@ -218,8 +218,9 @@
* from the tls pre decrypt state.
*
*/
-struct buffer tls_reset_standalone(struct tls_wrap_ctx *ctx, struct tls_auth_standalone *tas,
- struct session_id *own_sid, struct session_id *remote_sid,
+struct buffer tls_reset_standalone(struct tls_wrap_ctx *ctx, const struct tls_auth_standalone *tas,
+ const struct session_id *own_sid,
+ const struct session_id *remote_sid,
uint8_t header, bool request_resend_wkc);
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index 063fa5d..3304cb46 100644
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -1139,7 +1139,7 @@
* cache.
*/
static bool
-tls_authentication_status_use_cache(struct tls_multi *multi)
+tls_authentication_status_use_cache(const struct tls_multi *multi)
{
unsigned int idx = min_uint(multi->tas_cache_num_updates, SIZE(cache_intervals) - 1);
time_t latency = cache_intervals[idx];
@@ -1283,7 +1283,7 @@
* Check if the script/plugin left a message in the auth failed message
* file and relay it to the user */
static void
-check_for_client_reason(struct tls_multi *multi, struct auth_deferred_status *status)
+check_for_client_reason(struct tls_multi *multi, const struct auth_deferred_status *status)
{
struct gc_arena gc = gc_new();
const char *msg = key_state_check_auth_failed_message_file(status, &gc);
@@ -1552,7 +1552,7 @@
#endif /* ifdef ENABLE_MANAGEMENT */
static bool
-set_verify_user_pass_env(struct user_pass *up, struct tls_multi *multi, struct tls_session *session)
+set_verify_user_pass_env(const struct user_pass *up, struct tls_multi *multi, struct tls_session *session)
{
/* Is username defined? */
if ((session->opt->ssl_flags & SSLF_AUTH_USER_PASS_OPTIONAL) || strlen(up->username))
@@ -1580,7 +1580,7 @@
}
bool
-ssl_verify_username_length(struct tls_session *session, const char *username)
+ssl_verify_username_length(const struct tls_session *session, const char *username)
{
if ((session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME)
&& strlen(username) > TLS_USERNAME_LEN)
diff --git a/src/openvpn/ssl_verify.h b/src/openvpn/ssl_verify.h
index 3176d76..e77bc4a 100644
--- a/src/openvpn/ssl_verify.h
+++ b/src/openvpn/ssl_verify.h
@@ -202,7 +202,7 @@
* @return true if name is under limit or username-as-common-name
* is not active
*/
-bool ssl_verify_username_length(struct tls_session *session, const char *username);
+bool ssl_verify_username_length(const struct tls_session *session, const char *username);
/**
* Runs the --client-crresponse script if one is defined.
@@ -275,7 +275,7 @@
void auth_set_client_reason(struct tls_multi *multi, const char *client_reason);
static inline const char *
-tls_client_reason(struct tls_multi *multi)
+tls_client_reason(const struct tls_multi *multi)
{
return multi->client_reason;
}
diff --git a/src/openvpn/status.c b/src/openvpn/status.c
index c7d375b..cfbc38d 100644
--- a/src/openvpn/status.c
+++ b/src/openvpn/status.c
@@ -135,7 +135,7 @@
}
void
-status_reset(struct status_output *so)
+status_reset(const struct status_output *so)
{
if (so && so->fd >= 0)
{
diff --git a/src/openvpn/status.h b/src/openvpn/status.h
index 7953a4e..4c01d75 100644
--- a/src/openvpn/status.h
+++ b/src/openvpn/status.h
@@ -69,7 +69,7 @@
bool status_trigger(struct status_output *so);
-void status_reset(struct status_output *so);
+void status_reset(const struct status_output *so);
void status_flush(struct status_output *so);
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index bc262cd..7e1999d 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -835,7 +835,7 @@
const char *ifconfig_ipv6_local_parm, /* --ifconfig parm 1 IPv6 */
int ifconfig_ipv6_netbits_parm,
const char *ifconfig_ipv6_remote_parm, /* --ifconfig parm 2 IPv6 */
- struct addrinfo *local_public, struct addrinfo *remote_public, const bool strict_warn,
+ const struct addrinfo *local_public, const struct addrinfo *remote_public, const bool strict_warn,
struct env_set *es, openvpn_net_ctx_t *ctx, struct tuntap *tt)
{
if (!tt)
@@ -978,7 +978,7 @@
* -> helper function to simplify code below
*/
static void
-add_route_connected_v6_net(struct tuntap *tt, const struct env_set *es)
+add_route_connected_v6_net(const struct tuntap *tt, const struct env_set *es)
{
struct route_ipv6 r6;
@@ -1020,7 +1020,7 @@
*/
in_addr_t
-create_arbitrary_remote(struct tuntap *tt)
+create_arbitrary_remote(const struct tuntap *tt)
{
in_addr_t remote;
@@ -1592,7 +1592,7 @@
}
static void
-undo_ifconfig_ipv4(struct tuntap *tt, openvpn_net_ctx_t *ctx)
+undo_ifconfig_ipv4(const struct tuntap *tt, openvpn_net_ctx_t *ctx)
{
#if defined(TARGET_LINUX)
int netbits = netmask_to_netbits2(tt->remote_netmask);
@@ -1627,7 +1627,7 @@
}
static void
-undo_ifconfig_ipv6(struct tuntap *tt, openvpn_net_ctx_t *ctx)
+undo_ifconfig_ipv6(const struct tuntap *tt, openvpn_net_ctx_t *ctx)
{
#if defined(TARGET_LINUX)
if (net_addr_v6_del(ctx, tt->actual_name, &tt->local_ipv6, tt->netbits_ipv6) < 0)
@@ -1652,7 +1652,7 @@
}
void
-undo_ifconfig(struct tuntap *tt, openvpn_net_ctx_t *ctx)
+undo_ifconfig(const struct tuntap *tt, openvpn_net_ctx_t *ctx)
{
if (tt->backend_driver != DRIVER_NULL && tt->backend_driver != DRIVER_AFUNIX)
{
@@ -1729,7 +1729,7 @@
#endif
static ssize_t
-write_tun_header(struct tuntap *tt, uint8_t *buf, int len)
+write_tun_header(const struct tuntap *tt, const uint8_t *buf, int len)
{
if (tt->type == DEV_TYPE_TUN)
{
@@ -1746,9 +1746,11 @@
type = htonl(AF_INET);
}
+ /* argument to writev is a pointer to const but we still need to drop
+ * the const from buf pointer here */
iv[0].iov_base = &type;
iv[0].iov_len = sizeof(type);
- iv[1].iov_base = buf;
+ iv[1].iov_base = (void *)buf;
iv[1].iov_len = len;
return header_modify_read_write_return(writev(tt->fd, iv, 2));
@@ -1760,7 +1762,7 @@
}
static ssize_t
-read_tun_header(struct tuntap *tt, uint8_t *buf, int len)
+read_tun_header(const struct tuntap *tt, uint8_t *buf, int len)
{
if (tt->type == DEV_TYPE_TUN)
{
@@ -1786,13 +1788,13 @@
*/
#if !defined(TARGET_DARWIN)
ssize_t
-write_tun(struct tuntap *tt, uint8_t *buf, int len)
+write_tun(const struct tuntap *tt, const uint8_t *buf, int len)
{
return write_tun_header(tt, buf, len);
}
ssize_t
-read_tun(struct tuntap *tt, uint8_t *buf, int len)
+read_tun(const struct tuntap *tt, uint8_t *buf, int len)
{
return read_tun_header(tt, buf, len);
}
@@ -1808,7 +1810,7 @@
#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
static bool
-tun_dco_enabled(struct tuntap *tt)
+tun_dco_enabled(const struct tuntap *tt)
{
return tt->backend_driver == DRIVER_DCO;
}
@@ -2055,13 +2057,13 @@
}
ssize_t
-write_tun(struct tuntap *tt, uint8_t *buf, int len)
+write_tun(const struct tuntap *tt, const uint8_t *buf, int len)
{
return write(tt->fd, buf, len);
}
ssize_t
-read_tun(struct tuntap *tt, uint8_t *buf, int len)
+read_tun(const struct tuntap *tt, uint8_t *buf, int len)
{
return read(tt->fd, buf, len);
}
@@ -2260,13 +2262,13 @@
}
ssize_t
-write_tun(struct tuntap *tt, uint8_t *buf, int len)
+write_tun(const struct tuntap *tt, const uint8_t *buf, int len)
{
return write(tt->fd, buf, len);
}
ssize_t
-read_tun(struct tuntap *tt, uint8_t *buf, int len)
+read_tun(const struct tuntap *tt, uint8_t *buf, int len)
{
return read(tt->fd, buf, len);
}
@@ -2596,7 +2598,7 @@
}
ssize_t
-write_tun(struct tuntap *tt, uint8_t *buf, int len)
+write_tun(const struct tuntap *tt, const uint8_t *buf, int len)
{
struct strbuf sbuf;
sbuf.len = len;
@@ -2605,7 +2607,7 @@
}
ssize_t
-read_tun(struct tuntap *tt, uint8_t *buf, int len)
+read_tun(const struct tuntap *tt, uint8_t *buf, int len)
{
struct strbuf sbuf;
int f = 0;
@@ -3103,7 +3105,7 @@
}
ssize_t
-write_tun(struct tuntap *tt, uint8_t *buf, int len)
+write_tun(const struct tuntap *tt, const uint8_t *buf, int len)
{
if (tt->backend_driver == DRIVER_UTUN)
{
@@ -3116,7 +3118,7 @@
}
ssize_t
-read_tun(struct tuntap *tt, uint8_t *buf, int len)
+read_tun(const struct tuntap *tt, uint8_t *buf, int len)
{
if (tt->backend_driver == DRIVER_UTUN)
{
@@ -3320,7 +3322,7 @@
}
int
-tun_write_queue(struct tuntap *tt, struct buffer *buf)
+tun_write_queue(struct tuntap *tt, const struct buffer *buf)
{
if (tt->writes.iostate == IOSTATE_INITIAL)
{
@@ -3375,7 +3377,7 @@
}
int
-tun_write_win32(struct tuntap *tt, struct buffer *buf)
+tun_write_win32(struct tuntap *tt, const struct buffer *buf)
{
int err = 0;
int status = 0;
@@ -5383,7 +5385,7 @@
}
void
-fork_register_dns_action(struct tuntap *tt)
+fork_register_dns_action(const struct tuntap *tt)
{
if (tt && tt->options.register_dns && tt->options.msg_channel)
{
@@ -5473,7 +5475,7 @@
}
static void
-tuntap_get_mtu(struct tuntap *tt)
+tuntap_get_mtu(const struct tuntap *tt)
{
ULONG mtu = 0;
DWORD len;
@@ -6048,7 +6050,7 @@
}
void
-tun_show_debug(struct tuntap *tt)
+tun_show_debug(const struct tuntap *tt)
{
if (tt->backend_driver == WINDOWS_DRIVER_TAP_WINDOWS6)
{
diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h
index 931e54d..beb0d0e 100644
--- a/src/openvpn/tun.h
+++ b/src/openvpn/tun.h
@@ -272,9 +272,9 @@
void close_tun_handle(struct tuntap *tt);
-ssize_t write_tun(struct tuntap *tt, uint8_t *buf, int len);
+ssize_t write_tun(const struct tuntap *tt, const uint8_t *buf, int len);
-ssize_t read_tun(struct tuntap *tt, uint8_t *buf, int len);
+ssize_t read_tun(const struct tuntap *tt, uint8_t *buf, int len);
#ifdef ENABLE_FEATURE_TUN_PERSIST
void tuncfg(const char *dev, const char *dev_type, const char *dev_node, int persist_mode,
@@ -293,7 +293,7 @@
const char *ifconfig_ipv6_local_parm, /* --ifconfig parm 1 / IPv6 */
int ifconfig_ipv6_netbits_parm, /* --ifconfig parm 1 / bits */
const char *ifconfig_ipv6_remote_parm, /* --ifconfig parm 2 / IPv6 */
- struct addrinfo *local_public, struct addrinfo *remote_public,
+ const struct addrinfo *local_public, const struct addrinfo *remote_public,
const bool strict_warn, struct env_set *es, openvpn_net_ctx_t *ctx,
struct tuntap *tt);
@@ -320,7 +320,7 @@
* @param tt the tuntap interface context
* @param ctx the networking API opaque context
*/
-void undo_ifconfig(struct tuntap *tt, openvpn_net_ctx_t *ctx);
+void undo_ifconfig(const struct tuntap *tt, openvpn_net_ctx_t *ctx);
bool is_dev_type(const char *dev, const char *dev_type, const char *match_type);
@@ -351,7 +351,7 @@
#define IFCONFIG_DEFAULT IFCONFIG_AFTER_TUN_OPEN
static inline int
-ifconfig_order(struct tuntap *tt)
+ifconfig_order(const struct tuntap *tt)
{
if (tt->backend_driver == DRIVER_AFUNIX)
{
@@ -381,7 +381,7 @@
#define ROUTE_ORDER_DEFAULT ROUTE_AFTER_TUN
static inline int
-route_order(struct tuntap *tt)
+route_order(const struct tuntap *tt)
{
if (tt->backend_driver == DRIVER_AFUNIX)
{
@@ -454,13 +454,13 @@
const char *tap_win_getinfo(const struct tuntap *tt, struct gc_arena *gc);
-void tun_show_debug(struct tuntap *tt);
+void tun_show_debug(const struct tuntap *tt);
bool dhcp_release_by_adapter_index(const DWORD adapter_index);
bool dhcp_renew_by_adapter_index(const DWORD adapter_index);
-void fork_register_dns_action(struct tuntap *tt);
+void fork_register_dns_action(const struct tuntap *tt);
void ipconfig_register_dns(const struct env_set *es);
@@ -470,7 +470,7 @@
int tun_read_queue(struct tuntap *tt, int maxsize);
-int tun_write_queue(struct tuntap *tt, struct buffer *buf);
+int tun_write_queue(struct tuntap *tt, const struct buffer *buf);
static inline bool
tuntap_stop(int status)
@@ -499,7 +499,7 @@
return false;
}
-int tun_write_win32(struct tuntap *tt, struct buffer *buf);
+int tun_write_win32(struct tuntap *tt, const struct buffer *buf);
static inline bool
is_ip_packet_valid(const struct buffer *buf)
@@ -529,13 +529,13 @@
}
static inline bool
-tuntap_is_dco_win(struct tuntap *tt)
+tuntap_is_dco_win(const struct tuntap *tt)
{
return tt && tt->backend_driver == DRIVER_DCO;
}
static inline bool
-tuntap_is_dco_win_timeout(struct tuntap *tt, ssize_t status)
+tuntap_is_dco_win_timeout(const struct tuntap *tt, ssize_t status)
{
return tuntap_is_dco_win(tt) && (status < 0) && (openvpn_errno() == ERROR_NETNAME_DELETED);
}
@@ -555,25 +555,25 @@
}
static inline void
-tun_standby_init(struct tuntap *tt)
+tun_standby_init(const struct tuntap *tt)
{
}
static inline bool
-tun_standby(struct tuntap *tt)
+tun_standby(const struct tuntap *tt)
{
return true;
}
static inline bool
-tuntap_is_dco_win(struct tuntap *tt)
+tuntap_is_dco_win(const struct tuntap *tt)
{
return false;
}
static inline bool
-tuntap_is_dco_win_timeout(struct tuntap *tt, ssize_t status)
+tuntap_is_dco_win_timeout(const struct tuntap *tt, ssize_t status)
{
return false;
}
diff --git a/src/openvpn/tun_afunix.c b/src/openvpn/tun_afunix.c
index a67a472..e9223bc 100644
--- a/src/openvpn/tun_afunix.c
+++ b/src/openvpn/tun_afunix.c
@@ -48,7 +48,7 @@
static void
-tun_afunix_exec_child(const char *dev_node, struct tuntap *tt, struct env_set *env)
+tun_afunix_exec_child(const char *dev_node, struct tuntap *tt, const struct env_set *env)
{
const char *msgprefix = "ERROR: failure executing process for tun:";
struct argv argv = argv_new();
@@ -73,7 +73,7 @@
}
void
-open_tun_afunix(struct options *o, int mtu, struct tuntap *tt, struct env_set *orig_env)
+open_tun_afunix(const struct options *o, int mtu, struct tuntap *tt, const struct env_set *orig_env)
{
struct gc_arena gc = gc_new();
diff --git a/src/openvpn/tun_afunix.h b/src/openvpn/tun_afunix.h
index 5b6a8e0..fb88eb2 100644
--- a/src/openvpn/tun_afunix.h
+++ b/src/openvpn/tun_afunix.h
@@ -31,7 +31,7 @@
* the user provided taking care of implementing the actual tun
* device.
*/
-void open_tun_afunix(struct options *o, int mtu, struct tuntap *tt, struct env_set *env);
+void open_tun_afunix(const struct options *o, int mtu, struct tuntap *tt, const struct env_set *env);
/**
diff --git a/src/openvpn/vlan.c b/src/openvpn/vlan.c
index bffc60e..cd32a9b 100644
--- a/src/openvpn/vlan.c
+++ b/src/openvpn/vlan.c
@@ -288,7 +288,7 @@
}
void
-vlan_process_outgoing_tun(struct multi_context *m, struct multi_instance *mi)
+vlan_process_outgoing_tun(const struct multi_context *m, struct multi_instance *mi)
{
if (!m->top.options.vlan_tagging)
{
diff --git a/src/openvpn/vlan.h b/src/openvpn/vlan.h
index 9389f89..cd2f66f 100644
--- a/src/openvpn/vlan.h
+++ b/src/openvpn/vlan.h
@@ -35,6 +35,6 @@
bool vlan_is_tagged(const struct buffer *buf);
-void vlan_process_outgoing_tun(struct multi_context *m, struct multi_instance *mi);
+void vlan_process_outgoing_tun(const struct multi_context *m, struct multi_instance *mi);
#endif /* VLAN_H */
diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h
index ef32062..bcbfa67 100644
--- a/src/openvpn/win32.h
+++ b/src/openvpn/win32.h
@@ -226,7 +226,7 @@
void overlapped_io_close(struct overlapped_io *o);
static inline bool
-overlapped_io_active(struct overlapped_io *o)
+overlapped_io_active(const struct overlapped_io *o)
{
return o->iostate == IOSTATE_QUEUED || o->iostate == IOSTATE_IMMEDIATE_RETURN;
}
diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c
index a861e8a..25fa1e4 100644
--- a/src/openvpnmsica/openvpnmsica.c
+++ b/src/openvpnmsica/openvpnmsica.c
@@ -77,7 +77,7 @@
* @return ERROR_SUCCESS on success; An error code otherwise
*/
static UINT
-setup_sequence(_In_ MSIHANDLE hInstall, _In_z_ LPCWSTR szProperty, _In_ struct msica_arg_seq *seq)
+setup_sequence(_In_ MSIHANDLE hInstall, _In_z_ LPCWSTR szProperty, _In_ const struct msica_arg_seq *seq)
{
UINT uiResult;
LPWSTR szSequence = msica_arg_seq_join(seq);
diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index a9e9665..36c2847 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -522,7 +522,7 @@
static SOCKADDR_INET
-sockaddr_inet(short family, inet_address_t *addr)
+sockaddr_inet(short family, const inet_address_t *addr)
{
SOCKADDR_INET sa_inet;
ZeroMemory(&sa_inet, sizeof(sa_inet));
@@ -3841,7 +3841,7 @@
static DWORD
UpdateWaitHandles(LPHANDLE *handles_ptr, LPDWORD count, HANDLE io_event, HANDLE exit_event,
- list_item_t *threads)
+ const list_item_t *threads)
{
static DWORD size = 10;
static LPHANDLE handles = NULL;
diff --git a/tests/unit_tests/openvpn/mock_management.c b/tests/unit_tests/openvpn/mock_management.c
index 77f6ce2..fff4c2b 100644
--- a/tests/unit_tests/openvpn/mock_management.c
+++ b/tests/unit_tests/openvpn/mock_management.c
@@ -36,7 +36,7 @@
struct management *management; /* GLOBAL */
void
-management_auth_failure(struct management *man, const char *type, const char *reason)
+management_auth_failure(const struct management *man, const char *type, const char *reason)
{
ASSERT(false);
}
diff --git a/tests/unit_tests/openvpn/test_misc.c b/tests/unit_tests/openvpn/test_misc.c
index 6c39b7f..8c964c7 100644
--- a/tests/unit_tests/openvpn/test_misc.c
+++ b/tests/unit_tests/openvpn/test_misc.c
@@ -145,7 +145,7 @@
}
static struct hash_element *
-hash_lookup_by_value(struct hash *hash, void *value)
+hash_lookup_by_value(struct hash *hash, const void *value)
{
struct hash_iterator hi;
struct hash_element *he;
diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/openvpn/test_user_pass.c
index c0a0866..7636a33 100644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
@@ -59,7 +59,7 @@
return mock();
}
void
-management_auth_failure(struct management *man, const char *type, const char *reason)
+management_auth_failure(const struct management *man, const char *type, const char *reason)
{
assert_true(0);
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1663?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: I56248cf6d199c2da770774b8fd1e5daf2b116f58
Gerrit-Change-Number: 1663
Gerrit-PatchSet: 11
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel