Skip to content

Commit

Permalink
update ssr-native module.
Browse files Browse the repository at this point in the history
  • Loading branch information
ssrlive committed May 13, 2022
1 parent 25d2a05 commit 0f500a0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion depends/ssr-native
Submodule ssr-native updated 56 files
+9 −0 config.h.cmake
+1 −1 depends/cstl
+1 −1 depends/libbloom
+1 −1 depends/libuv
+1 −1 depends/uv-mbed
+29 −11 install/ssrn-ot-install-ipv6.sh
+2 −1 install/ssrn-ot-install.sh
+8 −0 ios/ssrNative.xcodeproj/project.pbxproj
+33 −21 src/CMakeLists.txt
+21 −22 src/aead.c
+8 −8 src/aead.h
+147 −10 src/android.c
+157 −89 src/client/client.c
+25 −14 src/client/listener.c
+21 −8 src/client/main.c
+5 −1 src/client/s5.c
+20 −18 src/client/tls_cli.c
+4 −3 src/client/tls_cli.h
+1 −0 src/cmd_line_parser.c
+4 −7 src/common.h
+23 −4 src/config_json.c
+1 −0 src/daemon_wrapper.c
+4 −0 src/dump_info.c
+12 −3 src/dump_info.h
+4 −4 src/encrypt.c
+151 −0 src/obfs/auth.c
+5 −0 src/obfs/auth.h
+273 −2 src/obfs/auth_chain.c
+13 −0 src/obfs/obfs.c
+9 −0 src/obfs/obfs.h
+19 −8 src/obfs/tls1.2_ticket.c
+2 −0 src/obfs/verify.c
+5 −5 src/ppbloom.c
+4 −2 src/ppbloom.h
+42 −24 src/server/server.c
+9 −1 src/sockaddr_universal.c
+1 −1 src/sockaddr_universal.h
+10 −119 src/ssr_executive.c
+2 −26 src/ssr_executive.h
+4 −3 src/ssr_qr_code.c
+0 −7 src/ssrutils.c
+11 −3 src/ssrutils.h
+583 −0 src/udp_ssr_client.c
+543 −0 src/udp_ssr_server.c
+148 −54 src/udprelay.c
+39 −8 src/udprelay.h
+4 −0 src/websocket_basic.c
+0 −0 win32/src/getopt.h
+0 −0 win32/src/getopt_long.h
+8 −6 win32/ssr-client/ssr-client-lib.vcxproj
+8 −2 win32/ssr-client/ssr-client-lib.vcxproj.filters
+8 −6 win32/ssr-client/ssr-client.vcxproj
+8 −2 win32/ssr-client/ssr-client.vcxproj.filters
+1 −0 win32/ssr-native-lib.sln
+11 −10 win32/ssr-server/ssr-server.vcxproj
+5 −2 win32/ssr-server/ssr-server.vcxproj.filters
2 changes: 1 addition & 1 deletion src/ssrWin/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ static INT_PTR CALLBACK QrCodeDlgProc(HWND hDlg, UINT uMessage, WPARAM wParam, L
static struct server_config* config;
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW(hDlg, GWLP_HINSTANCE);
HICON hIconApp;
static char* qrcode_str;
static char* qrcode_str = NULL;
static HBITMAP hBmp = NULL;
HDC dc, mdc;
RECT rc;
Expand Down

0 comments on commit 0f500a0

Please sign in to comment.