gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimizate: clean up unused code && code formatting

Browse Source
This commit is contained in:
luwenpeng
2024-08-14 10:50:33 +08:00
parent 927d0cd344
commit 6e1c25a445
20 changed files with 61 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@@ -9,12 +9,11 @@ add_definitions(-D_GNU_SOURCE)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_STANDARD 11)
#set warning as error
# set warning as error
add_compile_options(-Wall -Wextra -Werror)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
"Build type (default: RelWithDebInfo)" FORCE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type (default: RelWithDebInfo)" FORCE)
endif()
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)
@@ -51,19 +50,9 @@ else()
message(FATAL_ERROR "Could not find the program cppcheck.")
endif()
#option(ENABLE_PIC "Generate position independent code (necessary for shared libraries)" TRUE)
#if(ENABLE_PIC)
# set(CMAKE_POSITION_INDEPENDENT_CODE 1)
#endif()
#option(ENABLE_WARNING_ALL "Enable all optional warnings which are desirable for normal code" TRUE)
#if(ENABLE_WARNING_ALL)
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
#endif()
set(CMAKE_POSITION_INDEPENDENT_CODE 1)
#for ASAN
# for ASAN
set(ASAN_OPTION "OFF" CACHE STRING " set asan type chosen by the user, using OFF as default")
set_property(CACHE ASAN_OPTION PROPERTY STRINGS OFF ADDRESS THREAD)
message(STATUS "ASAN_OPTION='${ASAN_OPTION}'")

6
ci/travis.sh
View File

@@ -43,9 +43,3 @@ cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
..
make -j $NPROCESSORS
if [ -n "${PACKAGE}" ]; then
make package
cp ~/rpm_upload_tools.py ./
python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
fi

30
deps/toml/toml.cpp vendored
View File

@@ -2502,32 +2502,28 @@ int toml_rtos(toml_raw_t src, char **ret)
toml_datum_t toml_string_at(const toml_array_t *arr, int idx)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtos(toml_raw_at(arr, idx), &ret.u.s));
return ret;
}
toml_datum_t toml_bool_at(const toml_array_t *arr, int idx)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtob(toml_raw_at(arr, idx), &ret.u.b));
return ret;
}
toml_datum_t toml_int_at(const toml_array_t *arr, int idx)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtoi(toml_raw_at(arr, idx), &ret.u.i));
return ret;
}
toml_datum_t toml_double_at(const toml_array_t *arr, int idx)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtod(toml_raw_at(arr, idx), &ret.u.d));
return ret;
}
@@ -2535,8 +2531,7 @@ toml_datum_t toml_double_at(const toml_array_t *arr, int idx)
toml_datum_t toml_timestamp_at(const toml_array_t *arr, int idx)
{
toml_timestamp_t ts;
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtots(toml_raw_at(arr, idx), &ts));
if (ret.ok)
{
@@ -2567,8 +2562,7 @@ toml_datum_t toml_timestamp_at(const toml_array_t *arr, int idx)
toml_datum_t toml_string_in(const toml_table_t *arr, const char *key)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
toml_raw_t raw = toml_raw_in(arr, key);
if (raw)
{
@@ -2579,24 +2573,21 @@ toml_datum_t toml_string_in(const toml_table_t *arr, const char *key)
toml_datum_t toml_bool_in(const toml_table_t *arr, const char *key)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtob(toml_raw_in(arr, key), &ret.u.b));
return ret;
}
toml_datum_t toml_int_in(const toml_table_t *arr, const char *key)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtoi(toml_raw_in(arr, key), &ret.u.i));
return ret;
}
toml_datum_t toml_double_in(const toml_table_t *arr, const char *key)
{
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtod(toml_raw_in(arr, key), &ret.u.d));
return ret;
}
@@ -2604,8 +2595,7 @@ toml_datum_t toml_double_in(const toml_table_t *arr, const char *key)
toml_datum_t toml_timestamp_in(const toml_table_t *arr, const char *key)
{
toml_timestamp_t ts;
toml_datum_t ret={};
//memset(&ret, 0, sizeof(ret));
toml_datum_t ret = {};
ret.ok = (0 == toml_rtots(toml_raw_in(arr, key), &ts));
if (ret.ok)
{

14
include/stellar/utils.h
View File

@@ -8,7 +8,11 @@
#define REALLOC(type, ptr, number) ((type *)realloc(ptr, (number) * sizeof(type)))
#define FREE(p) {free(p); p = NULL;}
#define FREE(p) \
{ \
free(p); \
p = NULL; \
}
#define TRUE 1
#define FALSE 0
@@ -22,21 +26,21 @@
#endif
#ifndef offsetof
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#define offsetof(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
#endif
#ifndef container_of
#define container_of(ptr, type, member) ({ \
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );})
(type *)( (char *)__mptr - offsetof(type,member) ); })
#endif
#ifndef likely
#define likely(x) __builtin_expect((x),1)
#define likely(x) __builtin_expect((x), 1)
#endif /* likely */
#ifndef unlikely
#define unlikely(x) __builtin_expect((x),0)
#define unlikely(x) __builtin_expect((x), 0)
#endif /* unlikely */
#ifndef __unused

