reformat in order to support old compilers as well

radkesvat · May 15, 2024 · 36adfe5 · 36adfe5
1 parent 8bd752b
commit 36adfe5
Show file tree

Hide file tree

Showing 116 changed files with 330 additions and 302 deletions.
diff --git a/core/core_settings.c b/core/core_settings.c
@@ -273,25 +273,25 @@ void parseCoreSettings(char *data_json)
     // TODO (DNS) Implement dns settings and backend
 }
 
-char *getCoreLoggerFullPath()
+char *getCoreLoggerFullPath(void)
 {
     return concat(settings->log_path, settings->core_log_file);
 }
-char *getNetworkLoggerFullPath()
+char *getNetworkLoggerFullPath(void)
 {
     return concat(settings->log_path, settings->network_log_file);
 }
-char *getDnsLoggerFullPath()
+char *getDnsLoggerFullPath(void)
 {
     return concat(settings->log_path, settings->dns_log_file);
 }
 
-struct core_settings_s *getCoreSettings()
+struct core_settings_s *getCoreSettings(void)
 {
     return settings;
 }
 
-void initCoreSettings()
+void initCoreSettings(void)
 {
     assert(settings == NULL); // we can't use logs here, so just assert
 

diff --git a/core/core_settings.h b/core/core_settings.h
@@ -30,9 +30,9 @@ struct core_settings_s
 
 void parseCoreSettings(char *data_json);
 
-char *getCoreLoggerFullPath();
-char *getNetworkLoggerFullPath();
-char *getDnsLoggerFullPath();
+char *getCoreLoggerFullPath(void);
+char *getNetworkLoggerFullPath(void);
+char *getDnsLoggerFullPath(void);
 
-struct core_settings_s *getCoreSettings();
-void                    initCoreSettings();
+struct core_settings_s *getCoreSettings(void);
+void                    initCoreSettings(void);
diff --git a/core/main.c b/core/main.c
@@ -79,4 +79,4 @@ int main(void)
     LOGD("Core: starting workers ...");
     startSocketManager();
     runMainThread();
-}
+}
diff --git a/core/os_helpers.h b/core/os_helpers.h
@@ -4,7 +4,7 @@
 
 #ifdef OS_UNIX
 #include <sys/resource.h>
-static void increaseFileLimit()
+static void increaseFileLimit(void)
 {
 
     struct rlimit rlim;
@@ -36,8 +36,8 @@ static void increaseFileLimit()
     }
 }
 #else
-static void increaseFileLimit()
+static void increaseFileLimit(void)
 {
     (void) (0);
 }
-#endif
+#endif
diff --git a/core/static_tunnels.c b/core/static_tunnels.c
@@ -124,7 +124,7 @@
 #include "tunnels/client/reality/reality_client.h"
 #endif
 
-void loadStaticTunnelsIntoCore()
+void loadStaticTunnelsIntoCore(void)
 {
 #ifdef INCLUDE_TCP_LISTENER
     USING(TcpListener);
@@ -233,4 +233,4 @@ void loadStaticTunnelsIntoCore()
 #ifdef INCLUDE_REALITY_CLIENT
     USING(RealityClient);
 #endif
-}
+}
diff --git a/core/static_tunnels.h b/core/static_tunnels.h
@@ -4,4 +4,4 @@
 
 
 
-void loadStaticTunnelsIntoCore();
+void loadStaticTunnelsIntoCore(void);
diff --git a/tunnels/adapters/bridge/bridge.c b/tunnels/adapters/bridge/bridge.c
@@ -13,7 +13,7 @@ typedef struct bridge_state_s
 
 typedef struct bridge_con_state_s
 {
-
+    void*_;
 } bridge_con_state_t;
 
 static void upStream(tunnel_t *self, context_t *c)
@@ -119,7 +119,7 @@ tunnel_t *destroyBridge(tunnel_t *self)
 
     return NULL;
 }
-tunnel_metadata_t getMetadataBridge()
+tunnel_metadata_t getMetadataBridge(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = kNodeFlagChainHead};
-}
+}
diff --git a/tunnels/adapters/bridge/bridge.h b/tunnels/adapters/bridge/bridge.h
@@ -6,4 +6,4 @@
 tunnel_t *        newBridge(node_instance_context_t *instance_info);
 api_result_t      apiBridge(tunnel_t *self, const char *msg);
 tunnel_t *        destroyBridge(tunnel_t *self);
