Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-29 12:36:53 +00:00
Code Releases Activity

refine local proxy for acl support

Browse Source
This commit is contained in:
Max Lv
2014-05-07 14:33:36 +08:00
parent 1b4c60b013
commit 27cd819d06
9 changed files with 142 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libipset/Makefile
+13 -5
View File
@@ -126,8 +126,8 @@ am__objects_3 = set/libipset_la-allocation.lo \
set/libipset_la-inspection.lo set/libipset_la-ipv4_set.lo \
set/libipset_la-ipv6_set.lo set/libipset_la-iterator.lo \
set/libipset_la-storage.lo
am_libipset_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
am_libipset_la_OBJECTS = libipset_la-general.lo $(am__objects_1) \
$(am__objects_2) $(am__objects_3)
libipset_la_OBJECTS = $(am_libipset_la_OBJECTS)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -326,7 +326,7 @@ map_src = map/allocation.c map/inspection.c map/ipv4_map.c map/ipv6_map.c \
set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
set/iterator.c set/storage.c
libipset_la_SOURCES = ${bdd_src} ${map_src} ${set_src}
libipset_la_SOURCES = general.c ${bdd_src} ${map_src} ${set_src}
libipset_la_CFLAGS = -Iinclude
libipset_la_LDFLAGS = -static
all: all-am
@@ -444,6 +444,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
include ./$(DEPDIR)/libipset_la-general.Plo
include bdd/$(DEPDIR)/libipset_la-assignments.Plo
include bdd/$(DEPDIR)/libipset_la-basics.Plo
include bdd/$(DEPDIR)/libipset_la-bdd-iterator.Plo
@@ -487,6 +488,13 @@ include set/$(DEPDIR)/libipset_la-storage.Plo
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
# $(AM_V_CC_no)$(LTCOMPILE) -c -o $@ $<
libipset_la-general.lo: general.c
$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libipset_la_CFLAGS) $(CFLAGS) -MT libipset_la-general.lo -MD -MP -MF $(DEPDIR)/libipset_la-general.Tpo -c -o libipset_la-general.lo `test -f 'general.c' || echo '$(srcdir)/'`general.c
$(AM_V_at)$(am__mv) $(DEPDIR)/libipset_la-general.Tpo $(DEPDIR)/libipset_la-general.Plo
# $(AM_V_CC)source='general.c' object='libipset_la-general.lo' libtool=yes \
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
# $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libipset_la_CFLAGS) $(CFLAGS) -c -o libipset_la-general.lo `test -f 'general.c' || echo '$(srcdir)/'`general.c
bdd/libipset_la-assignments.lo: bdd/assignments.c
$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libipset_la_CFLAGS) $(CFLAGS) -MT bdd/libipset_la-assignments.lo -MD -MP -MF bdd/$(DEPDIR)/libipset_la-assignments.Tpo -c -o bdd/libipset_la-assignments.lo `test -f 'bdd/assignments.c' || echo '$(srcdir)/'`bdd/assignments.c
$(AM_V_at)$(am__mv) bdd/$(DEPDIR)/libipset_la-assignments.Tpo bdd/$(DEPDIR)/libipset_la-assignments.Plo
@@ -750,7 +758,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
-rm -rf bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -rf ./$(DEPDIR) bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -796,7 +804,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -rf ./$(DEPDIR) bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
libipset/Makefile.am
+1 -1
View File
@@ -25,7 +25,7 @@ map_src = map/allocation.c map/inspection.c map/ipv4_map.c map/ipv6_map.c \
set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
set/iterator.c set/storage.c
libipset_la_SOURCES = ${bdd_src} ${map_src} ${set_src}
libipset_la_SOURCES = general.c ${bdd_src} ${map_src} ${set_src}
libipset_la_CFLAGS = -Iinclude
libipset_la_LDFLAGS = -static
libipset/Makefile.in
+13 -5
View File
@@ -126,8 +126,8 @@ am__objects_3 = set/libipset_la-allocation.lo \
set/libipset_la-inspection.lo set/libipset_la-ipv4_set.lo \
set/libipset_la-ipv6_set.lo set/libipset_la-iterator.lo \
set/libipset_la-storage.lo
am_libipset_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
am_libipset_la_OBJECTS = libipset_la-general.lo $(am__objects_1) \
$(am__objects_2) $(am__objects_3)
libipset_la_OBJECTS = $(am_libipset_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -326,7 +326,7 @@ map_src = map/allocation.c map/inspection.c map/ipv4_map.c map/ipv6_map.c \
set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
set/iterator.c set/storage.c
libipset_la_SOURCES = ${bdd_src} ${map_src} ${set_src}
libipset_la_SOURCES = general.c ${bdd_src} ${map_src} ${set_src}
libipset_la_CFLAGS = -Iinclude
libipset_la_LDFLAGS = -static
all: all-am
@@ -444,6 +444,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libipset_la-general.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@bdd/$(DEPDIR)/libipset_la-assignments.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@bdd/$(DEPDIR)/libipset_la-basics.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@bdd/$(DEPDIR)/libipset_la-bdd-iterator.Plo@am__quote@
@@ -487,6 +488,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libipset_la-general.lo: general.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libipset_la_CFLAGS) $(CFLAGS) -MT libipset_la-general.lo -MD -MP -MF $(DEPDIR)/libipset_la-general.Tpo -c -o libipset_la-general.lo `test -f 'general.c' || echo '$(srcdir)/'`general.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libipset_la-general.Tpo $(DEPDIR)/libipset_la-general.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='general.c' object='libipset_la-general.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libipset_la_CFLAGS) $(CFLAGS) -c -o libipset_la-general.lo `test -f 'general.c' || echo '$(srcdir)/'`general.c
bdd/libipset_la-assignments.lo: bdd/assignments.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libipset_la_CFLAGS) $(CFLAGS) -MT bdd/libipset_la-assignments.lo -MD -MP -MF bdd/$(DEPDIR)/libipset_la-assignments.Tpo -c -o bdd/libipset_la-assignments.lo `test -f 'bdd/assignments.c' || echo '$(srcdir)/'`bdd/assignments.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) bdd/$(DEPDIR)/libipset_la-assignments.Tpo bdd/$(DEPDIR)/libipset_la-assignments.Plo
@@ -750,7 +758,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
-rm -rf bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -rf ./$(DEPDIR) bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -796,7 +804,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -rf ./$(DEPDIR) bdd/$(DEPDIR) map/$(DEPDIR) set/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
src/Makefile.am
+1
View File
@@ -2,6 +2,7 @@ AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations -fno-strict-aliasi
AM_CFLAGS += -I$(top_builddir)/libev
AM_CFLAGS += -I$(top_builddir)/libasyncns
AM_CFLAGS += -I$(top_builddir)/libipset/include
AM_CFLAGS += -I$(top_builddir)/libcork/include
AM_LDFLAGS = -static
src/Makefile.in
+2 -1
View File
@@ -340,7 +340,8 @@ top_srcdir = @top_srcdir@
AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations \
-fno-strict-aliasing -std=gnu99 -D_GNU_SOURCE \
-I$(top_builddir)/libev -I$(top_builddir)/libasyncns \
-I$(top_builddir)/libipset/include
-I$(top_builddir)/libipset/include \
-I$(top_builddir)/libcork/include
AM_LDFLAGS = -static
SS_COMMON_LIBS = $(top_builddir)/libev/libev.la \
$(top_builddir)/libcork/libcork.la \
src/acl.c
+43 -3
View File
@@ -1,7 +1,47 @@
#include <ipset/ipset.h>
#include <utils.h>
struct ip_set *init_acl(void)
static struct ip_set set;
int init_acl(const char *path)
{
struct ip_set *ipset = ipset_new();
return ipset;
ipset_init_library();
ipset_init(&set);
FILE *f = fopen(path, "r");
if (f == NULL) FATAL("Invalid acl path.");
char line[256];
while(!feof(f))
{
if (fgets(line, 256, f))
{
char host[256];
int cidr;
sscanf(line, "%s/%d", host, &cidr);
struct cork_ipv4 addr;
int err = cork_ipv4_init(&addr, host);
if (err) continue;
ipset_ipv4_add_network(&set, &addr, cidr);
}
}
fclose(f);
return 0;
}
void free_acl(void)
{
ipset_done(&set);
}
int is_bypass(const char* host)
{
struct cork_ipv4 addr;
int err = cork_ipv4_init(&addr, host);
if (err) return 0;
struct cork_ip ip;
cork_ip_from_ipv4(&ip, &addr);
return ipset_contains_ip(&set, &ip);
}
src/acl.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef _ACL_H
#define _ACL_H
int init_acl(const char *path);
void free_acl(void);
int is_addr_bypass(const char* host);
#endif // _ACL_H
src/local.c
+60 -45
View File
@@ -50,7 +50,6 @@
int verbose = 0;
int udprelay = 0;
static int fast_open = 0;
static struct addrinfo *remote_res = NULL;
#ifndef __MINGW32__
static int setnonblocking(int fd)
@@ -196,7 +195,7 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
{
#ifdef TCP_FASTOPEN
s = sendto(remote->fd, remote->buf, r, MSG_FASTOPEN,
remote_res->ai_addr, remote_res->ai_addrlen);
remote->addr_info->ai_addr, remote->addr_info->ai_addrlen);
if (s == -1)
{
if (errno == EINPROGRESS)
@@ -717,6 +716,7 @@ struct remote* new_remote(int fd, int timeout)
remote->send_ctx->connected = 0;
remote->buf_len = 0;
remote->buf_idx = 0;
remote->addr_info = NULL;
return remote;
}
@@ -732,6 +732,10 @@ static void free_remote(struct remote *remote)
{
free(remote->buf);
}
if (remote->addr_info)
{
freeaddrinfo(remote->addr_info);
}
free(remote->recv_ctx);
free(remote->send_ctx);
free(remote);
@@ -823,6 +827,57 @@ static void close_and_free_server(EV_P_ struct server *server)
}
}
static struct remote* connect_to_remote(struct listen_ctx *listener)
{
int opt = 1;
int sockfd;
struct addrinfo *remote_res;
struct addrinfo hints;
memset(&hints, 0, sizeof hints);
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
int index = rand() % listener->remote_num;
if (verbose)
{
LOGD("connect to %s:%s", listener->remote_addr[index].host,
listener->remote_addr[index].port);
}
int err = getaddrinfo(listener->remote_addr[index].host,
listener->remote_addr[index].port,
&hints, &remote_res);
if (err)
{
ERROR("getaddrinfo");
return NULL;
}
sockfd = socket(remote_res->ai_family, remote_res->ai_socktype,
remote_res->ai_protocol);
if (sockfd < 0)
{
ERROR("socket");
return NULL;
}
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE
setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif
// Setup
setnonblocking(sockfd);
#ifdef SET_INTERFACE
if (listener->iface) setinterface(sockfd, listener->iface);
#endif
struct remote *remote = new_remote(sockfd, listener->timeout);
remote->addr_info = remote_res;
return remote;
}
static void accept_cb (EV_P_ ev_io *w, int revents)
{
struct listen_ctx *listener = (struct listen_ctx *)w;
@@ -839,56 +894,16 @@ static void accept_cb (EV_P_ ev_io *w, int revents)
setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif
int sockfd;
struct remote *remote = connect_to_remote(listener);
if (remote_res == NULL)
{
struct addrinfo hints;
memset(&hints, 0, sizeof hints);
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
int index = rand() % listener->remote_num;
if (verbose)
{
LOGD("connect to %s:%s", listener->remote_addr[index].host,
listener->remote_addr[index].port);
}
int err = getaddrinfo(listener->remote_addr[index].host,
listener->remote_addr[index].port,
&hints, &remote_res);
if (err)
{
ERROR("getaddrinfo");
return;
}
}
sockfd = socket(remote_res->ai_family, remote_res->ai_socktype,
remote_res->ai_protocol);
if (sockfd < 0)
{
ERROR("socket");
return;
}
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE
setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif
// Setup
setnonblocking(sockfd);
#ifdef SET_INTERFACE
if (listener->iface) setinterface(sockfd, listener->iface);
#endif
if (remote == NULL) return;
struct server *server = new_server(serverfd, listener->method);
struct remote *remote = new_remote(sockfd, listener->timeout);
server->remote = remote;
remote->server = server;
if (!fast_open)
{
connect(sockfd, remote_res->ai_addr, remote_res->ai_addrlen);
connect(remote->fd, remote->addr_info->ai_addr, remote->addr_info->ai_addrlen);
// listen to remote connected event
ev_io_start(EV_A_ &remote->send_ctx->io);
ev_timer_start(EV_A_ &remote->send_ctx->watcher);
src/local.h
+1
View File
@@ -59,6 +59,7 @@ struct remote
struct remote_ctx *recv_ctx;
struct remote_ctx *send_ctx;
struct server *server;
struct addrinfo *addr_info;
};