4
src/packet/gre0_utils.h
View File

@@ -230,6 +230,10 @@ static inline uint16_t gre0_hdr_get_routing_len(const struct gre0_hdr *hdr)
static inline uint16_t calc_gre0_hdr_len(const char *data, uint32_t len)
{
if (data == NULL || len < sizeof(struct gre0_hdr))
{
return 0;
}
const struct gre0_hdr *hdr = (const struct gre0_hdr *)data;
uint16_t hdr_len = 4;
uint16_t flags = ntohs(hdr->flags);

5
src/packet/gre1_utils.h
View File

@@ -117,7 +117,10 @@ static inline uint32_t gre1_hdr_get_ack(const struct gre1_hdr *hdr)
static inline uint16_t calc_gre1_hdr_len(const char *data, uint32_t len)
{
if(data==NULL||len<sizeof(struct gre1_hdr))return 0;
if (data == NULL || len < sizeof(struct gre1_hdr))
{
return 0;
}
const struct gre1_hdr *hdr = (const struct gre1_hdr *)data;
uint16_t hdr_len = 8;
uint16_t flags = gre1_hdr_get_flags(hdr);

5
src/packet/ip4_utils.h
View File

@@ -253,7 +253,10 @@ static inline void ip4_hdr_set_opt_len(struct ip *hdr, uint8_t opt_len)
// must be called after ip4_hdr_set_opt_len
static inline void ip4_hdr_set_opt_data(struct ip *hdr, const char *opt_data)
{
if(opt_data)memcpy((char *)hdr + sizeof(struct ip), opt_data, ip4_hdr_get_opt_len(hdr));
if (opt_data)
{
memcpy((char *)hdr + sizeof(struct ip), opt_data, ip4_hdr_get_opt_len(hdr));
}
}
/******************************************************************************

2
src/packet/packet_def.h
View File

@@ -44,7 +44,7 @@ struct raw_layer
struct packet
{
void * user_data;
void *user_data;
struct raw_layer layers[PACKET_MAX_LAYERS];
struct raw_layer *frag_layer; // fragment layer
int8_t layers_used;

17
src/packet/packet_dump.cpp
View File

@@ -105,6 +105,7 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
return 0;
}
int old = 0;
int used = 0;
memset(buff, 0, size);
used += snprintf(buff + used, size - used, "packet: %p, data_ptr: %p, data_len: %u, trim_len: %u, layers_used: %d, layers_size: %d\n",
@@ -116,11 +117,11 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
used += snprintf(buff + used, size - used, "layer[%u]: %p, proto: %s, header: {offset: %u, ptr: %p, len: %u}, payload: {ptr: %p, len: %u}\n",
i, layer, layer_proto_to_str(layer->proto), layer->hdr_offset,
layer->hdr_ptr, layer->hdr_len, layer->pld_ptr, layer->pld_len);
old = used;
switch (layer->proto)
{
case LAYER_PROTO_ETHER:
used += eth_hdr_to_str((const struct ethhdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_PWETH:
break;
@@ -128,39 +129,31 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
break;
case LAYER_PROTO_L2TP:
used += l2tp_hdr_to_str((const struct l2tp_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_VLAN:
used += vlan_hdr_to_str((const struct vlan_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_PPPOE:
break;
case LAYER_PROTO_MPLS:
used += mpls_label_to_str((const struct mpls_label *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_IPV4:
used += ip4_hdr_to_str((const struct ip *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_IPV6:
used += ip6_hdr_to_str((const struct ip6_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_IPAH:
break;
case LAYER_PROTO_GRE:
used += gre_hdr_to_str(layer->hdr_ptr, layer->hdr_len, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_UDP:
used += udp_hdr_to_str((const struct udphdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_TCP:
used += tcp_hdr_to_str((const struct tcphdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_ICMP:
break;
@@ -168,16 +161,18 @@ int packet_dump_str(const struct packet *pkt, char *buff, int size)
break;
case LAYER_PROTO_VXLAN:
used += vxlan_hdr_to_str((const struct vxlan_hdr *)layer->hdr_ptr, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
case LAYER_PROTO_GTP_C:
case LAYER_PROTO_GTP_U:
used += gtp_hdr_to_str(layer->hdr_ptr, layer->hdr_len, buff + used, size - used);
used += snprintf(buff + used, size - used, "\n");
break;
default:
break;
}
if (old != used)
{
used += snprintf(buff + used, size - used, "\n");
}
}
return used;

2
src/packet/packet_tunnel.cpp
View File

@@ -23,7 +23,7 @@ static int is_ipv4_tunnel(const struct raw_layer *curr, const struct raw_layer *
return 0;
}
static int is_ipv6_tunnel(const struct raw_layer *curr, const struct raw_layer *next1, const struct raw_layer *next __attribute__((unused)))
static int is_ipv6_tunnel(const struct raw_layer *curr, const struct raw_layer *next1, const struct raw_layer *next2 __attribute__((unused)))
{
if (curr && curr->proto == LAYER_PROTO_IPV6 &&
next1 && (next1->proto == LAYER_PROTO_IPV4 || next1->proto == LAYER_PROTO_IPV6))

7
src/packet/packet_utils.cpp
View File

@@ -106,7 +106,6 @@ enum packet_action packet_get_action(const struct packet *pkt)
return pkt->meta.action;
}
/******************************************************************************
* tuple uitls
******************************************************************************/
@@ -462,7 +461,7 @@ const char *packet_get_payload(const struct packet *pkt)
uint16_t packet_get_payload_len(const struct packet *pkt)
{
if (pkt==NULL || pkt->layers_used == 0)
if (pkt == NULL || pkt->layers_used == 0)
{
return 0;
}
@@ -471,7 +470,7 @@ uint16_t packet_get_payload_len(const struct packet *pkt)
struct packet *packet_new(uint16_t pkt_len)
{
struct packet *pkt = (struct packet *)malloc( sizeof(struct packet) + pkt_len);
struct packet *pkt = (struct packet *)calloc(1, sizeof(struct packet) + pkt_len);
if (pkt == NULL)
{
return NULL;
@@ -549,7 +548,7 @@ void layer_convert(const struct raw_layer *in, struct layer *out)
void packet_set_user_data(struct packet *pkt, void *data)
{
pkt->user_data=data;
pkt->user_data = data;
}
void *packet_get_user_data(struct packet *pkt)

2
src/packet/packet_utils.h
View File

@@ -12,7 +12,6 @@ extern "C"
* metadata utils
******************************************************************************/
void packet_set_sids(struct packet *pkt, const struct sids *sids);
const struct sids *packet_get_sids(const struct packet *pkt);
void packet_prepend_sids(struct packet *pkt, const struct sids *sids);
@@ -35,7 +34,6 @@ enum packet_direction packet_get_direction(const struct packet *pkt);
void packet_set_action(struct packet *pkt, enum packet_action action);
enum packet_action packet_get_action(const struct packet *pkt);
void *packet_get_user_data(struct packet *pkt);
void packet_set_user_data(struct packet *pkt, void *data);

2
src/packet_io/dumpfile_io.cpp
View File

@@ -327,8 +327,8 @@ int dumpfile_io_ingress(struct dumpfile_io *handle, uint16_t thr_idx, struct pac
stat->raw_rx_bytes += pcap_pkt->len;
pkt = &pkts[nr_parsed];
memset(pkt, 0, sizeof(struct packet));
packet_parse(pkt, pcap_pkt->data, pcap_pkt->len);
memset(&pkt->meta, 0, sizeof(pkt->meta));
packet_set_origin_ctx(pkt, pcap_pkt);
packet_set_action(pkt, PACKET_ACTION_FORWARD);
nr_parsed++;

3
src/packet_io/marsio_io.cpp
View File

@@ -106,7 +106,7 @@ static void metadata_from_packet_to_mbuff(struct packet *pkt, marsio_buff_t *mbu
const struct route_ctx *route_ctx = packet_get_route_ctx(pkt);
const struct sids *sids = packet_get_sids(pkt);
uint64_t session_id = packet_get_session_id(pkt);
//uint64_t domain = packet_get_domain(pkt);
// uint64_t domain = packet_get_domain(pkt);
uint16_t link_id = packet_get_link_id(pkt);
int is_ctrl = packet_is_ctrl(pkt);
enum packet_direction direction = packet_get_direction(pkt);
@@ -296,7 +296,6 @@ int marsio_io_ingress(struct marsio_io *handle, uint16_t thr_idx, struct packet
}
pkt = &pkts[nr_parsed];
//memset(pkt, 0, sizeof(struct packet));
packet_parse(pkt, data, len);
metadata_from_mbuff_to_packet(mbuff, pkt);
nr_parsed++;

4
src/session/session_utils.cpp
View File

@@ -503,8 +503,8 @@ int session_to_str(const struct session *sess, int bref, char *buff, int size)
{
used += snprintf(buff + used, size - used, "{");
used += snprintf(buff + used, size - used, "\"id\":%" PRIu64 ",", session_get_id(sess));
used += snprintf(buff + used, size - used, "\"start_timestamp\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_START));
used += snprintf(buff + used, size - used, "\"last_timestamp\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
used += snprintf(buff + used, size - used, "\"start_timestamp_ms\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_START));
used += snprintf(buff + used, size - used, "\"last_timestamp_ms\":%" PRIu64 ",", session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
used += snprintf(buff + used, size - used, "\"tuple\":\"%s\",", session_get0_readable_addr(sess));
used += snprintf(buff + used, size - used, "\"type\":\"%s\",", session_type_to_str(session_get_type(sess)));
used += snprintf(buff + used, size - used, "\"state\":\"%s\",", session_state_to_str(session_get_current_state(sess)));

1
src/session/test/gtest_overload_evict_tcp_sess.cpp
View File

@@ -32,7 +32,6 @@ struct session_manager_options opts = {
.udp_discard_timeout = 0,
// duplicate packet filter
.duplicated_packet_filter_enable = 1,
.duplicated_packet_filter_capacity = 1000,
.duplicated_packet_filter_timeout = 10,

1
src/session/test/gtest_overload_evict_udp_sess.cpp
View File

@@ -32,7 +32,6 @@ struct session_manager_options opts = {
.udp_discard_timeout = 0,
// duplicate packet filter
.duplicated_packet_filter_enable = 1,
.duplicated_packet_filter_capacity = 1000,
.duplicated_packet_filter_timeout = 10,

1
src/stellar/stellar_config.cpp
View File

@@ -413,7 +413,6 @@ int stellar_config_load(struct stellar_config *config, const char *file)
char errbuf[200];
FILE *fp = NULL;
toml_table_t *table = NULL;
//memset(config, 0, sizeof(struct stellar_config));
fp = fopen(file, "r");
if (fp == NULL)

2
test/packet_inject/packet_inject_test.h
View File

@@ -170,7 +170,7 @@ static inline void packet_inject_test(struct packet_inject_case *test)
// run
char cwd[PATH_MAX] = {0};
char temp[PATH_MAX*2] = {0};
char temp[PATH_MAX * 2] = {0};
getcwd(cwd, sizeof(cwd));
chdir(test->work_dir);
snprintf(temp, sizeof(temp), "dumpfile_dir = \"%s\"", dumpfile_dir);