-tunnel_metadata_t getMetadataBridge();
+tunnel_metadata_t getMetadataBridge(void);
diff --git a/tunnels/adapters/connector/connector.c b/tunnels/adapters/connector/connector.c
@@ -12,7 +12,7 @@ typedef struct connector_state_s
 
 typedef struct connector_con_state_s
 {
-
+    void*_;
 } connector_con_state_t;
 
 static void upStream(tunnel_t *self, context_t *c)
@@ -84,7 +84,7 @@ tunnel_t *destroyConnector(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataConnector()
+tunnel_metadata_t getMetadataConnector(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = 0x0};
-}
+}
diff --git a/tunnels/adapters/connector/connector.h b/tunnels/adapters/connector/connector.h
@@ -9,4 +9,4 @@
 tunnel_t *        newConnector(node_instance_context_t *instance_info);
 api_result_t      apiConnector(tunnel_t *self, const char *msg);
 tunnel_t *        destroyConnector(tunnel_t *self);
-tunnel_metadata_t getMetadataConnector();
+tunnel_metadata_t getMetadataConnector(void);
diff --git a/tunnels/adapters/connector/tcp/tcp_connector.c b/tunnels/adapters/connector/tcp/tcp_connector.c
@@ -406,7 +406,7 @@ tunnel_t *destroyTcpConnector(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataTcpConnector()
+tunnel_metadata_t getMetadataTcpConnector(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = 0x0};
-}
+}
diff --git a/tunnels/adapters/connector/tcp/tcp_connector.h b/tunnels/adapters/connector/tcp/tcp_connector.h
@@ -9,4 +9,4 @@
 tunnel_t *        newTcpConnector(node_instance_context_t *instance_info);
 api_result_t      apiTcpConnector(tunnel_t *self, const char *msg);
 tunnel_t *        destroyTcpConnector(tunnel_t *self);
-tunnel_metadata_t getMetadataTcpConnector();
+tunnel_metadata_t getMetadataTcpConnector(void);
diff --git a/tunnels/adapters/connector/udp/udp_connector.c b/tunnels/adapters/connector/udp/udp_connector.c
@@ -257,7 +257,7 @@ tunnel_t *destroyUdpConnector(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataUdpConnector()
+tunnel_metadata_t getMetadataUdpConnector(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = 0x0};
-}
+}
diff --git a/tunnels/adapters/connector/udp/udp_connector.h b/tunnels/adapters/connector/udp/udp_connector.h
@@ -9,4 +9,4 @@
 tunnel_t *        newUdpConnector(node_instance_context_t *instance_info);
 api_result_t      apiUdpConnector(tunnel_t *self, const char *msg);
 tunnel_t *        destroyUdpConnector(tunnel_t *self);
-tunnel_metadata_t getMetadataUdpConnector();
+tunnel_metadata_t getMetadataUdpConnector(void);
diff --git a/tunnels/adapters/listener/listener.c b/tunnels/adapters/listener/listener.c
@@ -16,7 +16,7 @@ typedef struct listener_state_s
 
 typedef struct listener_con_state_s
 {
-
+    void*_;
 } listener_con_state_t;
 
 // set function pointers baby))
@@ -100,7 +100,7 @@ tunnel_t *destroyListener(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataListener()
+tunnel_metadata_t getMetadataListener(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = kNodeFlagChainHead};
-}
+}
diff --git a/tunnels/adapters/listener/listener.h b/tunnels/adapters/listener/listener.h
@@ -9,4 +9,4 @@
 tunnel_t *        newListener(node_instance_context_t *instance_info);
 api_result_t      apiListener(tunnel_t *self, const char *msg);
 tunnel_t *        destroyListener(tunnel_t *self);
