smeb_y/gfwlist
1
0
Fork 0
mirror of https://github.com/gfwlist/gfwlist.git synced 2024-12-24 23:55:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Y2hlY2tSdWxlcy5weTogc2ltcGxpZnkgdGhlIG91dHB1dAo=

Browse Source
This commit is contained in:
lovelywcm 2010-12-17 05:42:25 +00:00
parent 4fa1ef197b
commit 7a180f8482
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkRules.py
View File

@ -61,7 +61,6 @@ def main():
startfrom = 0 startfrom = 0
for rule in fin: for rule in fin:
line += 1 line += 1
print line, ':\t', rule,
rule = rule.strip() rule = rule.strip()
if line < startfrom: continue if line < startfrom: continue
if not rule: continue if not rule: continue
@ -70,14 +69,13 @@ def main():
if rule.startswith('@@'): continue if rule.startswith('@@'): continue
if rule.startswith('/') and rule.endswith('/'): continue if rule.startswith('/') and rule.endswith('/'): continue
(test, t) = getUrl(rule) (test, t) = getUrl(rule)
print '=>', test,
curl = subprocess.call(['/usr/bin/curl', '-4', '-I', '-m', '5', test], stdout=subprocess.PIPE, stderr=subprocess.PIPE) curl = subprocess.call(['/usr/bin/curl', '-4', '-I', '-m', '5', test], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if (t==IP and curl==28) or (t==TLS and curl==35) or (t==URL and curl==56): if (t==IP and curl==28) or (t==TLS and curl==35) or (t==URL and curl==56):
print '=>', curl pass
elif t==IP and curl==56: elif t==IP and curl==56:
print '=>', '\033[31mexpecting %d, got %d\033[0m' % (expect[t], curl) print line, '\t', test, '=>', '\033[31mexpecting %d, got %d\033[0m' % (expect[t], curl)
else: else:
print '=>', '\033[1;31mexpecting %d, got %d\033[0m' % (expect[t], curl) print line, '\t', test, '=>', '\033[1;31mexpecting %d, got %d\033[0m' % (expect[t], curl)
ferr.write(str(line) + ': "' + rule + '", expecting %d, got %d' % (expect[t], curl) + '\n') ferr.write(str(line) + ': "' + rule + '", expecting %d, got %d' % (expect[t], curl) + '\n')

4
sendGFWList.sh
View File

@ -80,7 +80,7 @@ if [ "$convertedLog" != "" ]; then
echo "But wait...!" echo "But wait...!"
echo "This would overwrite all commits till your last update!!!"; echo "This would overwrite all commits till your last update!!!";
echo -e "\nIf you are confused, wait somebody else to fix it."; echo -e "\nIf you are confused, wait somebody else to fix it.";
echo "Please always report this to our maintainers group!"; echo "Please always report this to our maintainers' group!";
echo -e "\n*********************************************************\n\n\n"; echo -e "\n*********************************************************\n\n\n";
exit 1; exit 1;
fi fi
@ -91,7 +91,7 @@ if [ "$convertedLog" != "" ]; then
rm temp.patch; rm temp.patch;
if [ -s temp.patch ]; then if [ -s temp.patch ]; then
echo "Error: git apply failed, your work saved at temp.patch"; echo -e "\n\033[31mError:\033[0m git apply failed, your work saved at temp.patch\n";
exit 1; exit 1;
elif [ -a temp.patch ]; then elif [ -a temp.patch ]; then
# empty, remove it # empty, remove it