Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shadowsocks-libev: Update to the commit as of 2025-1-20 #1680

Merged
merged 4 commits into from
Feb 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions shadowsocks-libev/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ PKG_VERSION:=3.3.5
PKG_RELEASE:=13

PKG_SOURCE_PROTO:=git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev.git
PKG_SOURCE_VERSION:=d83ace0f0d9c05656c13d66aa4a449bf70143254
PKG_MIRROR_HASH:=6ff973af37c20cf0430f106d360b94b8b91df6dd8d7be3908ee84b5a86c3319f
PKG_SOURCE_DATE:=2025-1-20
PKG_SOURCE_VERSION:=9afa3cacf947f910be46b69fc5a7a1fdd02fd5e6
PKG_MIRROR_HASH:=575b21803b28db8ab59ecbdb2cf21c4282881507b3a4267cc24f55bad12819cb
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

PKG_MAINTAINER:=Yousong Zhou <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ Subject: [PATCH] Fix mishandling of incoming socket buffer. It must be set on
src/tunnel.c | 16 ++++++++--------
4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/local.c b/src/local.c
index fa1ca7b..51f62c4 100644
--- a/src/local.c
+++ b/src/local.c
@@ -205,6 +205,14 @@ create_and_bind(const char *addr, const char *port)
@@ -205,6 +205,14 @@ create_and_bind(const char *addr, const
}
}

Expand Down Expand Up @@ -45,11 +43,9 @@ index fa1ca7b..51f62c4 100644
server_t *server = new_server(serverfd);
server->listener = listener;

diff --git a/src/redir.c b/src/redir.c
index d36fe3f..86b7238 100644
--- a/src/redir.c
+++ b/src/redir.c
@@ -201,6 +201,14 @@ create_and_bind(const char *addr, const char *port)
@@ -201,6 +201,14 @@ create_and_bind(const char *addr, const
LOGI("tcp tproxy mode enabled");
}

Expand Down Expand Up @@ -79,11 +75,9 @@ index d36fe3f..86b7238 100644
int index = rand() % listener->remote_num;
struct sockaddr *remote_addr = listener->remote_addr[index];

diff --git a/src/server.c b/src/server.c
index 73b6599..ef347a5 100644
--- a/src/server.c
+++ b/src/server.c
@@ -620,6 +620,14 @@ create_and_bind(const char *host, const char *port, int mptcp)
@@ -620,6 +620,14 @@ create_and_bind(const char *host, const
}
}

Expand Down Expand Up @@ -113,11 +107,9 @@ index 73b6599..ef347a5 100644
setnonblocking(serverfd);

server_t *server = new_server(serverfd, listener);
diff --git a/src/tunnel.c b/src/tunnel.c
index 99ed412..9f0dd57 100644
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -166,6 +166,14 @@ create_and_bind(const char *addr, const char *port)
@@ -166,6 +166,14 @@ create_and_bind(const char *addr, const
}
}

Expand Down Expand Up @@ -147,6 +139,3 @@ index 99ed412..9f0dd57 100644
int index = rand() % listener->remote_num;
struct sockaddr *remote_addr = listener->remote_addr[index];

--
2.39.5

This file was deleted.

Loading