-tunnel_metadata_t getMetadataListener();
+tunnel_metadata_t getMetadataListener(void);
diff --git a/tunnels/adapters/listener/tcp/tcp_listener.c b/tunnels/adapters/listener/tcp/tcp_listener.c
@@ -454,7 +454,7 @@ tunnel_t *destroyTcpListener(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataTcpListener()
+tunnel_metadata_t getMetadataTcpListener(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = kNodeFlagChainHead};
-}
+}
diff --git a/tunnels/adapters/listener/tcp/tcp_listener.h b/tunnels/adapters/listener/tcp/tcp_listener.h
@@ -9,4 +9,4 @@
 tunnel_t         *newTcpListener(node_instance_context_t *instance_info);
 api_result_t      apiTcpListener(tunnel_t *self, const char *msg);
 tunnel_t         *destroyTcpListener(tunnel_t *self);
-tunnel_metadata_t getMetadataTcpListener();
+tunnel_metadata_t getMetadataTcpListener(void);
diff --git a/tunnels/adapters/listener/udp/udp_listener.c b/tunnels/adapters/listener/udp/udp_listener.c
@@ -53,7 +53,7 @@ static void cleanup(udp_listener_con_state_t *cstate)
             // sounds impossible...
             LOGE("Checkpoint udp listener");
             // this prevent double free
-            *cstate = (udp_listener_con_state_t){};
+            *cstate = (udp_listener_con_state_t){0};
         }
     }
     else
@@ -364,7 +364,7 @@ tunnel_t *destroyUdpListener(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataUdpListener()
+tunnel_metadata_t getMetadataUdpListener(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = kNodeFlagChainHead};
-}
+}
diff --git a/tunnels/adapters/listener/udp/udp_listener.h b/tunnels/adapters/listener/udp/udp_listener.h
@@ -10,4 +10,4 @@
 tunnel_t *        newUdpListener(node_instance_context_t *instance_info);
 api_result_t      apiUdpListener(tunnel_t *self, const char *msg);
 tunnel_t *        destroyUdpListener(tunnel_t *self);
-tunnel_metadata_t getMetadataUdpListener();
+tunnel_metadata_t getMetadataUdpListener(void);
diff --git a/tunnels/client/header/header_client.c b/tunnels/client/header/header_client.c
@@ -19,7 +19,7 @@ typedef struct header_client_state_s
 
 typedef struct header_client_con_state_s
 {
-
+    void*_;
 } header_client_con_state_t;
 
 static void upStream(tunnel_t *self, context_t *c)
@@ -81,7 +81,7 @@ tunnel_t *destroyHeaderClient(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataHeaderClient()
+tunnel_metadata_t getMetadataHeaderClient(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = 0x0};
-}
+}
diff --git a/tunnels/client/header/header_client.h b/tunnels/client/header/header_client.h
@@ -8,7 +8,7 @@
 tunnel_t *newHeaderClient(node_instance_context_t *instance_info);
 api_result_t apiHeaderClient(tunnel_t *self, const char *msg);
 tunnel_t *destroyHeaderClient(tunnel_t *self);
-tunnel_metadata_t getMetadataHeaderClient();
+tunnel_metadata_t getMetadataHeaderClient(void);
 
 
 
diff --git a/tunnels/client/http2/helpers.h b/tunnels/client/http2/helpers.h
@@ -3,10 +3,11 @@
 #include "tunnel.h"
 #include "types.h"
 
+#define kMaxConcurrentStreams 0xffffffffU // NOLINT
+
 enum
 {
-    kMaxConcurrentStreams = 0xffffffffU,
-    kPingInterval         = 5000
+    kPingInterval = 5000
 };
 
 static void onPingTimer(htimer_t *timer);

diff --git a/tunnels/client/http2/http2_client.c b/tunnels/client/http2/http2_client.c
@@ -524,7 +524,7 @@ tunnel_t *destroyHttp2Client(tunnel_t *self)
     return NULL;
 }
 
-tunnel_metadata_t getMetadataHttp2Client()
+tunnel_metadata_t getMetadataHttp2Client(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = 0x0};
 }
diff --git a/tunnels/client/http2/http2_client.h b/tunnels/client/http2/http2_client.h
@@ -8,4 +8,4 @@
 tunnel_t *        newHttp2Client(node_instance_context_t *instance_info);
 api_result_t      apiHttp2Client(tunnel_t *self,const char *msg);
 tunnel_t *        destroyHttp2Client(tunnel_t *self);
