Skip to content

Commit 21f7d6e

Browse files
flichtenheldcron2
flichtenheld
authored and
cron2
committed
clang-format: Switch to ColumnLimit 0
In some cases an actual ColumnLimit leads to unfortunate formatting. So leave the decision to developers after all. This commit contains: - changes that clang-format did as reaction to the config change - manual cleanups of these changes - manual cleanup of some previous changes done with ColumnLimit 100 Change-Id: Ibd900adfc775b7f785f1d5630184a124f5d8ff4b Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20250805132706.27619-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32523.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
1 parent e6db593 commit 21f7d6e

File tree

19 files changed

+161
-164
lines changed

19 files changed

+161
-164
lines changed

‎.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BreakBeforeBinaryOperators: NonAssignment
2424
BreakBeforeBraces: Allman
2525
BreakBeforeTernaryOperators: true
2626
BreakStringLiterals: false
27-
ColumnLimit: '100'
27+
ColumnLimit: '0'
2828
ContinuationIndentWidth: '4'
2929
DerivePointerAlignment: false
3030
IndentCaseLabels: true

‎sample/sample-plugins/client-connect/sample-client-connect.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,8 @@ openvpn_plugin_open_v3(const int v3structver, struct openvpn_plugin_args_open_in
128128
/* Check API compatibility -- struct version 5 or higher needed */
129129
if (v3structver < 5)
130130
{
131-
fprintf(
132-
stderr,
133-
"sample-client-connect: this plugin is incompatible with the running version of OpenVPN\n");
131+
fprintf(stderr,
132+
"sample-client-connect: this plugin is incompatible with the running version of OpenVPN\n");
134133
return OPENVPN_PLUGIN_FUNC_ERROR;
135134
}
136135

‎sample/sample-plugins/log/log_v3.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ openvpn_plugin_open_v3(const int v3structver, struct openvpn_plugin_args_open_in
8080
/* Check that we are API compatible */
8181
if (v3structver != OPENVPN_PLUGINv3_STRUCTVER)
8282
{
83-
printf(
84-
"log_v3: ** ERROR ** Incompatible plug-in interface between this plug-in and OpenVPN\n");
83+
printf("log_v3: ** ERROR ** Incompatible plug-in interface between this plug-in and OpenVPN\n");
8584
return OPENVPN_PLUGIN_FUNC_ERROR;
8685
}
8786

‎sample/sample-plugins/simple/base64.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ openvpn_plugin_open_v3(const int v3structver, struct openvpn_plugin_args_open_in
104104
/* Check that we are API compatible */
105105
if (v3structver != OPENVPN_PLUGINv3_STRUCTVER)
106106
{
107-
printf(
108-
"base64.c: ** ERROR ** Incompatible plug-in interface between this plug-in and OpenVPN\n");
107+
printf("base64.c: ** ERROR ** Incompatible plug-in interface between this plug-in and OpenVPN\n");
109108
return OPENVPN_PLUGIN_FUNC_ERROR;
110109
}
111110

‎src/openvpn/crypto_openssl.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,11 +1046,16 @@ md_valid(const char *digest)
10461046
* this translation table for forward lookup, only for returning the name
10471047
* with md_kt_name() */
10481048
const cipher_name_pair digest_name_translation_table[] = {
1049-
{ "BLAKE2s256", "BLAKE2S-256" }, { "BLAKE2b512", "BLAKE2B-512" },
1050-
{ "RIPEMD160", "RIPEMD-160" }, { "SHA224", "SHA2-224" },
1051-
{ "SHA256", "SHA2-256" }, { "SHA384", "SHA2-384" },
1052-
{ "SHA512", "SHA2-512" }, { "SHA512-224", "SHA2-512/224" },
1053-
{ "SHA512-256", "SHA2-512/256" }, { "SHAKE128", "SHAKE-128" },
1049+
{ "BLAKE2s256", "BLAKE2S-256" },
1050+
{ "BLAKE2b512", "BLAKE2B-512" },
1051+
{ "RIPEMD160", "RIPEMD-160" },
1052+
{ "SHA224", "SHA2-224" },
1053+
{ "SHA256", "SHA2-256" },
1054+
{ "SHA384", "SHA2-384" },
1055+
{ "SHA512", "SHA2-512" },
1056+
{ "SHA512-224", "SHA2-512/224" },
1057+
{ "SHA512-256", "SHA2-512/256" },
1058+
{ "SHAKE128", "SHAKE-128" },
10541059
{ "SHAKE256", "SHAKE-256" },
10551060
};
10561061
const size_t digest_name_translation_table_count =

‎src/openvpn/errlevel.h

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -49,73 +49,73 @@
4949
* of output.
5050
*/
5151

52-
#define M_VERB0 LOGLEV(0, 0, 0) /* Messages displayed even at --verb 0 (fatal errors only) */
53-
54-
#define M_INFO LOGLEV(1, 0, 0) /* default informational messages */
55-
56-
#define D_LINK_ERRORS LOGLEV(1, 1, M_NONFATAL) /* show link errors from main event loop */
57-
#define D_CRYPT_ERRORS LOGLEV(1, 2, M_NONFATAL) /* show errors from encrypt/decrypt */
58-
#define D_TLS_ERRORS LOGLEV(1, 3, M_NONFATAL) /* show TLS control channel errors */
59-
#define D_RESOLVE_ERRORS LOGLEV(1, 4, M_NONFATAL) /* show hostname resolve errors */
60-
#define D_COMP_ERRORS LOGLEV(1, 5, M_NONFATAL) /* show compression errors */
61-
#define D_REPLAY_ERRORS LOGLEV(1, 6, M_NONFATAL) /* show packet replay errors */
62-
#define D_STREAM_ERRORS LOGLEV(1, 7, M_NONFATAL) /* TCP stream error requiring restart */
63-
#define D_IMPORT_ERRORS LOGLEV(1, 8, M_NONFATAL) /* show server import option errors */
64-
#define D_MULTI_ERRORS LOGLEV(1, 9, M_NONFATAL) /* show multi-client server errors */
65-
#define D_EVENT_ERRORS LOGLEV(1, 10, M_NONFATAL) /* show event.[ch] errors */
66-
#define D_PUSH_ERRORS LOGLEV(1, 11, M_NONFATAL) /* show push/pull errors */
67-
#define D_PID_PERSIST LOGLEV(1, 12, M_NONFATAL) /* show packet_id persist errors */
68-
#define D_FRAG_ERRORS LOGLEV(1, 13, M_NONFATAL) /* show fragmentation errors */
69-
#define D_ALIGN_ERRORS LOGLEV(1, 14, M_NONFATAL) /* show bad struct alignments */
70-
71-
#define D_HANDSHAKE LOGLEV(2, 20, 0) /* show data & control channel handshakes */
72-
#define D_CLOSE LOGLEV(2, 22, 0) /* show socket and TUN/TAP close */
73-
#define D_PROXY LOGLEV(2, 24, 0) /* show http proxy control packets */
74-
#define D_ARGV LOGLEV(2, 25, 0) /* show struct argv errors */
75-
76-
#define D_TLS_DEBUG_LOW LOGLEV(3, 20, 0) /* low frequency info from tls_session routines */
77-
#define D_GREMLIN LOGLEV(3, 30, 0) /* show simulated outage info from gremlin module */
78-
#define D_GENKEY LOGLEV(3, 31, 0) /* print message after key generation */
79-
#define D_ROUTE LOGLEV(3, 0, 0) /* show routes added and deleted (don't mute) */
80-
#define D_TUNTAP_INFO LOGLEV(3, 32, 0) /* show debugging info from TUN/TAP driver */
81-
#define D_RESTART LOGLEV(3, 33, 0) /* show certain restart messages */
82-
#define D_PUSH LOGLEV(3, 34, 0) /* show push/pull info */
83-
#define D_IFCONFIG_POOL LOGLEV(3, 35, 0) /* show ifconfig pool info */
84-
#define D_AUTH LOGLEV(3, 37, 0) /* show user/pass auth info */
85-
#define D_MULTI_LOW LOGLEV(3, 38, 0) /* show point-to-multipoint low-freq debug info */
86-
#define D_PLUGIN LOGLEV(3, 39, 0) /* show plugin calls */
87-
#define D_MANAGEMENT LOGLEV(3, 40, 0) /* show --management info */
88-
#define D_SCHED_EXIT LOGLEV(3, 41, 0) /* show arming of scheduled exit */
89-
#define D_ROUTE_QUOTA LOGLEV(3, 42, 0) /* show route quota exceeded messages */
90-
#define D_OSBUF LOGLEV(3, 43, 0) /* show socket/tun/tap buffer sizes */
91-
#define D_PS_PROXY LOGLEV(3, 44, 0) /* messages related to --port-share option */
92-
#define D_IFCONFIG LOGLEV(3, 0, 0) /* show ifconfig info (don't mute) */
93-
#define D_DCO LOGLEV(3, 0, 0) /* show DCO related messages */
94-
95-
#define D_SHOW_PARMS LOGLEV(4, 50, 0) /* show all parameters on program initiation */
96-
#define D_LOW LOGLEV(4, 52, 0) /* miscellaneous low-frequency debug info */
97-
#define D_DHCP_OPT LOGLEV(4, 53, 0) /* show DHCP options binary string */
98-
#define D_MBUF LOGLEV(4, 54, 0) /* mbuf.[ch] routines */
99-
#define D_PACKET_TRUNC_ERR LOGLEV(4, 55, 0) /* PACKET_TRUNCATION_CHECK */
100-
#define D_MULTI_DROPPED LOGLEV(4, 57, 0) /* show point-to-multipoint packet drops */
101-
#define D_MULTI_MEDIUM LOGLEV(4, 58, 0) /* show medium frequency multi messages */
102-
#define D_X509_ATTR LOGLEV(4, 59, 0) /* show x509-track attributes on connection */
103-
#define D_INIT_MEDIUM LOGLEV(4, 60, 0) /* show medium frequency init messages */
104-
#define D_MTU_INFO LOGLEV(4, 61, 0) /* show terse MTU info */
105-
#define D_PID_DEBUG_LOW LOGLEV(4, 63, 0) /* show low-freq packet-id debugging info */
106-
#define D_PID_DEBUG_MEDIUM LOGLEV(4, 64, 0) /* show medium-freq packet-id debugging info */
107-
#define D_CIPHER_INIT LOGLEV(4, 65, 0) /* show messages about cipher init */
108-
109-
#define D_LOG_RW LOGLEV(5, 0, 0) /* Print 'R' or 'W' to stdout for read/write */
110-
111-
#define D_RTNL LOGLEV(6, 68, M_DEBUG) /* show RTNL low level operations */
112-
#define D_LINK_RW LOGLEV(6, 69, M_DEBUG) /* show TCP/UDP reads/writes (terse) */
113-
#define D_TUN_RW LOGLEV(6, 69, M_DEBUG) /* show TUN/TAP reads/writes */
114-
#define D_TAP_WIN_DEBUG LOGLEV(6, 69, M_DEBUG) /* show TAP-Windows driver debug info */
115-
#define D_CLIENT_NAT LOGLEV(6, 69, M_DEBUG) /* show client NAT debug info */
116-
#define D_XKEY LOGLEV(6, 69, M_DEBUG) /* show xkey-provider debug info */
117-
#define D_DCO_DEBUG LOGLEV(6, 69, M_DEBUG) /* show DCO related lowlevel debug messages */
118-
#define D_SIGNAL_DEBUG LOGLEV(6, 69, M_DEBUG) /* show signal related debug messages */
52+
#define M_VERB0 LOGLEV(0, 0, 0) /* Messages displayed even at --verb 0 (fatal errors only) */
53+
54+
#define M_INFO LOGLEV(1, 0, 0) /* default informational messages */
55+
56+
#define D_LINK_ERRORS LOGLEV(1, 1, M_NONFATAL) /* show link errors from main event loop */
57+
#define D_CRYPT_ERRORS LOGLEV(1, 2, M_NONFATAL) /* show errors from encrypt/decrypt */
58+
#define D_TLS_ERRORS LOGLEV(1, 3, M_NONFATAL) /* show TLS control channel errors */
59+
#define D_RESOLVE_ERRORS LOGLEV(1, 4, M_NONFATAL) /* show hostname resolve errors */
60+
#define D_COMP_ERRORS LOGLEV(1, 5, M_NONFATAL) /* show compression errors */
61+
#define D_REPLAY_ERRORS LOGLEV(1, 6, M_NONFATAL) /* show packet replay errors */
62+
#define D_STREAM_ERRORS LOGLEV(1, 7, M_NONFATAL) /* TCP stream error requiring restart */
63+
#define D_IMPORT_ERRORS LOGLEV(1, 8, M_NONFATAL) /* show server import option errors */
64+
#define D_MULTI_ERRORS LOGLEV(1, 9, M_NONFATAL) /* show multi-client server errors */
65+
#define D_EVENT_ERRORS LOGLEV(1, 10, M_NONFATAL) /* show event.[ch] errors */
66+
#define D_PUSH_ERRORS LOGLEV(1, 11, M_NONFATAL) /* show push/pull errors */
67+
#define D_PID_PERSIST LOGLEV(1, 12, M_NONFATAL) /* show packet_id persist errors */
68+
#define D_FRAG_ERRORS LOGLEV(1, 13, M_NONFATAL) /* show fragmentation errors */
69+
#define D_ALIGN_ERRORS LOGLEV(1, 14, M_NONFATAL) /* show bad struct alignments */
70+
71+
#define D_HANDSHAKE LOGLEV(2, 20, 0) /* show data & control channel handshakes */
72+
#define D_CLOSE LOGLEV(2, 22, 0) /* show socket and TUN/TAP close */
73+
#define D_PROXY LOGLEV(2, 24, 0) /* show http proxy control packets */
74+
#define D_ARGV LOGLEV(2, 25, 0) /* show struct argv errors */
75+
76+
#define D_TLS_DEBUG_LOW LOGLEV(3, 20, 0) /* low frequency info from tls_session routines */
77+
#define D_GREMLIN LOGLEV(3, 30, 0) /* show simulated outage info from gremlin module */
78+
#define D_GENKEY LOGLEV(3, 31, 0) /* print message after key generation */
79+
#define D_ROUTE LOGLEV(3, 0, 0) /* show routes added and deleted (don't mute) */
80+
#define D_TUNTAP_INFO LOGLEV(3, 32, 0) /* show debugging info from TUN/TAP driver */
81+
#define D_RESTART LOGLEV(3, 33, 0) /* show certain restart messages */
82+
#define D_PUSH LOGLEV(3, 34, 0) /* show push/pull info */
83+
#define D_IFCONFIG_POOL LOGLEV(3, 35, 0) /* show ifconfig pool info */
84+
#define D_AUTH LOGLEV(3, 37, 0) /* show user/pass auth info */
85+
#define D_MULTI_LOW LOGLEV(3, 38, 0) /* show point-to-multipoint low-freq debug info */
86+
#define D_PLUGIN LOGLEV(3, 39, 0) /* show plugin calls */
87+
#define D_MANAGEMENT LOGLEV(3, 40, 0) /* show --management info */
88+
#define D_SCHED_EXIT LOGLEV(3, 41, 0) /* show arming of scheduled exit */
89+
#define D_ROUTE_QUOTA LOGLEV(3, 42, 0) /* show route quota exceeded messages */
90+
#define D_OSBUF LOGLEV(3, 43, 0) /* show socket/tun/tap buffer sizes */
91+
#define D_PS_PROXY LOGLEV(3, 44, 0) /* messages related to --port-share option */
92+
#define D_IFCONFIG LOGLEV(3, 0, 0) /* show ifconfig info (don't mute) */
93+
#define D_DCO LOGLEV(3, 0, 0) /* show DCO related messages */
94+
95+
#define D_SHOW_PARMS LOGLEV(4, 50, 0) /* show all parameters on program initiation */
96+
#define D_LOW LOGLEV(4, 52, 0) /* miscellaneous low-frequency debug info */
97+
#define D_DHCP_OPT LOGLEV(4, 53, 0) /* show DHCP options binary string */
98+
#define D_MBUF LOGLEV(4, 54, 0) /* mbuf.[ch] routines */
99+
#define D_PACKET_TRUNC_ERR LOGLEV(4, 55, 0) /* PACKET_TRUNCATION_CHECK */
100+
#define D_MULTI_DROPPED LOGLEV(4, 57, 0) /* show point-to-multipoint packet drops */
101+
#define D_MULTI_MEDIUM LOGLEV(4, 58, 0) /* show medium frequency multi messages */
102+
#define D_X509_ATTR LOGLEV(4, 59, 0) /* show x509-track attributes on connection */
103+
#define D_INIT_MEDIUM LOGLEV(4, 60, 0) /* show medium frequency init messages */
104+
#define D_MTU_INFO LOGLEV(4, 61, 0) /* show terse MTU info */
105+
#define D_PID_DEBUG_LOW LOGLEV(4, 63, 0) /* show low-freq packet-id debugging info */
106+
#define D_PID_DEBUG_MEDIUM LOGLEV(4, 64, 0) /* show medium-freq packet-id debugging info */
107+
#define D_CIPHER_INIT LOGLEV(4, 65, 0) /* show messages about cipher init */
108+
109+
#define D_LOG_RW LOGLEV(5, 0, 0) /* Print 'R' or 'W' to stdout for read/write */
110+
111+
#define D_RTNL LOGLEV(6, 68, M_DEBUG) /* show RTNL low level operations */
112+
#define D_LINK_RW LOGLEV(6, 69, M_DEBUG) /* show TCP/UDP reads/writes (terse) */
113+
#define D_TUN_RW LOGLEV(6, 69, M_DEBUG) /* show TUN/TAP reads/writes */
114+
#define D_TAP_WIN_DEBUG LOGLEV(6, 69, M_DEBUG) /* show TAP-Windows driver debug info */
115+
#define D_CLIENT_NAT LOGLEV(6, 69, M_DEBUG) /* show client NAT debug info */
116+
#define D_XKEY LOGLEV(6, 69, M_DEBUG) /* show xkey-provider debug info */
117+
#define D_DCO_DEBUG LOGLEV(6, 69, M_DEBUG) /* show DCO related lowlevel debug messages */
118+
#define D_SIGNAL_DEBUG LOGLEV(6, 69, M_DEBUG) /* show signal related debug messages */
119119

120120
#define D_SHOW_KEYS LOGLEV(7, 70, M_DEBUG) /* show data channel encryption keys */
121121
#define D_SHOW_KEY_SOURCE LOGLEV(7, 70, M_DEBUG) /* show data channel key source entropy */
@@ -150,32 +150,32 @@
150150
#define D_SHOW_OCC LOGLEV(7, 74, M_DEBUG) /* show options compatibility string */
151151

152152

153-
#define D_VLAN_DEBUG LOGLEV(7, 74, M_DEBUG) /* show VLAN tagging/untagging debug info */
154-
155-
#define D_HANDSHAKE_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show detailed description of handshake */
156-
#define D_TLS_DEBUG_MED LOGLEV(8, 70, M_DEBUG) /* limited info from tls_session routines */
157-
#define D_INTERVAL LOGLEV(8, 70, M_DEBUG) /* show interval.h debugging info */
158-
#define D_SCHEDULER LOGLEV(8, 70, M_DEBUG) /* show scheduler debugging info */
159-
#define D_GREMLIN_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show verbose info from gremlin module */
160-
#define D_REL_DEBUG LOGLEV(8, 70, M_DEBUG) /* show detailed info from reliable routines */
161-
#define D_EVENT_WAIT LOGLEV(8, 70, M_DEBUG) /* show detailed info from event waits */
162-
#define D_MULTI_TCP LOGLEV(8, 70, M_DEBUG) /* show debug info from mtcp.c */
163-
164-
#define D_TLS_DEBUG LOGLEV(9, 70, M_DEBUG) /* show detailed info from TLS routines */
165-
#define D_COMP LOGLEV(9, 70, M_DEBUG) /* show compression info */
166-
#define D_READ_WRITE LOGLEV(9, 70, M_DEBUG) /* show all tun/tcp/udp reads/writes/opens */
167-
#define D_PACKET_CONTENT LOGLEV(9, 70, M_DEBUG) /* show before/after encryption packet content */
168-
#define D_TLS_NO_SEND_KEY LOGLEV(9, 70, M_DEBUG) /* show when no data channel send-key exists */
169-
#define D_PID_PERSIST_DEBUG LOGLEV(9, 70, M_DEBUG) /* show packet-id persist debugging info */
170-
#define D_LINK_RW_VERBOSE LOGLEV(9, 70, M_DEBUG) /* increase link reads/writes verbosity */
171-
#define D_STREAM_DEBUG LOGLEV(9, 70, M_DEBUG) /* show TCP stream debug info */
172-
#define D_WIN32_IO LOGLEV(9, 70, M_DEBUG) /* win32 I/O debugging info */
173-
#define D_PKCS11_DEBUG LOGLEV(9, 70, M_DEBUG) /* show PKCS#11 debugging */
174-
175-
#define D_SHAPER_DEBUG LOGLEV(10, 70, M_DEBUG) /* show traffic shaper info */
176-
177-
#define D_REGISTRY LOGLEV(11, 70, M_DEBUG) /* win32 registry debugging info */
178-
#define D_OPENSSL_LOCK LOGLEV(11, 70, M_DEBUG) /* show OpenSSL locks */
153+
#define D_VLAN_DEBUG LOGLEV(7, 74, M_DEBUG) /* show VLAN tagging/untagging debug info */
154+
155+
#define D_HANDSHAKE_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show detailed description of handshake */
156+
#define D_TLS_DEBUG_MED LOGLEV(8, 70, M_DEBUG) /* limited info from tls_session routines */
157+
#define D_INTERVAL LOGLEV(8, 70, M_DEBUG) /* show interval.h debugging info */
158+
#define D_SCHEDULER LOGLEV(8, 70, M_DEBUG) /* show scheduler debugging info */
159+
#define D_GREMLIN_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show verbose info from gremlin module */
160+
#define D_REL_DEBUG LOGLEV(8, 70, M_DEBUG) /* show detailed info from reliable routines */
161+
#define D_EVENT_WAIT LOGLEV(8, 70, M_DEBUG) /* show detailed info from event waits */
162+
#define D_MULTI_TCP LOGLEV(8, 70, M_DEBUG) /* show debug info from mtcp.c */
163+
164+
#define D_TLS_DEBUG LOGLEV(9, 70, M_DEBUG) /* show detailed info from TLS routines */
165+
#define D_COMP LOGLEV(9, 70, M_DEBUG) /* show compression info */
166+
#define D_READ_WRITE LOGLEV(9, 70, M_DEBUG) /* show all tun/tcp/udp reads/writes/opens */
167+
#define D_PACKET_CONTENT LOGLEV(9, 70, M_DEBUG) /* show before/after encryption packet content */
168+
#define D_TLS_NO_SEND_KEY LOGLEV(9, 70, M_DEBUG) /* show when no data channel send-key exists */
169+
#define D_PID_PERSIST_DEBUG LOGLEV(9, 70, M_DEBUG) /* show packet-id persist debugging info */
170+
#define D_LINK_RW_VERBOSE LOGLEV(9, 70, M_DEBUG) /* increase link reads/writes verbosity */
171+
#define D_STREAM_DEBUG LOGLEV(9, 70, M_DEBUG) /* show TCP stream debug info */
172+
#define D_WIN32_IO LOGLEV(9, 70, M_DEBUG) /* win32 I/O debugging info */
173+
#define D_PKCS11_DEBUG LOGLEV(9, 70, M_DEBUG) /* show PKCS#11 debugging */
174+
175+
#define D_SHAPER_DEBUG LOGLEV(10, 70, M_DEBUG) /* show traffic shaper info */
176+
177+
#define D_REGISTRY LOGLEV(11, 70, M_DEBUG) /* win32 registry debugging info */
178+
#define D_OPENSSL_LOCK LOGLEV(11, 70, M_DEBUG) /* show OpenSSL locks */
179179

180180
/*#define D_THREAD_DEBUG LOGLEV(4, 70, M_DEBUG)*/ /* show pthread debug information */
181181

‎src/openvpn/error.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ error_reset(void)
175175
{
176176
openvpn_exit(OPENVPN_EXIT_STATUS_CANNOT_OPEN_DEBUG_FILE); /* exit point */
177177
}
178-
#else /* ifdef OPENVPN_DEBUG_COMMAND_LINE */
178+
#else
179179
msgfp = NULL;
180180
#endif
181181
}

‎src/openvpn/mtu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ translate_mtu_discover_type_name(const char *name)
266266
return IP_PMTUDISC_DONT;
267267
}
268268
msg(M_FATAL, "invalid --mtu-disc type: '%s' -- valid types are 'yes', 'maybe', or 'no'", name);
269-
#else /* if defined(IP_PMTUDISC_DONT) && defined(IP_PMTUDISC_WANT) && defined(IP_PMTUDISC_DO) */
269+
#else
270270
msg(M_FATAL, MTUDISC_NOT_SUPPORTED_MSG);
271271
#endif
272272
return -1; /* NOTREACHED */

‎src/openvpn/multi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,7 @@ multi_print_status(struct multi_context *m, struct status_output *so, const int
10061006

10071007
#ifdef PACKET_TRUNCATION_CHECK
10081008
{
1009-
status_printf(
1010-
so,
1011-
"HEADER,ERRORS,Common Name,TUN Read Trunc,TUN Write Trunc,Pre-encrypt Trunc,Post-decrypt Trunc");
1009+
status_printf(so, "HEADER,ERRORS,Common Name,TUN Read Trunc,TUN Write Trunc,Pre-encrypt Trunc,Post-decrypt Trunc");
10121010
hash_iterator_init(m->hash, &hi);
10131011
while ((he = hash_iterator_next(&hi)))
10141012
{

‎src/openvpn/ntlm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ ntlm_phase_3(const struct http_proxy_info *p, const char *phase_2, struct gc_are
208208
uint8_t ntlmv2_hmacmd5[16];
209209
uint8_t *ntlmv2_blob = ntlmv2_response + 16; /* inside ntlmv2_response, length: 128 */
210210
int ntlmv2_blob_size = 0;
211-
int phase3_bufpos = 0x40; /* offset to next security buffer data to be added */
211+
int phase3_bufpos = 0x40; /* offset to next security buffer data to be added */
212212
size_t len;
213213

214214
char domain[128];

0 commit comments

Comments
 (0)