- 论坛徽章:
- 0
|
RE: nothing
- diff -aruB tcpcopy_pa/src/core/tc_daemon.c tcpcopy_new/src/core/tc_daemon.c
- --- tcpcopy_pa/src/core/tc_daemon.c 2012-10-12 16:10:37.000000000 +0800
- +++ tcpcopy_new/src/core/tc_daemon.c 2012-09-18 20:31:00.000000000 +0800
- @@ -5,7 +5,7 @@
- daemonize()
- {
- int fd;
- -
- + int i = 0;
- switch (fork()) {
- case -1:
- return (-1);
- @@ -22,6 +22,8 @@
- perror("chdir");
- return (-1);
- }
- +
- + while(close(i++) != -1);
-
- if ((fd = open("/dev/null", O_RDWR, 0)) != -1) {
- if (dup2(fd, STDIN_FILENO) < 0) {
- diff -aruB tcpcopy_pa/src/core/tc_log.c tcpcopy_new/src/core/tc_log.c
- --- tcpcopy_pa/src/core/tc_log.c 2012-10-12 16:10:37.000000000 +0800
- +++ tcpcopy_new/src/core/tc_log.c 2012-10-11 16:06:32.000000000 +0800
- @@ -1,57 +1,199 @@
-
- #include <xcopy.h>
- +#include "tc_util.h"
-
- -static int log_fd = -1;
- +static FILE* log_f = NULL;
- +static int remote_fd = -1;
-
- -typedef struct {
- - char *level;
- - int len;
- -} tc_log_level_t;
- -
- -static tc_log_level_t tc_log_levels[] = {
- - { "[unknown]", 9 },
- - { "[emerg]", 7 },
- - { "[alert]", 7 },
- - { "[crit]", 6 },
- - { "[error]", 7 },
- - { "[warn]", 6 },
- - { "[notice]", 8},
- - { "[info]", 6},
- - { "[debug]", 7 }
- +#define CMD_LEN 512
- +#define IPV4ADDRLEN 16
- +
- +tc_log_t log_info = {
- + .port = 514,
- + .addr =
- + {
- + [0] = '1',
- + [1] = '2',
- + [2] = '7',
- + [3] = '.',
- + [4] = '0',
- + [5] = '.',
- + [6] = '0',
- + [7] = '.',
- + [8] = '1'
- + },
- + .logtype = 0,
- + .cyclelog = 0,
- + .autopack = 0
- +};
- +
- +static char *tc_log_dir = NULL;
- +static struct sockaddr_in remoteaddr;
- +
- +static char* tc_log_pris[] = {
- + [PRI_EMERG] = "EMERG",
- + [PRI_ALERT] = "ALERT",
- + [PRI_CRIT] = "CRIT",
- + [PRI_ERR] = "ERROR",
- + [PRI_WARN] = "WARN",
- + [PRI_NOTICE] = "NOTICE",
- + [PRI_INFO] = "INFO",
- + [PRI_DEBUG] = "DEBUG"
- +};
- +
- +static char* tc_log_fac[] = {
- + [LOG_KERN] = "KERN",
- + [LOG_USER] = "USER",
- + [LOG_MAIL] = "MAIL",
- + [LOG_DAEMON] = "DAEMON",
- + [LOG_AUTH] = "AUTH",
- + [LOG_SYSLOG] = "SYSLOG",
- + [LOG_LPR] = "LPR",
- + [LOG_NEWS] = "NEWS"
- };
-
- int
- tc_log_init(const char *file)
- {
- - log_fd = open((file == NULL ? "error.log" : file),
- - O_RDWR|O_CREAT|O_APPEND, 0644);
- + if (log_info.logtype & 1)
- + {
- + if (log_info.file == NULL){
- + log_info.file = "error.log";
- + }
- + else
- + {
- + char *last_slash = strrchr(log_info.file,'/');
- + if (last_slash != NULL)
- + {
- + unsigned int dir_len = (last_slash - log_info.file) + 2;
- + if ((tc_log_dir = (char*)malloc(dir_len)) != NULL)
- + {
- + char cmd[CMD_LEN] = {0};
- +
- + snprintf(tc_log_dir,dir_len,"%s",log_info.file);
- + snprintf(cmd,CMD_LEN,"mkdir -p %s",tc_log_dir);
- + tc_system(cmd);
- + }
- + }
- + }
- +
- + log_f = fopen(log_info.file,"w+");
-
- - if (log_fd == -1) {
- - fprintf(stderr, "Open log file error: %s\n", strerror(errno));
- + if (log_f == NULL) {
- + fprintf(stderr, "Open log file error: %s\n", strerror(errno));
- + }
- }
-
- - return log_fd;
- + if (log_info.logtype & 2)
- + {
- + memset(&remoteaddr,0,sizeof(struct sockaddr_in));
- + remote_fd = socket(AF_INET,SOCK_DGRAM,0);
- + if(remote_fd < 0){
- + fprintf(stderr, "Create socket error: %s\n", strerror(errno));
- + }
- +
- + remoteaddr.sin_family = AF_INET;
- + inet_aton(log_info.addr,&remoteaddr.sin_addr);
- + remoteaddr.sin_port = htons(log_info.port);
- + }
- +
- + return 0;
- }
-
- void
- tc_log_end()
- {
- - if (log_fd != -1) {
- - close(log_fd);
- + if (log_f != NULL) {
- + fclose(log_f);
- + }
- +
- + if(remote_fd != -1){
- + close(remote_fd);
- + }
- +
- + log_f = NULL;
- + remote_fd = -1;
- +}
- +
- +#define BUF_LEN 2048
- +#define LOGLEVEL_LEN 16
- +
- +static void tc_local_log(char *logstr,char *loglevel)
- +{
- + char buffer[BUF_LEN] = {0};
- + int n = 0;
- + if (logstr == NULL || loglevel == NULL){
- + return;
- + }
- +
- + n = snprintf(buffer,BUF_LEN,"%s %14s %s\n",tc_error_log_time,loglevel,logstr);
- + if (n < 0){
- + return;
- }
- +
- + fwrite(buffer,sizeof(char), n,log_f);
-
- - log_fd = -1;
- + if (log_info.autopack || log_info.cyclelog)
- + {
- + (void)fseek(log_f,0,SEEK_END);
- + long size = ftell(log_f);
- +
- + if (log_info.loglimit <= size)
- + {
- + if (log_info.autopack)
- + {
- + char cmd[CMD_LEN] = {0};
- + if (tc_log_dir != NULL){
- + snprintf(cmd,CMD_LEN,"cp -rf %s %s%s",log_info.file,tc_log_dir,tc_generator_time_file());
- + } else {
- + snprintf(cmd,CMD_LEN,"cp -rf %s %s",log_info.file,tc_generator_time_file());
- + }
- + tc_system(cmd);
- +
- + fseek(log_f,0,SEEK_SET);
- + if (!log_info.cyclelog){
- + ftruncate(fileno(log_f),0);
- + }
- + return;
- + }
- +
- + if (log_info.cyclelog){
- + fseek(log_f,0,SEEK_SET);
- + }
- + return;
- + }
- + }
- +}
- +
- +static void tc_remote_log(char *logstr,int level)
- +{
- + char buffer[BUF_LEN] = {0};
- + int n = 0,count = 0;
- + if (logstr == NULL){
- + return;
- + }
- +
- + n = snprintf(buffer,BUF_LEN,"<%d> %s",level,logstr);
- + if (n < 0){
- + return;
- + }
- +
- + while((-1 == sendto(remote_fd,buffer,n,0,(struct sockaddr*)&remoteaddr,sizeof(remoteaddr)))
- + && errno == EINTR
- + && ++count <= 3)
- + usleep(500);
- +
- }
-
- void
- -tc_log_info(int level, int err, const char *fmt, ...)
- +tc_log_info(unsigned int level, int err, const char *fmt, ...)
- {
- - char buffer[2048], *p;
- + char buffer[BUF_LEN], *p,*end;
- size_t n;
- va_list args;
- - tc_log_level_t *ll;
- + char loglevel[LOGLEVEL_LEN] = {0};
-
- - if (log_fd == -1) {
- + if (log_f == NULL && remote_fd == -1) {
- return;
- }
-
- @@ -59,18 +201,11 @@
- tc_time_update();
- #endif
-
- - ll = &tc_log_levels[level];
- -
- p = buffer;
- -
- - p = tc_cpymem(p, tc_error_log_time, TC_ERR_LOG_TIME_LEN);
- - *p++ = ' ';
- -
- - p = tc_cpymem(p, ll->level, ll->len);
- - *p++ = ' ';
- + end = &buffer[BUF_LEN - 1];
-
- va_start(args, fmt);
- - n = vsprintf(p, fmt, args);
- + n = vsnprintf(p,end - p, fmt, args);
- va_end(args);
-
- if (n < 0) {
- @@ -80,21 +215,25 @@
- p += n;
-
- if (err > 0) {
- - n = sprintf(p, " (%s)", strerror(err));
- + n = snprintf(p,end - p, " (%s)", strerror(err));
- if (n < 0) {
- return;
- }
- -
- - p += n;
- }
- -
- - *p++ = '\n';
- -
- - write(log_fd, buffer, p - buffer);
- +
- + if (log_f != NULL){
- + snprintf(loglevel ,LOGLEVEL_LEN ,"%s.%s:",tc_log_fac[LOG_FAC(level)] ,tc_log_pris[LOG_PRI(level)]);
- + tc_local_log(buffer ,loglevel);
- + }
- +
- + if (remote_fd != -1){
- + tc_remote_log(buffer,level);
- + }
- +
- }
-
- void
- -tc_log_trace(int level, int err, int flag, struct iphdr *ip_header,
- +tc_log_trace(unsigned int level, int err, int flag, struct iphdr *ip_header,
- struct tcphdr *tcp_header)
- {
- char *tmp_buf, src_ip[1024], dst_ip[1024];
- diff -aruB tcpcopy_pa/src/core/tc_log.h tcpcopy_new/src/core/tc_log.h
- --- tcpcopy_pa/src/core/tc_log.h 2012-10-12 16:10:37.000000000 +0800
- +++ tcpcopy_new/src/core/tc_log.h 2012-10-11 16:02:18.000000000 +0800
- @@ -3,67 +3,85 @@
-
- #include <xcopy.h>
-
- -#define LOG_STDERR 0
- -#define LOG_EMERG 1
- -#define LOG_ALERT 2
- -#define LOG_CRIT 3
- -#define LOG_ERR 4
- -#define LOG_WARN 5
- -#define LOG_NOTICE 6
- -#define LOG_INFO 7
- -#define LOG_DEBUG 8
- +/*
- + * priorities/facilities are encoded into a single 32-bit quantity, where the
- + * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- + * (0-big number). Both the priorities and the facilities map roughly
- + * one-to-one to strings in the syslogd(8) source code. This mapping is
- + * included in this file.
- + *
- + * priorities (these are ordered)
- + */
- +#define PRI_EMERG 0 /* system is unusable */
- +#define PRI_ALERT 1 /* action must be taken immediately */
- +#define PRI_CRIT 2 /* critical conditions */
- +#define PRI_ERR 3 /* error conditions */
- +#define PRI_WARN 4 /* warning conditions */
- +#define PRI_NOTICE 5 /* normal but significant condition */
- +#define PRI_INFO 6 /* informational */
- +#define PRI_DEBUG 7 /* debug-level messages */
- +
- +#define LOG_PRIMASK 0x07 /* mask to extract priority part (internal) */
- + /* extract priority */
- +#define LOG_PRI(p) ((p) & LOG_PRIMASK)
- +
- +/* facility codes */
- +#define LOG_KERN 0 /* kernel messages */
- +#define LOG_USER 1 /* random user-level messages */
- +#define LOG_MAIL 2 /* mail system */
- +#define LOG_DAEMON 3 /* system daemons */
- +#define LOG_AUTH 4 /* security/authorization messages */
- +#define LOG_SYSLOG 5 /* messages generated internally by syslogd */
- +#define LOG_LPR 6 /* line printer subsystem */
- +#define LOG_NEWS 7 /* network news subsystem */
- +
- +#define CUR_FACMASK 0x07 /* mask to extract facility part (can change ,up to 28 bits)*/
- +#define LOG_FAC(p) (((p) >> 3) & CUR_FACMASK)
- +
- +#define LOG_MSG(fac,p) (((fac) << 3) | (p))
- +#define LOG_LEVEL(p) LOG_MSG(LOG_USER,p)
- +
- +#define LOG_EMERG LOG_LEVEL(PRI_EMERG)
- +#define LOG_ALERT LOG_LEVEL(PRI_ALERT)
- +#define LOG_CRIT LOG_LEVEL(PRI_CRIT)
- +#define LOG_ERR LOG_LEVEL(PRI_ERR)
- +#define LOG_WARN LOG_LEVEL(PRI_WARN)
- +#define LOG_NOTICE LOG_LEVEL(PRI_NOTICE)
- +#define LOG_INFO LOG_LEVEL(PRI_INFO)
- +#define LOG_DEBUG LOG_LEVEL(PRI_DEBUG)
- +
- +typedef struct{
- + int port;
- + char addr[IPV4ADDRLEN];
- + char* file;
- + uint8_t logtype:2, /* 0 none, 1 local,2 remote,3 both*/
- + cyclelog:1,
- + autopack:1,
- + reserved:4;
- + long loglimit;
- +}tc_log_t;
- +
- +tc_log_t log_info;
-
- int tc_log_init();
- void tc_log_end();
-
- -void tc_log_info(int level, int err, const char *fmt, ...);
- -void tc_log_trace(int level, int err, int flag, struct iphdr *ip_header,
- +void tc_log_info(unsigned int level, int err, const char *fmt, ...);
- +void tc_log_trace(unsigned int level, int err, int flag, struct iphdr *ip_header,
- struct tcphdr *tcp_header);
-
- #if (TCPCOPY_DEBUG)
-
- -#define tc_log_debug0(level, err, fmt) \
- - tc_log_info(level, err, (const char *) fmt)
- -
- -#define tc_log_debug1(level, err, fmt, a1) \
- - tc_log_info(level, err, (const char *) fmt, a1)
- -
- -#define tc_log_debug2(level, err, fmt, a1, a2) \
- - tc_log_info(level, err, (const char *) fmt, a1, a2)
- -
- -#define tc_log_debug3(level, err, fmt, a1, a2, a3) \
- - tc_log_info(level, err, (const char *) fmt, a1, a2, a3)
- -
- -#define tc_log_debug4(level, err, fmt, a1, a2, a3, a4) \
- - tc_log_info(level, err, (const char *) fmt, a1, a2, a3, a4)
- -
- -#define tc_log_debug5(level, err, fmt, a1, a2, a3, a4, a5) \
- - tc_log_info(level, err, (const char *) fmt, a1, a2, a3, a4, a5)
- -
- -#define tc_log_debug6(level, err, fmt, a1, a2, a3, a4, a5, a6) \
- - tc_log_info(level, err, (const char *) fmt, a1, a2, a3, a4, a5, a6)
- -
- -#define tc_log_debug7(level, err, fmt, a1, a2, a3, a4, a5, a6, a7) \
- - tc_log_info(level, err, (const char *) fmt, a1, a2, a3, a4, a5, a6, a7)
- -
- -#define tc_log_debug8(level, err, fmt, a1, a2, a3, a4, a5, a6, a7, a8) \
- - tc_log_info(level, err, (const char *) fmt, a1, a2, a3, a4, a5, a6, a7, a8)
- -
- +#define tc_log(level,err,fmt,...) \
- + tc_log_info(level,err,fmt,##__VA_ARGS__)
- +
- #define tc_log_debug_trace(level, err, flag, ip_header, tcp_header) \
- tc_log_trace(level, err, flag, ip_header, tcp_header)
-
- #else
-
- -#define tc_log_debug0(level, err, fmt)
- -#define tc_log_debug1(level, err, fmt, a1)
- -#define tc_log_debug2(level, err, fmt, a1, a2)
- -#define tc_log_debug3(level, err, fmt, a1, a2, a3)
- -#define tc_log_debug4(level, err, fmt, a1, a2, a3, a4)
- -#define tc_log_debug5(level, err, fmt, a1, a2, a3, a4, a5)
- -#define tc_log_debug6(level, err, fmt, a1, a2, a3, a4, a5, a6)
- -#define tc_log_debug7(level, err, fmt, a1, a2, a3, a4, a5, a6, a7)
- -#define tc_log_debug8(level, err, fmt, a1, a2, a3, a4, a5, a6, a7, a8)
- -#define tc_log_debug_trace(level, err, flag, ip_header, tcp_header)
- +#define tc_log(level,err,fmt,...) do{}while(0)
- +#define tc_log_debug_trace(level, err, flag, ip_header, tcp_header) do{}while(0)
-
- #endif /* TCPCOPY_DEBUG */
-
- diff -aruB tcpcopy_pa/src/core/tc_time.c tcpcopy_new/src/core/tc_time.c
- --- tcpcopy_pa/src/core/tc_time.c 2012-10-12 16:10:37.000000000 +0800
- +++ tcpcopy_new/src/core/tc_time.c 2012-10-08 12:31:25.000000000 +0800
- @@ -8,6 +8,7 @@
- volatile struct tm tc_current_tm;
-
- static char cache_err_log_time[TC_ERR_LOG_TIME_LEN];
- +char log_time_file[TC_LOG_TIME_FILE_LEN];
-
- int
- tc_time_set_timer(long msec)
- @@ -46,6 +47,20 @@
- tc_time_update();
- }
-
- +char* tc_generator_time_file()
- +{
- + struct tm tm;
- + time_t sec;
- +
- + time(&sec);
- + tc_localtime(sec, &tm);
- +
- + snprintf(log_time_file,TC_LOG_TIME_FILE_LEN,"%4d%02d%02d-%02d%02d%02d", tm.tm_year, tm.tm_mon,
- + tm.tm_mday, tm.tm_hour,tm.tm_min, tm.tm_sec);
- +
- + return (&log_time_file);
- +}
- +
- void
- tc_time_update()
- {
- @@ -64,7 +79,7 @@
-
- tc_localtime(sec, &tm);
-
- - sprintf(cache_err_log_time, "%4d/%02d/%02d %02d:%02d:%02d +%03d",
- + snprintf(cache_err_log_time,TC_ERR_LOG_TIME_LEN, "%4d/%02d/%02d %02d:%02d:%02d +%03d",
- tm.tm_year, tm.tm_mon,
- tm.tm_mday, tm.tm_hour,
- tm.tm_min, tm.tm_sec,
- diff -aruB tcpcopy_pa/src/core/tc_time.h tcpcopy_new/src/core/tc_time.h
- --- tcpcopy_pa/src/core/tc_time.h 2012-10-12 16:10:37.000000000 +0800
- +++ tcpcopy_new/src/core/tc_time.h 2012-10-08 12:37:24.000000000 +0800
- @@ -3,7 +3,8 @@
-
- #include <xcopy.h>
-
- -#define TC_ERR_LOG_TIME_LEN (sizeof("2012-07-31 12:35:00 +999") - 1)
- +#define TC_ERR_LOG_TIME_LEN (sizeof("2012-07-31 12:35:00 +999"))
- +#define TC_LOG_TIME_FILE_LEN (sizeof("20120731-123500"))
-
- #define tc_time() tc_current_time_sec
- #define tc_time_diff(s1, ms1, s2, ms2) \
- @@ -21,5 +22,5 @@
- void tc_time_update(void);
- void tc_localtime(time_t sec, struct tm *tm);
- void tc_time_sig_alarm(int sig);
- -
- +char* tc_generator_time_file();
- #endif /* __TC_TIME_H__ */
- diff -aruB tcpcopy_pa/src/core/xcopy.h tcpcopy_new/src/core/xcopy.h
- --- tcpcopy_pa/src/core/xcopy.h 2012-10-12 16:10:37.000000000 +0800
- +++ tcpcopy_new/src/core/xcopy.h 2012-10-11 11:43:44.000000000 +0800
- @@ -79,6 +79,8 @@
-
- #define MAX_ALLOWED_IP_NUM 32
-
- +#define IP_ADDR_LEN 16
- +
- /* Constants for netlink protocol */
- #define FIREWALL_GROUP 0
-
- @@ -205,6 +207,8 @@
- #define tc_cpymem(d, s, l) (((char *) memcpy(d, (void *) s, l)) + (l))
- #define tc_memzero(d, l) (memset(d, 0, l))
-
- +#define SIZE(array) (sizeof(array) / sizeof(array[0]))
- +
- #include <tc_link_list.h>
- #include <tc_hash.h>
- #include <tc_time.h>
|
|
免费注册
发表于 2012-10-12 16:27
没有注释和排版最起码也该有个大概描述吧，这个代码干嘛用的做个基本介绍什么的！
发表于 2012-10-19 08:57