-tunnel_metadata_t getMetadataHttp2Client();
+tunnel_metadata_t getMetadataHttp2Client(void);
diff --git a/tunnels/client/openssl/openssl_client.c b/tunnels/client/openssl/openssl_client.c
@@ -492,7 +492,7 @@ tunnel_t *destroyOpenSSLClient(tunnel_t *self)
     return NULL;
 }
 
-tunnel_metadata_t getMetadataOpenSSLClient()
+tunnel_metadata_t getMetadataOpenSSLClient(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = 0x0};
 }
diff --git a/tunnels/client/openssl/openssl_client.h b/tunnels/client/openssl/openssl_client.h
@@ -8,4 +8,4 @@
 tunnel_t *        newOpenSSLClient(node_instance_context_t *instance_info);
 api_result_t      apiOpenSSLClient(tunnel_t *self, const char *msg);
 tunnel_t *        destroyOpenSSLClient(tunnel_t *self);
-tunnel_metadata_t getMetadataOpenSSLClient();
+tunnel_metadata_t getMetadataOpenSSLClient(void);
diff --git a/tunnels/client/preconnect/helpers.h b/tunnels/client/preconnect/helpers.h
@@ -3,8 +3,11 @@
 #include "types.h"
 #include "utils/mathutils.h"
 
-#define PRECONNECT_DELAY_SHORT 10
-#define PRECONNECT_DELAY_HIGH  750
+enum
+{
+    kPreconnectDelayShort = 10,
+    kPreconnectDelayHigh  = 750
+};
 
 static void addConnection(thread_box_t *box, preconnect_client_con_state_t *con)
 {
@@ -43,8 +46,8 @@ static void destroyCstate(preconnect_client_con_state_t *cstate)
 }
 static void doConnect(struct connect_arg *cg)
 {
-    tunnel_t *                     self   = cg->t;
-    preconnect_client_state_t *    state  = STATE(self);
+    tunnel_t                      *self   = cg->t;
+    preconnect_client_state_t     *state  = STATE(self);
     preconnect_client_con_state_t *cstate = createCstate(cg->tid);
     free(cg);
     (cstate->u->chains_state)[self->chain_index] = cstate;
@@ -59,7 +62,7 @@ static void connectTimerFinished(htimer_t *timer)
 static void beforeConnect(hevent_t *ev)
 {
     struct connect_arg *cg            = hevent_userdata(ev);
-    htimer_t *          connect_timer = htimer_add(loops[cg->tid], connectTimerFinished, cg->delay, 1);
+    htimer_t           *connect_timer = htimer_add(loops[cg->tid], connectTimerFinished, cg->delay, 1);
     if (connect_timer)
     {
         hevent_set_userdata(connect_timer, cg);
@@ -100,8 +103,8 @@ static void initiateConnect(tunnel_t *self, bool delay)
     struct connect_arg *cg = malloc(sizeof(struct connect_arg));
     cg->t                  = self;
     cg->tid                = tid;
-    cg->delay              = delay ? PRECONNECT_DELAY_HIGH : PRECONNECT_DELAY_SHORT;
+    cg->delay              = delay ? kPreconnectDelayHigh : kPreconnectDelayShort;
     ev.userdata            = cg;
 
     hloop_post_event(worker_loop, &ev);
-}
+}
diff --git a/tunnels/client/preconnect/preconnect_client.c b/tunnels/client/preconnect/preconnect_client.c
@@ -241,7 +241,7 @@ tunnel_t *destroyPreConnectClient(tunnel_t *self)
     (void) (self);
     return NULL;
 }
-tunnel_metadata_t getMetadataPreConnectClient()
+tunnel_metadata_t getMetadataPreConnectClient(void)
 {
     return (tunnel_metadata_t){.version = 0001, .flags = 0x0};
-}
+}
diff --git a/tunnels/client/preconnect/preconnect_client.h b/tunnels/client/preconnect/preconnect_client.h
@@ -8,4 +8,4 @@
 tunnel_t *        newPreConnectClient(node_instance_context_t *instance_info);
 api_result_t      apiPreConnectClient(tunnel_t *self, const char *msg);
 tunnel_t *        destroyPreConnectClient(tunnel_t *self);
-tunnel_metadata_t getMetadataPreConnectClient();
+tunnel_metadata_t getMetadataPreConnectClient(void);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@



		void loadStaticTunnelsIntoCore();
		void loadStaticTunnelsIntoCore(void);