diff --git a/include/packet.h b/include/packet.h index d5d4dd0..b3a85a5 100644 --- a/include/packet.h +++ b/include/packet.h @@ -1,7 +1,7 @@ #ifndef _PACKET_H #define _PACKET_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -146,7 +146,7 @@ void packet_append_sid_list(struct packet *pkt, uint16_t *sid, int num); * } */ -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/include/session.h b/include/session.h index 893cdaf..e557614 100644 --- a/include/session.h +++ b/include/session.h @@ -1,7 +1,7 @@ #ifndef _SESSION_H #define _SESSION_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -124,7 +124,7 @@ const char *session_state_to_str(enum session_state state); const char *session_direction_to_str(enum session_direction dir); const char *closing_reason_to_str(enum closing_reason reason); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/include/tuple.h b/include/tuple.h index 4931705..73b8bcc 100644 --- a/include/tuple.h +++ b/include/tuple.h @@ -1,7 +1,7 @@ #ifndef _TUPLE_H #define _TUPLE_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -84,7 +84,7 @@ void tuple5_to_str(const struct tuple5 *tuple, char *buf, uint32_t size); // output max len: 46 + 1 + 5 + 4 + 46 + 1 + 5 + 9 + 1 + 10 + 20 = 107 void tuple6_to_str(const struct tuple6 *tuple, char *buf, uint32_t size); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/crc32/crc32_hash.h b/src/crc32/crc32_hash.h index 529de75..180912f 100644 --- a/src/crc32/crc32_hash.h +++ b/src/crc32/crc32_hash.h @@ -1,7 +1,7 @@ #ifndef _CRC32_HASH_H_ #define _CRC32_HASH_H_ -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -351,7 +351,7 @@ static inline uint32_t crc32_hash(const void *data, uint32_t data_len, uint32_t return init_val; } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/duplicated_packet_filter/duplicated_packet_filter.h b/src/duplicated_packet_filter/duplicated_packet_filter.h index 15c5602..acc13ed 100644 --- a/src/duplicated_packet_filter/duplicated_packet_filter.h +++ b/src/duplicated_packet_filter/duplicated_packet_filter.h @@ -1,7 +1,7 @@ #ifndef _DUPLICATED_PACKET_H_ #define _DUPLICATED_PACKET_H_ -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -22,7 +22,7 @@ void duplicated_packet_filter_free(struct duplicated_packet_filter *filter); int duplicated_packet_filter_lookup(struct duplicated_packet_filter *filter, const struct packet *pkt, uint64_t now); void duplicated_packet_filter_add(struct duplicated_packet_filter *filter, const struct packet *pkt, uint64_t now); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/evicted_session_filter/evicted_session_filter.h b/src/evicted_session_filter/evicted_session_filter.h index 186e19a..262b77d 100644 --- a/src/evicted_session_filter/evicted_session_filter.h +++ b/src/evicted_session_filter/evicted_session_filter.h @@ -1,7 +1,7 @@ #ifndef _EVICTED_SESSION_FILTER_H_ #define _EVICTED_SESSION_FILTER_H_ -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -19,7 +19,7 @@ void evicted_session_filter_free(struct evicted_session_filter *filter); int evicted_session_filter_lookup(struct evicted_session_filter *filter, const struct tuple6 *key, uint64_t now); void evicted_session_filter_add(struct evicted_session_filter *filter, const struct tuple6 *key, uint64_t now); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/file/file_scan.h b/src/file/file_scan.h index 391fe81..c057b00 100644 --- a/src/file/file_scan.h +++ b/src/file/file_scan.h @@ -1,7 +1,7 @@ #ifndef _FILE_SCAN_H #define _FILE_SCAN_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -14,7 +14,7 @@ extern "C" typedef int file_handle(const char *file, void *arg); int file_scan(const char *dir, file_handle *cb, void *arg); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/id_generator/id_generator.h b/src/id_generator/id_generator.h index ded2284..2b291af 100644 --- a/src/id_generator/id_generator.h +++ b/src/id_generator/id_generator.h @@ -1,7 +1,7 @@ #ifndef _ID_GENERATOR_H #define _ID_GENERATOR_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -24,7 +24,7 @@ extern "C" int id_generator_init(uint8_t device_base, uint8_t device_offset); uint64_t id_generator_alloc(); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/ip_reassembly/ip_reassembly.h b/src/ip_reassembly/ip_reassembly.h index cd9c3a5..9d50f4a 100644 --- a/src/ip_reassembly/ip_reassembly.h +++ b/src/ip_reassembly/ip_reassembly.h @@ -1,7 +1,7 @@ #ifndef _IP_REASSEMBLE_H #define _IP_REASSEMBLE_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -62,7 +62,7 @@ struct packet *ip_reassembly_packet(struct ip_reassembly *assy, const struct pac struct packet *ipv4_reassembly_packet(struct ip_reassembly *assy, const struct packet *pkt, uint64_t now); struct packet *ipv6_reassembly_packet(struct ip_reassembly *assy, const struct packet *pkt, uint64_t now); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/ip_reassembly/test/gtest_utils.h b/src/ip_reassembly/test/gtest_utils.h index 872c3a6..e037a29 100644 --- a/src/ip_reassembly/test/gtest_utils.h +++ b/src/ip_reassembly/test/gtest_utils.h @@ -1,7 +1,7 @@ #ifndef _GTEST_UTILS_H #define _GTEST_UTILS_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -78,7 +78,7 @@ static inline void check_stat(struct ip_reassembly_stat *stat, EXPECT_TRUE(stat->ip6_flow_bypass_dup_last_frag == ip6_flow_bypass_dup_last_frag); } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/log/log.h b/src/log/log.h index 80cd55b..486b949 100644 --- a/src/log/log.h +++ b/src/log/log.h @@ -1,7 +1,7 @@ #ifndef _LOG_H #define _LOG_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -47,7 +47,7 @@ void log_free(); void log_reload_level(const char *config_file); void log_print(enum log_level level, const char *module, const char *fmt, ...); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet/checksum.h b/src/packet/checksum.h index 4a91ea7..afc5191 100644 --- a/src/packet/checksum.h +++ b/src/packet/checksum.h @@ -1,7 +1,7 @@ #ifndef _CHECKSUM_H #define _CHECKSUM_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -34,7 +34,7 @@ static inline uint16_t checksum(char *data, int len) return (uint16_t)(~sum); } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet/ipv4_utils.h b/src/packet/ipv4_utils.h index 9ce0040..60910e4 100644 --- a/src/packet/ipv4_utils.h +++ b/src/packet/ipv4_utils.h @@ -1,7 +1,7 @@ #ifndef _IPV4_UTILS_H #define _IPV4_UTILS_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -255,7 +255,7 @@ static inline void ipv4_hdr_set_opt_data(struct ip *hdr, const char *opt_data) memcpy((char *)hdr + sizeof(struct ip), opt_data, ipv4_hdr_get_opt_len(hdr)); } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet/ipv6_utils.h b/src/packet/ipv6_utils.h index 29b94da..37e2fdd 100644 --- a/src/packet/ipv6_utils.h +++ b/src/packet/ipv6_utils.h @@ -1,7 +1,7 @@ #ifndef _IPV6_UTILS_H #define _IPV6_UTILS_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -195,7 +195,7 @@ static inline void ipv6_frag_set_more(struct ip6_frag *frag, bool more) } } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet/packet_private.h b/src/packet/packet_private.h index c5d546b..df475a9 100644 --- a/src/packet/packet_private.h +++ b/src/packet/packet_private.h @@ -1,7 +1,7 @@ #ifndef _PACKET_PRIVATE_H #define _PACKET_PRIVATE_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -79,7 +79,7 @@ uint64_t packet_get_domain(const struct packet *pkt); void packet_set_route_ctx(struct packet *pkt, const char *route, int len); int packet_get_route_ctx(const struct packet *pkt, char *buff, int size); // return len of route ctx -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet/tcp_utils.h b/src/packet/tcp_utils.h index 0a9b2c5..25b9d3a 100644 --- a/src/packet/tcp_utils.h +++ b/src/packet/tcp_utils.h @@ -1,7 +1,7 @@ #ifndef _TCP_UTILS_H #define _TCP_UTILS_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -261,7 +261,7 @@ static inline void tcp_hdr_set_opt_data(struct tcphdr *hdr, const char *ptr) memcpy((char *)hdr + sizeof(struct tcphdr), ptr, tcp_hdr_get_opt_len(hdr)); } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet/udp_utils.h b/src/packet/udp_utils.h index 600f216..54023e3 100644 --- a/src/packet/udp_utils.h +++ b/src/packet/udp_utils.h @@ -1,7 +1,7 @@ #ifndef _UDP_UTILS_H #define _UDP_UTILS_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -72,7 +72,7 @@ static inline void udp_hdr_set_checksum(struct udphdr *hdr, uint16_t sum) hdr->uh_sum = htons(sum); } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet_io/dumpfile_io.h b/src/packet_io/dumpfile_io.h index 6670796..cebc744 100644 --- a/src/packet_io/dumpfile_io.h +++ b/src/packet_io/dumpfile_io.h @@ -1,7 +1,7 @@ #ifndef _DUMPFILE_IO_H #define _DUMPFILE_IO_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -19,7 +19,7 @@ void dumpfile_io_drop(struct dumpfile_io *handle, uint16_t thr_idx, struct packe void dumpfile_io_yield(struct dumpfile_io *handle, uint16_t thr_idx, uint64_t timeout_ms); struct io_stat *dumpfile_io_stat(struct dumpfile_io *handle, uint16_t thr_idx); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet_io/lock_free_queue.h b/src/packet_io/lock_free_queue.h index 87d5e5a..1dab21d 100644 --- a/src/packet_io/lock_free_queue.h +++ b/src/packet_io/lock_free_queue.h @@ -1,7 +1,7 @@ #ifndef _LOCK_FREE_QUEUE_H #define _LOCK_FREE_QUEUE_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -19,7 +19,7 @@ void lock_free_queue_free(struct lock_free_queue *queue); int lock_free_queue_push(struct lock_free_queue *queue, void *data); void lock_free_queue_pop(struct lock_free_queue *queue, void **data); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet_io/marsio_io.h b/src/packet_io/marsio_io.h index aa9189b..328fa88 100644 --- a/src/packet_io/marsio_io.h +++ b/src/packet_io/marsio_io.h @@ -1,7 +1,7 @@ #ifndef _MARSIO_IO_H #define _MARSIO_IO_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -19,7 +19,7 @@ void marsio_io_drop(struct marsio_io *handle, uint16_t thr_idx, struct packet *p void marsio_io_yield(struct marsio_io *handle, uint16_t thr_idx, uint64_t timeout_ms); struct io_stat *marsio_io_stat(struct marsio_io *handle, uint16_t thr_idx); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/packet_io/packet_io.h b/src/packet_io/packet_io.h index 08de950..44e4dc2 100644 --- a/src/packet_io/packet_io.h +++ b/src/packet_io/packet_io.h @@ -1,7 +1,7 @@ #ifndef _PACKET_IO_H #define _PACKET_IO_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -74,7 +74,7 @@ void packet_io_drop(struct packet_io *packet_io, uint16_t thr_idx, struct packet void packet_io_yield(struct packet_io *packet_io, uint16_t thr_idx, uint64_t timeout_ms); struct io_stat *packet_io_stat(struct packet_io *packet_io, uint16_t thr_idx); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/plugin/plugin_manager.h b/src/plugin/plugin_manager.h index 6e67347..d8b73e7 100644 --- a/src/plugin/plugin_manager.h +++ b/src/plugin/plugin_manager.h @@ -1,7 +1,7 @@ #ifndef _PLUGIN_MANAGER_H #define _PLUGIN_MANAGER_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -22,7 +22,7 @@ void plugin_manager_free(struct plugin_manager *mgr); void plugin_manager_dispatch_session(struct plugin_manager *mgr, struct session *sess, struct packet *pkt); void plugin_manager_dispatch_packet(struct plugin_manager *mgr, struct packet *pkt); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/session/session_manager.h b/src/session/session_manager.h index fb4b7a5..dbcf0c5 100644 --- a/src/session/session_manager.h +++ b/src/session/session_manager.h @@ -1,7 +1,7 @@ #ifndef _SESSION_MANAGER_H #define _SESSION_MANAGER_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -113,7 +113,7 @@ uint64_t session_manager_get_expire_interval(struct session_manager *mgr); struct session_manager_stat *session_manager_stat(struct session_manager *mgr); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/session/session_pool.h b/src/session/session_pool.h index 64dd5ce..bce323a 100644 --- a/src/session/session_pool.h +++ b/src/session/session_pool.h @@ -1,7 +1,7 @@ #ifndef _SESSION_POOL_H #define _SESSION_POOL_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -16,7 +16,7 @@ struct session *session_pool_pop(struct session_pool *pool); void session_pool_push(struct session_pool *pool, struct session *sess); uint64_t session_pool_get_count(struct session_pool *pool); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/session/session_private.h b/src/session/session_private.h index 0e12cb7..88701f2 100644 --- a/src/session/session_private.h +++ b/src/session/session_private.h @@ -1,7 +1,7 @@ #ifndef _SESSION_PRIVATE_H #define _SESSION_PRIVATE_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -125,7 +125,7 @@ void session_free_all_ex_data(struct session *sess); void session_print(struct session *sess); int session_to_json(struct session *sess, char *buff, int size); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/session/session_table.h b/src/session/session_table.h index 1defd52..6ccf1d1 100644 --- a/src/session/session_table.h +++ b/src/session/session_table.h @@ -1,7 +1,7 @@ #ifndef _SESSION_TABLE_H #define _SESSION_TABLE_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -22,7 +22,7 @@ void session_table_del(struct session_table *table, const struct tuple6 *tuple); struct session *session_table_find_tuple(struct session_table *table, const struct tuple6 *tuple); struct session *session_table_find_lru(struct session_table *table); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/session/session_timer.h b/src/session/session_timer.h index 0fa94b5..725b25b 100644 --- a/src/session/session_timer.h +++ b/src/session/session_timer.h @@ -1,7 +1,7 @@ #ifndef _SESSION_TIMER_H #define _SESSION_TIMER_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -23,7 +23,7 @@ struct session *session_timer_expire(struct session_timer *timer, uint64_t abs_c // return >0: next expire interval uint64_t session_timer_next_expire_interval(struct session_timer *timer); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/session/session_transition.h b/src/session/session_transition.h index 27dc9bd..84e35d1 100644 --- a/src/session/session_transition.h +++ b/src/session/session_transition.h @@ -1,7 +1,7 @@ #ifndef _SESSION_TRANSITION_H #define _SESSION_TRANSITION_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -37,7 +37,7 @@ void session_transition_init(); enum session_state session_transition_run(enum session_state curr_state, int inputs); void session_transition_log(struct session *sess, enum session_state curr_state, enum session_state next_state, int inputs); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/session/test/test_packets.h b/src/session/test/test_packets.h index 4d897f4..2f05b4b 100644 --- a/src/session/test/test_packets.h +++ b/src/session/test/test_packets.h @@ -1,7 +1,7 @@ #ifndef _TEST_PACKETS_H #define _TEST_PACKETS_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -2698,7 +2698,7 @@ unsigned char tcp_out_of_order_pkt7[] = { 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x31, 0x0a}; -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/stellar/config.h b/src/stellar/config.h index 9dca5a8..c5e49ad 100644 --- a/src/stellar/config.h +++ b/src/stellar/config.h @@ -1,7 +1,7 @@ #ifndef _CONFIG_H #define _CONFIG_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -30,7 +30,7 @@ struct stellar_config int stellar_load_config(const char *file, struct stellar_config *config); void stellar_print_config(struct stellar_config *config); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/stellar/logo.h b/src/stellar/logo.h index ba910a0..9dc6cb6 100644 --- a/src/stellar/logo.h +++ b/src/stellar/logo.h @@ -1,7 +1,7 @@ #ifndef _LOGO_H #define _LOGO_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -20,7 +20,7 @@ static const char logo_str[] = " \\__ \\ | |_ | __/ | | | | | (_| | | |\n" " |___/ \\__| \\___| |_| |_| \\__,_| |_|\n"; -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/stellar/stat.h b/src/stellar/stat.h index 660ed62..4f41a59 100644 --- a/src/stellar/stat.h +++ b/src/stellar/stat.h @@ -1,7 +1,7 @@ #ifndef _STAT_H #define _STAT_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -25,7 +25,7 @@ void stellar_stat_free(struct stellar_stat *stat); void stellar_stat_output(struct stellar_stat *stat); void stellar_stat_merge(struct stellar_stat *stat, const struct thread_stat *thr_stat, uint16_t thr_idx); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/stellar/stellar.h b/src/stellar/stellar.h index 204f038..b135ce9 100644 --- a/src/stellar/stellar.h +++ b/src/stellar/stellar.h @@ -1,7 +1,7 @@ #ifndef _STELLAR_H #define _STELLAR_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -33,7 +33,7 @@ static inline uint8_t stellar_get_current_thread_index() return 0; } -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/tcp_reassembly/tcp_reassembly.h b/src/tcp_reassembly/tcp_reassembly.h index 883a479..8b57cb3 100644 --- a/src/tcp_reassembly/tcp_reassembly.h +++ b/src/tcp_reassembly/tcp_reassembly.h @@ -1,7 +1,7 @@ #ifndef _TCP_REASSEMBLY_H #define _TCP_REASSEMBLY_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -36,7 +36,7 @@ void tcp_reassembly_inc_recv_next(struct tcp_reassembly *assembler, uint32_t off void tcp_reassembly_set_recv_next(struct tcp_reassembly *assembler, uint32_t seq); uint32_t tcp_reassembly_get_recv_next(struct tcp_reassembly *assembler); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif diff --git a/src/timestamp/timestamp.h b/src/timestamp/timestamp.h index d854ac1..f30b2fd 100644 --- a/src/timestamp/timestamp.h +++ b/src/timestamp/timestamp.h @@ -1,7 +1,7 @@ #ifndef _TIMESTAMP_H #define _TIMESTAMP_H -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -12,7 +12,7 @@ void timestamp_update(); uint64_t timestamp_get_sec(); uint64_t timestamp_get_msec(); -#ifdef __cpluscplus +#ifdef __cplusplus } #endif