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

修复编译错误

Browse Source
This commit is contained in:
liuxueli
2019-11-18 13:29:28 +08:00
parent 88d9368cee
commit f33d11c50b
3 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inc/tsg_rule.h
View File

@@ -2,7 +2,6 @@
#define __TSG_RULE_H__ #define __TSG_RULE_H__
#include <MESA/Maat_rule.h> #include <MESA/Maat_rule.h>
#include "tsg_types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

1
src/tsg_send_log.cpp
View File

@@ -15,7 +15,6 @@
#include <MESA/MESA_prof_load.h> #include <MESA/MESA_prof_load.h>
#include <MESA/MESA_handle_logger.h> #include <MESA/MESA_handle_logger.h>
#include "tsg_types.h"
#include "tsg_send_log.h" #include "tsg_send_log.h"
#include "tsg_send_log_internal.h" #include "tsg_send_log_internal.h"

54
src/tsg_send_log_internal.h
View File

@@ -4,9 +4,6 @@
#include <MESA/rdkafka.h> #include <MESA/rdkafka.h>
#include <MESA/cJSON.h> #include <MESA/cJSON.h>
#include "tsg_types.h"
#define MAX_IPV4_LEN 16 #define MAX_IPV4_LEN 16
#define MAX_STRING_LEN 32 #define MAX_STRING_LEN 32
@@ -23,32 +20,6 @@ enum _DO_LOG
LOG_ALL=2 LOG_ALL=2
}; };
typedef struct _id2field
{
TLD_TYPE type;
int id;
char name[MAX_STRING_LEN];
}id2field_t;
struct _tld_handle
{
int thread_id;
cJSON *object;
};
struct _tsg_log_instance
{
int mode;
int max_service;
void *logger;
char common_field_file[MAX_STRING_LEN*4];
char broker_list[MAX_STRING_LEN*4];
char local_ip_str[MAX_IPV4_LEN];
id2field_t id2field[LOG_COMMON_MAX];
rd_kafka_topic_t **topic_rkt;
id2field_t *service2topic;
};
typedef enum _tsg_log_field_id typedef enum _tsg_log_field_id
{ {
LOG_COMMON_SERVICE, LOG_COMMON_SERVICE,
@@ -90,6 +61,31 @@ typedef enum _tsg_log_field_id
LOG_COMMON_MAX LOG_COMMON_MAX
}tsg_log_field_id_t; }tsg_log_field_id_t;
typedef struct _id2field
{
TLD_TYPE type;
int id;
char name[MAX_STRING_LEN];
}id2field_t;
struct _tld_handle
{
int thread_id;
cJSON *object;
};
struct _tsg_log_instance
{
int mode;
int max_service;
void *logger;
char common_field_file[MAX_STRING_LEN*4];
char broker_list[MAX_STRING_LEN*4];
char local_ip_str[MAX_IPV4_LEN];
id2field_t id2field[LOG_COMMON_MAX];
rd_kafka_topic_t **topic_rkt;
id2field_t *service2topic;
};
char *log_field_id2name(tsg_log_instance_t instance, tsg_log_field_id_t id); char *log_field_id2name(tsg_log_instance_t instance, tsg_log_field_id_t id);
tsg_log_instance_t tsg_sendlog_init(const char *filename); tsg_log_instance_t tsg_sendlog_init(const char *filename);