drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-26 20:20:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: drygdryg:f48617e1a385b5c65fe0c5aa89bb63cae920de53
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64
..
compare: drygdryg:21ce641ebf3d16cb0c86cb71ab080342b26b3367
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64

No commits in common. "f48617e1a385b5c65fe0c5aa89bb63cae920de53" and "21ce641ebf3d16cb0c86cb71ab080342b26b3367" have entirely different histories.
f48617e1a3 ... 21ce641ebf

3 changed files with 2 additions and 9 deletions
Show Stats Expand all files Collapse all files

8
nfq/Makefile
View File

@ -2,15 +2,14 @@ CC ?= gcc
CFLAGS += -std=gnu99 -Wno-logical-op-parentheses -O3 CFLAGS += -std=gnu99 -Wno-logical-op-parentheses -O3
CFLAGS_BSD = -Wno-address-of-packed-member -Wno-switch CFLAGS_BSD = -Wno-address-of-packed-member -Wno-switch
CFLAGS_MAC = -mmacosx-version-min=10.8 CFLAGS_MAC = -mmacosx-version-min=10.8
LIBS_LINUX = -lnetfilter_queue -lnfnetlink -lz LIBS = -lnetfilter_queue -lnfnetlink -lz
LIBS_BSD = -lz LIBS_BSD = -lz
LIBS_CYGWIN = -lz
SRC_FILES = *.c crypto/*.c SRC_FILES = *.c crypto/*.c
all: nfqws all: nfqws
nfqws: $(SRC_FILES) nfqws: $(SRC_FILES)
$(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS_LINUX) $(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS)
bsd: $(SRC_FILES) bsd: $(SRC_FILES)
$(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o dvtws $(SRC_FILES) $(LDFLAGS) $(LIBS_BSD) $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o dvtws $(SRC_FILES) $(LDFLAGS) $(LIBS_BSD)
@ -22,8 +21,5 @@ mac: $(SRC_FILES)
lipo -create -output dvtws dvtwsx dvtwsa lipo -create -output dvtws dvtwsx dvtwsa
rm -f dvtwsx dvtwsa rm -f dvtwsx dvtwsa
cygwin:
$(CC) -s $(CFLAGS) -o winws $(SRC_FILES) $(LDFLAGS) $(LIBS_CYGWIN)
clean: clean:
rm -f nfqws dvtws *.o rm -f nfqws dvtws *.o

2
nfq/darkmagic.c
View File

@ -652,10 +652,8 @@ const char *proto_name(uint8_t proto)
return "6in4"; return "6in4";
case IPPROTO_IPIP: case IPPROTO_IPIP:
return "4in4"; return "4in4";
#ifdef IPPROTO_GRE
case IPPROTO_GRE: case IPPROTO_GRE:
return "gre"; return "gre";
#endif
#ifdef IPPROTO_SCTP #ifdef IPPROTO_SCTP
case IPPROTO_SCTP: case IPPROTO_SCTP:
return "sctp"; return "sctp";

1
nfq/hostlist.c
View File

@ -167,7 +167,6 @@ bool HostlistCheck(const char *host, bool *excluded)
exit(1); exit(1);
} }
params.hostlist_auto_mod_time = t; params.hostlist_auto_mod_time = t;
NonEmptyHostlist(&params.hostlist);
} }
} }
return HostlistCheck_(params.hostlist, params.hostlist_exclude, host, excluded); return HostlistCheck_(params.hostlist, params.hostlist_exclude, host, excluded);