github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-01-19 06:19:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wangyu-:unified' into unified

Browse Source
This commit is contained in:
gek64 2023-07-27 21:10:28 +08:00 committed by GitHub
commit ca16c3a5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
#note: experimental #note: experimental
# currently only used for generating `compile_commands.json` for clangd # currently only used for generating `compile_commands.json` for clangd.
# to build this project, it's suggested to use `makefile` instead # to build this project, it's suggested to use `makefile` instead
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 3.7)

8
common.cpp
View File

@ -1127,8 +1127,8 @@ void print_binary_chars(const char *a, int len) {
u32_t djb2(unsigned char *str, int len) { u32_t djb2(unsigned char *str, int len) {
u32_t hash = 5381; u32_t hash = 5381;
int c; int c;
int i = 0; for (int i=0; i<len ;i++) {
while (c = *str++, i++ != len) { c = *(str++);
hash = ((hash << 5) + hash) ^ c; /* (hash * 33) ^ c */ hash = ((hash << 5) + hash) ^ c; /* (hash * 33) ^ c */
} }
@ -1139,8 +1139,8 @@ u32_t djb2(unsigned char *str, int len) {
u32_t sdbm(unsigned char *str, int len) { u32_t sdbm(unsigned char *str, int len) {
u32_t hash = 0; u32_t hash = 0;
int c; int c;
int i = 0; for (int i=0; i<len ;i++) {
while (c = *str++, i++ != len) { c = *(str++);
hash = c + (hash << 6) + (hash << 16) - hash; hash = c + (hash << 6) + (hash << 16) - hash;
} }
// hash=htonl(hash); // hash=htonl(hash);

8
main.cpp
View File

@ -40,19 +40,19 @@ int main(int argc, char *argv[]) {
pre_process_arg(argc, argv); pre_process_arg(argc, argv);
ev_signal signal_watcher_sigpipe;
ev_signal signal_watcher_sigterm;
ev_signal signal_watcher_sigint;
if (program_mode == client_mode) { if (program_mode == client_mode) {
struct ev_loop *loop = ev_default_loop(0); struct ev_loop *loop = ev_default_loop(0);
#if !defined(__MINGW32__) #if !defined(__MINGW32__)
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);
#endif #endif
ev_signal signal_watcher_sigterm;
ev_signal_init(&signal_watcher_sigterm, sigterm_cb, SIGTERM); ev_signal_init(&signal_watcher_sigterm, sigterm_cb, SIGTERM);
ev_signal_start(loop, &signal_watcher_sigterm); ev_signal_start(loop, &signal_watcher_sigterm);
ev_signal signal_watcher_sigint;
ev_signal_init(&signal_watcher_sigint, sigint_cb, SIGINT); ev_signal_init(&signal_watcher_sigint, sigint_cb, SIGINT);
ev_signal_start(loop, &signal_watcher_sigint); ev_signal_start(loop, &signal_watcher_sigint);
} else { } else {