Remove various unused function parameters

flichtenheld · cron2 · commit cedddc1d7419 · 2025-03-08T13:14:28.000+01:00
Change-Id: Ia3b0f22b0049a111ce52b3c87dd08a843ea9a919 Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20250308100456.32383-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31064.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
@@ -257,11 +257,11 @@ parse_incoming_control_channel_command(struct context *c, struct buffer *buf)
     }
     else if (buf_string_match_head_str(buf, "INFO_PRE"))
     {
-        server_pushed_info(c, buf, 8);
+        server_pushed_info(buf, 8);
     }
     else if (buf_string_match_head_str(buf, "INFO"))
     {
-        server_pushed_info(c, buf, 4);
+        server_pushed_info(buf, 4);
     }
     else if (buf_string_match_head_str(buf, "CR_RESPONSE"))
     {
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
@@ -1769,8 +1769,7 @@ multi_client_connect_mda(struct multi_context *m,
 }
 
 static void
-multi_client_connect_setenv(struct multi_context *m,
-                            struct multi_instance *mi)
+multi_client_connect_setenv(struct multi_instance *mi)
 {
     struct gc_arena gc = gc_new();
 
@@ -2565,7 +2564,7 @@ multi_client_connect_early_setup(struct multi_context *m,
     /* do --client-connect setenvs */
     multi_select_virtual_addr(m, mi);
 
-    multi_client_connect_setenv(m, mi);
+    multi_client_connect_setenv(mi);
 }
 
 /**
@@ -2658,7 +2657,7 @@ multi_client_connect_source_ccd(struct multi_context *m,
              */
             multi_select_virtual_addr(m, mi);
 
-            multi_client_connect_setenv(m, mi);
+            multi_client_connect_setenv(mi);
 
             ret = CC_RET_SUCCEEDED;
         }
@@ -2930,7 +2929,6 @@ static void
 multi_bcast(struct multi_context *m,
             const struct buffer *buf,
             const struct multi_instance *sender_instance,
-            const struct mroute_addr *sender_addr,
             uint16_t vid)
 {
     struct hash_iterator hi;
@@ -3458,7 +3456,7 @@ multi_process_incoming_link(struct multi_context *m, struct multi_instance *inst
                     if (mroute_flags & MROUTE_EXTRACT_MCAST)
                     {
                         /* for now, treat multicast as broadcast */
-                        multi_bcast(m, &c->c2.to_tun, m->pending, NULL, 0);
+                        multi_bcast(m, &c->c2.to_tun, m->pending, 0);
                     }
                     else /* possible client to client routing */
                     {
@@ -3510,8 +3508,7 @@ multi_process_incoming_link(struct multi_context *m, struct multi_instance *inst
                         {
                             if (mroute_flags & (MROUTE_EXTRACT_BCAST|MROUTE_EXTRACT_MCAST))
                             {
-                                multi_bcast(m, &c->c2.to_tun, m->pending, NULL,
-                                            vid);
+                                multi_bcast(m, &c->c2.to_tun, m->pending, vid);
                             }
                             else /* try client-to-client routing */
                             {
@@ -3604,7 +3601,7 @@ multi_process_incoming_tun(struct multi_context *m, const unsigned int mpp_flags
             if (mroute_flags & (MROUTE_EXTRACT_BCAST|MROUTE_EXTRACT_MCAST))
             {
                 /* for now, treat multicast as broadcast */
-                multi_bcast(m, &m->top.c2.buf, NULL, NULL, vid);
+                multi_bcast(m, &m->top.c2.buf, NULL, vid);
             }
             else
             {
@@ -3776,7 +3773,7 @@ gremlin_flood_clients(struct multi_context *m)
 
         for (i = 0; i < parm.n_packets; ++i)
         {
-            multi_bcast(m, &buf, NULL, NULL, 0);
+            multi_bcast(m, &buf, NULL, 0);
         }
 
         gc_free(&gc);
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
@@ -2137,7 +2137,6 @@ static struct http_proxy_options *
 parse_http_proxy_override(const char *server,
                           const char *port,
                           const char *flags,
-                          const int msglevel,
                           struct gc_arena *gc)
 {
     if (server && port)
@@ -2307,7 +2306,7 @@ alloc_pull_filter_list(struct options *o)
 }
 
 static struct pull_filter *
-alloc_pull_filter(struct options *o, const int msglevel)
+alloc_pull_filter(struct options *o)
 {
     struct pull_filter_list *l = alloc_pull_filter_list(o);
     struct pull_filter *f;
@@ -6345,7 +6344,7 @@ add_option(struct options *options,
     else if (streq(p[0], "http-proxy-override") && p[1] && p[2] && !p[4])
     {
         VERIFY_PERMISSION(OPT_P_GENERAL);
-        options->http_proxy_override = parse_http_proxy_override(p[1], p[2], p[3], msglevel, &options->gc);
+        options->http_proxy_override = parse_http_proxy_override(p[1], p[2], p[3], &options->gc);
         if (!options->http_proxy_override)
         {
             goto err;
@@ -7259,7 +7258,7 @@ add_option(struct options *options,
     {
         struct pull_filter *f;
         VERIFY_PERMISSION(OPT_P_GENERAL)
-        f = alloc_pull_filter(options, msglevel);
+        f = alloc_pull_filter(options);
 
         if (strcmp("accept", p[1]) == 0)
         {
diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c
@@ -573,8 +573,7 @@ http_proxy_close(struct http_proxy_info *hp)
 static bool
 add_proxy_headers(struct http_proxy_info *p,
                   socket_descriptor_t sd, /* already open to proxy */
-                  const char *host,       /* openvpn server remote */
-                  const char *port        /* openvpn server port */
+                  const char *host        /* openvpn server remote */
                   )
 {
     char buf[512];
@@ -694,7 +693,7 @@ establish_http_proxy_passthru(struct http_proxy_info *p,
             goto error;
         }
 
-        if (!add_proxy_headers(p, sd, host, port))
+        if (!add_proxy_headers(p, sd, host))
         {
             goto error;
         }
@@ -833,7 +832,7 @@ establish_http_proxy_passthru(struct http_proxy_info *p,
             }
 
             /* send HOST etc, */
-            if (!add_proxy_headers(p, sd, host, port))
+            if (!add_proxy_headers(p, sd, host))
             {
                 goto error;
             }
@@ -959,7 +958,7 @@ establish_http_proxy_passthru(struct http_proxy_info *p,
                 }
 
                 /* send HOST etc, */
-                if (!add_proxy_headers(p, sd, host, port))
+                if (!add_proxy_headers(p, sd, host))
                 {
                     goto error;
                 }
diff --git a/src/openvpn/push.c b/src/openvpn/push.c
@@ -226,8 +226,7 @@ receive_exit_message(struct context *c)
 
 
 void
-server_pushed_info(struct context *c, const struct buffer *buffer,
-                   const int adv)
+server_pushed_info(const struct buffer *buffer, const int adv)
 {
     const char *m = "";
     struct buffer buf = *buffer;
@@ -259,7 +258,7 @@ server_pushed_info(struct context *c, const struct buffer *buffer,
 
         gc_free(&gc);
     }
-    #endif
+#endif
     msg(D_PUSH, "Info command was pushed by server ('%s')", m);
 }
 
diff --git a/src/openvpn/push.h b/src/openvpn/push.h
@@ -50,8 +50,7 @@ void server_pushed_signal(struct context *c, const struct buffer *buffer, const
 
 void receive_exit_message(struct context *c);
 
-void server_pushed_info(struct context *c, const struct buffer *buffer,
-                        const int adv);
+void server_pushed_info(const struct buffer *buffer, const int adv);
 
 void receive_cr_response(struct context *c, const struct buffer *buffer);
 
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
@@ -1243,7 +1243,7 @@ add_routes(struct route_list *rl, struct route_ipv6_list *rl6,
         {
             if (flags & ROUTE_DELETE_FIRST)
             {
-                delete_route_ipv6(r, tt, flags, es, ctx);
+                delete_route_ipv6(r, tt, es, ctx);
             }
             ret = add_route_ipv6(r, tt, flags, es, ctx) && ret;
         }
@@ -1280,7 +1280,7 @@ delete_routes(struct route_list *rl, struct route_ipv6_list *rl6,
         struct route_ipv6 *r6;
         for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
         {
-            delete_route_ipv6(r6, tt, flags, es, ctx);
+            delete_route_ipv6(r6, tt, es, ctx);
         }
         rl6->iflags &= ~RL_ROUTES_ADDED;
     }
@@ -2383,7 +2383,7 @@ delete_route(struct route_ipv4 *r,
 
 void
 delete_route_ipv6(const struct route_ipv6 *r6, const struct tuntap *tt,
-                  unsigned int flags, const struct env_set *es,
+                  const struct env_set *es,
                   openvpn_net_ctx_t *ctx)
 {
     const char *network;
diff --git a/src/openvpn/route.h b/src/openvpn/route.h
@@ -280,7 +280,7 @@ void route_ipv6_clear_host_bits( struct route_ipv6 *r6 );
 
 bool add_route_ipv6(struct route_ipv6 *r, const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx);
 
-void delete_route_ipv6(const struct route_ipv6 *r, const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx);
+void delete_route_ipv6(const struct route_ipv6 *r, const struct tuntap *tt, const struct env_set *es, openvpn_net_ctx_t *ctx);
 
 bool add_route(struct route_ipv4 *r, const struct tuntap *tt, unsigned int flags,
                const struct route_gateway_info *rgi, const struct env_set *es,
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
@@ -2168,7 +2168,6 @@ phase2_socks_client(struct link_socket *sock, struct signal_info *sig_info)
 
     establish_socks_proxy_udpassoc(sock->socks_proxy,
                                    sock->ctrl_sd,
-                                   sock->sd,
                                    &sock->socks_relay.dest,
                                    sock->server_poll_timeout,
                                    sig_info);
@@ -3481,7 +3480,7 @@ link_socket_write_tcp(struct link_socket *sock,
 #ifdef _WIN32
     return link_socket_write_win32(sock, buf, to);
 #else
-    return link_socket_write_tcp_posix(sock, buf, to);
+    return link_socket_write_tcp_posix(sock, buf);
 #endif
 }
 
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
@@ -1172,8 +1172,7 @@ link_socket_write_udp_posix(struct link_socket *sock,
 
 static inline ssize_t
 link_socket_write_tcp_posix(struct link_socket *sock,
-                            struct buffer *buf,
-                            struct link_socket_actual *to)
+                            struct buffer *buf)
 {
     return send(sock->sd, BPTR(buf), BLEN(buf), MSG_NOSIGNAL);
 }
diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c
@@ -516,7 +516,6 @@ establish_socks_proxy_passthru(struct socks_proxy_info *p,
 void
 establish_socks_proxy_udpassoc(struct socks_proxy_info *p,
                                socket_descriptor_t ctrl_sd,  /* already open to proxy */
-                               socket_descriptor_t udp_sd,
                                struct openvpn_sockaddr *relay_addr,
                                struct event_timeout *server_poll_timeout,
                                struct signal_info *sig_info)
diff --git a/src/openvpn/socks.h b/src/openvpn/socks.h
@@ -57,7 +57,6 @@ void establish_socks_proxy_passthru(struct socks_proxy_info *p,
 
 void establish_socks_proxy_udpassoc(struct socks_proxy_info *p,
                                     socket_descriptor_t ctrl_sd,  /* already open to proxy */
-                                    socket_descriptor_t udp_sd,
                                     struct openvpn_sockaddr *relay_addr,
                                     struct event_timeout *server_poll_timeout,
                                     struct signal_info *sig_info);
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
@@ -1676,7 +1676,7 @@ tls_session_update_crypto_params_do_work(struct tls_multi *multi,
         /* If dynamic tls-crypt has been negotiated, and we are on the
          * first session (key_id = 0), generate a tls-crypt key for the
          * following renegotiations */
-        if (!tls_session_generate_dynamic_tls_crypt_key(multi, session))
+        if (!tls_session_generate_dynamic_tls_crypt_key(session))
         {
             return false;
         }
@@ -2241,8 +2241,7 @@ key_method_2_write(struct buffer *buf, struct tls_multi *multi, struct tls_sessi
 }
 
 static void
-export_user_keying_material(struct key_state_ssl *ssl,
-                            struct tls_session *session)
+export_user_keying_material(struct tls_session *session)
 {
     if (session->opt->ekm_size > 0)
     {
@@ -2430,7 +2429,7 @@ key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_sessio
     if ((ks->authenticated > KS_AUTH_FALSE)
         && plugin_defined(session->opt->plugins, OPENVPN_PLUGIN_TLS_FINAL))
     {
-        export_user_keying_material(&ks->ks_ssl, session);
+        export_user_keying_material(session);
 
         if (plugin_call(session->opt->plugins, OPENVPN_PLUGIN_TLS_FINAL, NULL, NULL, session->opt->es) != OPENVPN_PLUGIN_FUNC_SUCCESS)
         {
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
@@ -401,7 +401,7 @@ verify_peer_cert(const struct tls_options *opt, openvpn_x509_cert_t *peer_cert,
  */
 static void
 verify_cert_set_env(struct env_set *es, openvpn_x509_cert_t *peer_cert, int cert_depth,
-                    const char *subject, const char *common_name,
+                    const char *subject,
                     const struct x509_track *x509_track)
 {
     char envname[64];
@@ -422,12 +422,6 @@ verify_cert_set_env(struct env_set *es, openvpn_x509_cert_t *peer_cert, int cert
     snprintf(envname, sizeof(envname), "tls_id_%d", cert_depth);
     setenv_str(es, envname, subject);
 
-#if 0
-    /* export common name string as environmental variable */
-    snprintf(envname, sizeof(envname), "tls_common_name_%d", cert_depth);
-    setenv_str(es, envname, common_name);
-#endif
-
     /* export X509 cert fingerprints */
     {
         struct buffer sha1 = x509_get_sha1_fingerprint(peer_cert, &gc);
@@ -518,7 +512,7 @@ verify_cert_call_plugin(const struct plugin_list *plugins, struct env_set *es,
  */
 static result_t
 verify_cert_call_command(const char *verify_command, struct env_set *es,
-                         int cert_depth, openvpn_x509_cert_t *cert, char *subject)
+                         int cert_depth, char *subject)
 {
     int ret;
     struct gc_arena gc = gc_new();
@@ -744,8 +738,7 @@ verify_cert(struct tls_session *session, openvpn_x509_cert_t *cert, int cert_dep
         }
     }
     /* export certificate values to the environment */
-    verify_cert_set_env(opt->es, cert, cert_depth, subject, common_name,
-                        opt->x509_track);
+    verify_cert_set_env(opt->es, cert, cert_depth, subject, opt->x509_track);
 
     /* export current untrusted IP */
     setenv_untrusted(session);
@@ -764,7 +757,7 @@ verify_cert(struct tls_session *session, openvpn_x509_cert_t *cert, int cert_dep
 
     /* run --tls-verify script */
     if (opt->verify_command && SUCCESS != verify_cert_call_command(opt->verify_command,
-                                                                   opt->es, cert_depth, cert, subject))
+                                                                   opt->es, cert_depth, subject))
     {
         goto cleanup;
     }
@@ -1017,7 +1010,6 @@ key_state_gen_auth_control_files(struct auth_deferred_status *ads,
  */
 static char *
 key_state_check_auth_failed_message_file(const struct auth_deferred_status *ads,
-                                         struct tls_multi *multi,
                                          struct gc_arena *gc)
 {
     char *ret = NULL;
@@ -1201,8 +1193,8 @@ tls_authentication_status(struct tls_multi *multi)
     {
         struct gc_arena gc = gc_new();
         const struct key_state *ks = get_primary_key(multi);
-        const char *plugin_message = key_state_check_auth_failed_message_file(&ks->plugin_auth, multi, &gc);
-        const char *script_message = key_state_check_auth_failed_message_file(&ks->script_auth, multi, &gc);
+        const char *plugin_message = key_state_check_auth_failed_message_file(&ks->plugin_auth, &gc);
+        const char *script_message = key_state_check_auth_failed_message_file(&ks->script_auth, &gc);
 
         if (plugin_message)
         {
@@ -1286,7 +1278,7 @@ check_for_client_reason(struct tls_multi *multi,
                         struct auth_deferred_status *status)
 {
     struct gc_arena gc = gc_new();
-    const char *msg = key_state_check_auth_failed_message_file(status, multi, &gc);
+    const char *msg = key_state_check_auth_failed_message_file(status, &gc);
     if (msg)
     {
         auth_set_client_reason(multi, msg);
@@ -1529,7 +1521,6 @@ verify_user_pass_plugin(struct tls_session *session, struct tls_multi *multi,
 
 static int
 verify_user_pass_management(struct tls_session *session,
-                            struct tls_multi *multi,
                             const struct user_pass *up)
 {
     int retval = KMDA_ERROR;
@@ -1675,7 +1666,7 @@ verify_user_pass(struct user_pass *up, struct tls_multi *multi,
 #ifdef ENABLE_MANAGEMENT
         if (man_def_auth == KMDA_DEF)
         {
-            man_def_auth = verify_user_pass_management(session, multi, up);
+            man_def_auth = verify_user_pass_management(session, up);
         }
 #endif
         if (plugin_defined(session->opt->plugins, OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY))
diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c
@@ -95,8 +95,7 @@ xor_key2(struct key2 *key, const struct key2 *other)
 }
 
 bool
-tls_session_generate_dynamic_tls_crypt_key(struct tls_multi *multi,
-                                           struct tls_session *session)
+tls_session_generate_dynamic_tls_crypt_key(struct tls_session *session)
 {
     session->tls_wrap_reneg.opt = session->tls_wrap.opt;
     session->tls_wrap_reneg.mode = TLS_WRAP_CRYPT;
diff --git a/src/openvpn/tls_crypt.h b/src/openvpn/tls_crypt.h
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_tests/openvpn/test_tls_crypt.c

Original file line number	Diff line number	Diff line change
`@@ -257,11 +257,11 @@ parse_incoming_control_channel_command(struct context c, struct buffer buf)`
`257`	`257`	`}`
`258`	`258`	`else if (buf_string_match_head_str(buf, "INFO_PRE"))`
`259`	`259`	`{`
`260`		`- server_pushed_info(c, buf, 8);`
	`260`	`+ server_pushed_info(buf, 8);`
`261`	`261`	`}`
`262`	`262`	`else if (buf_string_match_head_str(buf, "INFO"))`
`263`	`263`	`{`
`264`		`- server_pushed_info(c, buf, 4);`
	`264`	`+ server_pushed_info(buf, 4);`
`265`	`265`	`}`
`266`	`266`	`else if (buf_string_match_head_str(buf, "CR_RESPONSE"))`
`267`	`267`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1769,8 +1769,7 @@ multi_client_connect_mda(struct multi_context *m,`
`1769`	`1769`	`}`
`1770`	`1770`
`1771`	`1771`	`static void`
`1772`		`-multi_client_connect_setenv(struct multi_context *m,`
`1773`		`- struct multi_instance *mi)`
	`1772`	`+multi_client_connect_setenv(struct multi_instance *mi)`
`1774`	`1773`	`{`
`1775`	`1774`	`struct gc_arena gc = gc_new();`
`1776`	`1775`
`@@ -2565,7 +2564,7 @@ multi_client_connect_early_setup(struct multi_context *m,`
`2565`	`2564`	`/* do --client-connect setenvs */`
`2566`	`2565`	`multi_select_virtual_addr(m, mi);`
`2567`	`2566`
`2568`		`- multi_client_connect_setenv(m, mi);`
	`2567`	`+ multi_client_connect_setenv(mi);`
`2569`	`2568`	`}`
`2570`	`2569`
`2571`	`2570`	`/**`
`@@ -2658,7 +2657,7 @@ multi_client_connect_source_ccd(struct multi_context *m,`
`2658`	`2657`	`*/`
`2659`	`2658`	`multi_select_virtual_addr(m, mi);`
`2660`	`2659`
`2661`		`- multi_client_connect_setenv(m, mi);`
	`2660`	`+ multi_client_connect_setenv(mi);`
`2662`	`2661`
`2663`	`2662`	`ret = CC_RET_SUCCEEDED;`
`2664`	`2663`	`}`
`@@ -2930,7 +2929,6 @@ static void`
`2930`	`2929`	`multi_bcast(struct multi_context *m,`
`2931`	`2930`	`const struct buffer *buf,`
`2932`	`2931`	`const struct multi_instance *sender_instance,`
`2933`		`- const struct mroute_addr *sender_addr,`
`2934`	`2932`	`uint16_t vid)`
`2935`	`2933`	`{`
`2936`	`2934`	`struct hash_iterator hi;`
`@@ -3458,7 +3456,7 @@ multi_process_incoming_link(struct multi_context m, struct multi_instance inst`
`3458`	`3456`	`if (mroute_flags & MROUTE_EXTRACT_MCAST)`
`3459`	`3457`	`{`
`3460`	`3458`	`/* for now, treat multicast as broadcast */`
`3461`		`- multi_bcast(m, &c->c2.to_tun, m->pending, NULL, 0);`
	`3459`	`+ multi_bcast(m, &c->c2.to_tun, m->pending, 0);`
`3462`	`3460`	`}`
`3463`	`3461`	`else /* possible client to client routing */`
`3464`	`3462`	`{`
`@@ -3510,8 +3508,7 @@ multi_process_incoming_link(struct multi_context m, struct multi_instance inst`
`3510`	`3508`	`{`
`3511`	`3509`	`if (mroute_flags & (MROUTE_EXTRACT_BCAST\|MROUTE_EXTRACT_MCAST))`
`3512`	`3510`	`{`
`3513`		`- multi_bcast(m, &c->c2.to_tun, m->pending, NULL,`
`3514`		`- vid);`
	`3511`	`+ multi_bcast(m, &c->c2.to_tun, m->pending, vid);`
`3515`	`3512`	`}`
`3516`	`3513`	`else /* try client-to-client routing */`
`3517`	`3514`	`{`
`@@ -3604,7 +3601,7 @@ multi_process_incoming_tun(struct multi_context *m, const unsigned int mpp_flags`
`3604`	`3601`	`if (mroute_flags & (MROUTE_EXTRACT_BCAST\|MROUTE_EXTRACT_MCAST))`
`3605`	`3602`	`{`
`3606`	`3603`	`/* for now, treat multicast as broadcast */`
`3607`		`- multi_bcast(m, &m->top.c2.buf, NULL, NULL, vid);`
	`3604`	`+ multi_bcast(m, &m->top.c2.buf, NULL, vid);`
`3608`	`3605`	`}`
`3609`	`3606`	`else`
`3610`	`3607`	`{`
`@@ -3776,7 +3773,7 @@ gremlin_flood_clients(struct multi_context *m)`
`3776`	`3773`
`3777`	`3774`	`for (i = 0; i < parm.n_packets; ++i)`
`3778`	`3775`	`{`
`3779`		`- multi_bcast(m, &buf, NULL, NULL, 0);`
	`3776`	`+ multi_bcast(m, &buf, NULL, 0);`
`3780`	`3777`	`}`
`3781`	`3778`
`3782`	`3779`	`gc_free(&gc);`
Original file line number	Diff line number	Diff line change
`@@ -2137,7 +2137,6 @@ static struct http_proxy_options *`
`2137`	`2137`	`parse_http_proxy_override(const char *server,`
`2138`	`2138`	`const char *port,`
`2139`	`2139`	`const char *flags,`
`2140`		`- const int msglevel,`
`2141`	`2140`	`struct gc_arena *gc)`
`2142`	`2141`	`{`
`2143`	`2142`	`if (server && port)`
`@@ -2307,7 +2306,7 @@ alloc_pull_filter_list(struct options *o)`
`2307`	`2306`	`}`
`2308`	`2307`
`2309`	`2308`	`static struct pull_filter *`
`2310`		`-alloc_pull_filter(struct options *o, const int msglevel)`
	`2309`	`+alloc_pull_filter(struct options *o)`
`2311`	`2310`	`{`
`2312`	`2311`	`struct pull_filter_list *l = alloc_pull_filter_list(o);`
`2313`	`2312`	`struct pull_filter *f;`
`@@ -6345,7 +6344,7 @@ add_option(struct options *options,`
`6345`	`6344`	`else if (streq(p[0], "http-proxy-override") && p[1] && p[2] && !p[4])`
`6346`	`6345`	`{`
`6347`	`6346`	`VERIFY_PERMISSION(OPT_P_GENERAL);`
`6348`		`- options->http_proxy_override = parse_http_proxy_override(p[1], p[2], p[3], msglevel, &options->gc);`
	`6347`	`+ options->http_proxy_override = parse_http_proxy_override(p[1], p[2], p[3], &options->gc);`
`6349`	`6348`	`if (!options->http_proxy_override)`
`6350`	`6349`	`{`
`6351`	`6350`	`goto err;`
`@@ -7259,7 +7258,7 @@ add_option(struct options *options,`
`7259`	`7258`	`{`
`7260`	`7259`	`struct pull_filter *f;`
`7261`	`7260`	`VERIFY_PERMISSION(OPT_P_GENERAL)`
`7262`		`- f = alloc_pull_filter(options, msglevel);`
	`7261`	`+ f = alloc_pull_filter(options);`
`7263`	`7262`
`7264`	`7263`	`if (strcmp("accept", p[1]) == 0)`
`7265`	`7264`	`{`
Original file line number	Diff line number	Diff line change
`@@ -573,8 +573,7 @@ http_proxy_close(struct http_proxy_info *hp)`
`573`	`573`	`static bool`
`574`	`574`	`add_proxy_headers(struct http_proxy_info *p,`
`575`	`575`	`socket_descriptor_t sd, /* already open to proxy */`
`576`		`- const char host, / openvpn server remote */`
`577`		`- const char port / openvpn server port */`
	`576`	`+ const char host / openvpn server remote */`
`578`	`577`	`)`
`579`	`578`	`{`
`580`	`579`	`char buf[512];`
`@@ -694,7 +693,7 @@ establish_http_proxy_passthru(struct http_proxy_info *p,`
`694`	`693`	`goto error;`
`695`	`694`	`}`
`696`	`695`
`697`		`- if (!add_proxy_headers(p, sd, host, port))`
	`696`	`+ if (!add_proxy_headers(p, sd, host))`
`698`	`697`	`{`
`699`	`698`	`goto error;`
`700`	`699`	`}`
`@@ -833,7 +832,7 @@ establish_http_proxy_passthru(struct http_proxy_info *p,`
`833`	`832`	`}`
`834`	`833`
`835`	`834`	`/* send HOST etc, */`
`836`		`- if (!add_proxy_headers(p, sd, host, port))`
	`835`	`+ if (!add_proxy_headers(p, sd, host))`
`837`	`836`	`{`
`838`	`837`	`goto error;`
`839`	`838`	`}`
`@@ -959,7 +958,7 @@ establish_http_proxy_passthru(struct http_proxy_info *p,`
`959`	`958`	`}`
`960`	`959`
`961`	`960`	`/* send HOST etc, */`
`962`		`- if (!add_proxy_headers(p, sd, host, port))`
	`961`	`+ if (!add_proxy_headers(p, sd, host))`
`963`	`962`	`{`
`964`	`963`	`goto error;`
`965`	`964`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,7 @@ receive_exit_message(struct context *c)`
`226`	`226`
`227`	`227`
`228`	`228`	`void`
`229`		`-server_pushed_info(struct context c, const struct buffer buffer,`
`230`		`- const int adv)`
	`229`	`+server_pushed_info(const struct buffer *buffer, const int adv)`
`231`	`230`	`{`
`232`	`231`	`const char *m = "";`
`233`	`232`	`struct buffer buf = *buffer;`
`@@ -259,7 +258,7 @@ server_pushed_info(struct context c, const struct buffer buffer,`
`259`	`258`
`260`	`259`	`gc_free(&gc);`
`261`	`260`	`}`
`262`		`- #endif`
	`261`	`+#endif`
`263`	`262`	`msg(D_PUSH, "Info command was pushed by server ('%s')", m);`
`264`	`263`	`}`
`265`	`264`
Original file line number	Diff line number	Diff line change
`@@ -1243,7 +1243,7 @@ add_routes(struct route_list rl, struct route_ipv6_list rl6,`
`1243`	`1243`	`{`
`1244`	`1244`	`if (flags & ROUTE_DELETE_FIRST)`
`1245`	`1245`	`{`
`1246`		`- delete_route_ipv6(r, tt, flags, es, ctx);`
	`1246`	`+ delete_route_ipv6(r, tt, es, ctx);`
`1247`	`1247`	`}`
`1248`	`1248`	`ret = add_route_ipv6(r, tt, flags, es, ctx) && ret;`
`1249`	`1249`	`}`
`@@ -1280,7 +1280,7 @@ delete_routes(struct route_list rl, struct route_ipv6_list rl6,`
`1280`	`1280`	`struct route_ipv6 *r6;`
`1281`	`1281`	`for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)`
`1282`	`1282`	`{`
`1283`		`- delete_route_ipv6(r6, tt, flags, es, ctx);`
	`1283`	`+ delete_route_ipv6(r6, tt, es, ctx);`
`1284`	`1284`	`}`
`1285`	`1285`	`rl6->iflags &= ~RL_ROUTES_ADDED;`
`1286`	`1286`	`}`
`@@ -2383,7 +2383,7 @@ delete_route(struct route_ipv4 *r,`
`2383`	`2383`
`2384`	`2384`	`void`
`2385`	`2385`	`delete_route_ipv6(const struct route_ipv6 r6, const struct tuntap tt,`
`2386`		`- unsigned int flags, const struct env_set *es,`
	`2386`	`+ const struct env_set *es,`
`2387`	`2387`	`openvpn_net_ctx_t *ctx)`
`2388`	`2388`	`{`
`2389`	`2389`	`const char *network;`
Original file line number	Diff line number	Diff line change
`@@ -1172,8 +1172,7 @@ link_socket_write_udp_posix(struct link_socket *sock,`
`1172`	`1172`
`1173`	`1173`	`static inline ssize_t`
`1174`	`1174`	`link_socket_write_tcp_posix(struct link_socket *sock,`
`1175`		`- struct buffer *buf,`
`1176`		`- struct link_socket_actual *to)`
	`1175`	`+ struct buffer *buf)`
`1177`	`1176`	`{`
`1178`	`1177`	`return send(sock->sd, BPTR(buf), BLEN(buf), MSG_NOSIGNAL);`
`1179`	`1178`	`}`