reformat / v1.31

tunnels/layer3/receiver/receiver.c

@@ -28,7 +28,7 @@ enum mode_dynamic_value_status
     kDvsSourceMode = kDvsFirstOption,
     kDvsDestMode
 };
-struct ip6_hdr;
+
 
 static void upStream(tunnel_t *self, context_t *c)
 {

tunnels/layer3/sender/sender.c

@@ -66,7 +66,6 @@ static void printSendingIPPacketInfo(const unsigned char *buffer, unsigned int l
     LOGD(logbuf);
 }
 
-
 static void upStream(tunnel_t *self, context_t *c)
 {
     layer3_senderstate_t *state = TSTATE(self);
@@ -88,7 +87,7 @@ static void upStream(tunnel_t *self, context_t *c)
         if (packet->ip4_header.protocol == 6)
         {
             struct tcpheader *tcp_header = (struct tcpheader *) (rawBufMut(c->payload) + ip_header_len);
-            tcpCheckSum4(&(packet->ip4_header),tcp_header);
+            tcpCheckSum4(&(packet->ip4_header), tcp_header);
         }
     }
     else if (packet->ip6_header.version == 6)
@@ -98,7 +97,7 @@ static void upStream(tunnel_t *self, context_t *c)
         if (packet->ip6_header.nexthdr == 6)
         {
             struct tcpheader *tcp_header = (struct tcpheader *) (rawBufMut(c->payload) + ip_header_len);
-            tcpCheckSum6(&(packet->ip6_header),tcp_header);
+            tcpCheckSum6(&(packet->ip6_header), tcp_header);
         }
     }
     else
@@ -107,7 +106,6 @@ static void upStream(tunnel_t *self, context_t *c)
         exit(1);
     }
 
-
     state->tun_device_tunnel->upStream(state->tun_device_tunnel, c);
 }
 

tunnels/layer3/tcp_manipulator/tcp_manipulator.c

@@ -105,8 +105,6 @@ static void upStream(tunnel_t *self, context_t *c)
 
     handleResetBitAction(tcp_header, &(state->reset_bit_action));
 
-    // reCalculateCheckSum(tcp_header, transport_palyoad_len);
-
     self->up->upStream(self->up, c);
 }
 

ww/CMakeLists.txt

@@ -18,7 +18,6 @@ add_library(ww STATIC
                   frand.c
                   pipe_line.c
                   utils/utils.c
-                  utils/btree.c
                   managers/signal_manager.c
                   managers/socket_manager.c
                   managers/node_manager.c

ww/buffer_pool.c

@@ -48,6 +48,7 @@ unsigned int getBufferPoolLargeBufferDefaultSize(void)
 {
     return LARGE_BUFFER_SIZE;
 }
+
 unsigned int getBufferPoolSmallBufferDefaultSize(void)
 {
     return SMALL_BUFFER_SIZE;
@@ -197,6 +198,7 @@ shift_buffer_t *popSmallBuffer(buffer_pool_t *pool)
 
 void reuseBuffer(buffer_pool_t *pool, shift_buffer_t *b)
 {
+
 #if defined(DEBUG) && defined(BYPASS_BUFFERPOOL)
     destroyShiftBuffer(pool->shift_buffer_pool,b);
     return;

ww/config_file.c

@@ -34,10 +34,12 @@ void acquireUpdateLock(config_file_t *state)
 {
     hmutex_lock(&(state->guard));
 }
+
 void releaseUpdateLock(config_file_t *state)
 {
     hmutex_unlock(&(state->guard));
 }
+
 // only use if you acquired lock before
 void unsafeCommitChanges(config_file_t *state)
 {

ww/context_queue.c

@@ -50,6 +50,7 @@ context_t *contextQueuePop(context_queue_t *self)
     context_t *context = queue_pull_front(&self->q);
     return context;
 }
+
 size_t contextQueueLen(context_queue_t *self)
 {
     return queue_size(&self->q);

ww/idle_table.c

@@ -28,6 +28,7 @@ struct idle_table_s
     hhybridmutex_t mutex;
     uint64_t       last_update_ms;
     uintptr_t      memptr;
+
 } ATTR_ALIGNED_LINE_CACHE;
 
 void idleCallBack(htimer_t *timer);
@@ -92,6 +93,7 @@ idle_item_t *newIdleItem(idle_table_t *self, hash_t key, void *userdata, ExpireC
     hhybridmutex_unlock(&(self->mutex));
     return item;
 }
+
 void keepIdleItemForAtleast(idle_table_t *self, idle_item_t *item, uint64_t age_ms)
 {
     if (item->removed)
@@ -104,6 +106,7 @@ void keepIdleItemForAtleast(idle_table_t *self, idle_item_t *item, uint64_t age_
     heapq_idles_t_make_heap(&self->hqueue);
     hhybridmutex_unlock(&(self->mutex));
 }
+
 idle_item_t *getIdleItemByHash(tid_t tid, idle_table_t *self, hash_t key)
 {
     hhybridmutex_lock(&(self->mutex));

ww/managers/socket_manager.c

@@ -344,6 +344,7 @@ static inline void incrementDistributeTid(void)
         state->last_round_tid = 0;
     }
 }
+
 static void distributeSocket(void *io, socket_filter_t *filter, uint16_t local_port)
 {
 
@@ -653,6 +654,7 @@ static void listenTcpSinglePort(hloop_t *loop, socket_filter_t *filter, char *ho
     }
     filter->v6_dualstack = hio_localaddr(filter->listen_io)->sa_family == AF_INET6;
 }
+
 static void listenTcp(hloop_t *loop, uint8_t *ports_overlapped)
 {
     for (int ri = (kFilterLevels - 1); ri >= 0; ri--)

ww/node.h

@@ -19,6 +19,7 @@ enum node_flags
     // this node can be a chain head (begin of the chain)
     kNodeFlagChainHead = (1 << 1)
 };
+
 typedef struct tunnel_metadata_s
 {
     int32_t         version;
@@ -43,4 +44,5 @@ typedef struct node_s
     tunnel_metadata_t       metadata;
     uint32_t                refrenced;
     bool                    route_starter;
+
 } node_t;

ww/tunnel.h

@@ -124,8 +124,6 @@ typedef struct line_s
 
     and it can contain a payload buffer, or be just a flag context
 
-    the only flag that also has a payload is `first` , other flags have no payload
-
 */
 typedef struct context_s
 {
@@ -408,9 +406,10 @@ static inline buffer_pool_t *getContextBufferPool(const context_t *const c)
     return getWorkerBufferPool(c->line->tid);
 }
 
-// same as c->payload = NULL, this is necessary before destroying a context to prevent bugs, dose nothing on release
-// build
-
+/*
+    same as c->payload = NULL, this is necessary before destroying a context to prevent bugs, dose nothing on release
+    build
+*/
 static inline void dropContexPayload(context_t *const c)
 {
 #if defined(RELEASE)