github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-02-08 08:09:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

--enable-color, fix a segment fault

Browse Source
This commit is contained in:
U-DESKTOP-T772REH\wangyu 2018-06-20 00:41:13 +08:00
parent 17910bb9f4
commit 5aafe04f6d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.cpp
View File

@ -597,7 +597,8 @@ void udp_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
socklen_t udp_new_addr_len = sizeof(sockaddr_in); socklen_t udp_new_addr_len = sizeof(sockaddr_in);
if ((recv_len = recvfrom(udp_fd, buf, max_data_len+1, 0, if ((recv_len = recvfrom(udp_fd, buf, max_data_len+1, 0,
(struct sockaddr *) &udp_new_addr_in, &udp_new_addr_len)) == -1) { (struct sockaddr *) &udp_new_addr_in, &udp_new_addr_len)) == -1) {
mylog(log_warn,"recv_from error,this shouldnt happen at client,but lets try to continue\n"); mylog(log_debug,"recv_from error,this shouldnt happen at client,but lets try to continue\n");
return ;
//myexit(1); //myexit(1);
}; };
@ -1069,6 +1070,8 @@ int main(int argc, char *argv[])
ev_signal signal_watcher_sigpipe; ev_signal signal_watcher_sigpipe;
ev_signal_init(&signal_watcher_sigpipe, sigpipe_cb, SIGPIPE); ev_signal_init(&signal_watcher_sigpipe, sigpipe_cb, SIGPIPE);
ev_signal_start(loop, &signal_watcher_sigpipe); ev_signal_start(loop, &signal_watcher_sigpipe);
#else
enable_log_color=0;
#endif #endif
ev_signal signal_watcher_sigterm; ev_signal signal_watcher_sigterm;

9
misc.cpp
View File

@ -231,6 +231,10 @@ int process_log_level(int argc,char *argv[])//process --log-level and --disable
} }
} }
} }
if(strcmp(argv[i],"--enable-color")==0)
{
enable_log_color=1;
}
if(strcmp(argv[i],"--disable-color")==0) if(strcmp(argv[i],"--disable-color")==0)
{ {
enable_log_color=0; enable_log_color=0;
@ -260,6 +264,7 @@ void process_arg(int argc, char *argv[]) //process all options
{"cipher-mode", required_argument, 0, 1}, {"cipher-mode", required_argument, 0, 1},
{"raw-mode", required_argument, 0, 1}, {"raw-mode", required_argument, 0, 1},
{"disable-color", no_argument, 0, 1}, {"disable-color", no_argument, 0, 1},
{"enable-color", no_argument, 0, 1},
{"log-position", no_argument, 0, 1}, {"log-position", no_argument, 0, 1},
{"disable-bpf", no_argument, 0, 1}, {"disable-bpf", no_argument, 0, 1},
{"disable-anti-replay", no_argument, 0, 1}, {"disable-anti-replay", no_argument, 0, 1},
@ -565,6 +570,10 @@ void process_arg(int argc, char *argv[]) //process all options
{ {
//enable_log_color=0; //enable_log_color=0;
} }
else if(strcmp(long_options[option_index].name,"enable-color")==0)
{
//enable_log_color=0;
}
else if(strcmp(long_options[option_index].name,"debug")==0) else if(strcmp(long_options[option_index].name,"debug")==0)
{ {
debug_flag=1; debug_flag=1;