Skip to content
This repository has been archived by the owner on Jul 5, 2019. It is now read-only.

Add new protocol #65

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add new protocol #65

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a758ce
"auth_sha1_v4",
zhkufish Jan 9, 2018
4105849
change shadowsocks-libev submodule
zhkufish Jan 9, 2018
a3a23b2
Update submodule url.
zhkufish Jan 9, 2018
2779ff9
fix gitmodules url error
zhkufish Jan 10, 2018
cdb438b
fix some pod warning, add logglyLogger back
zhkufish Jan 10, 2018
2a2629f
Update AppInitializer.swift
zhkufish Jan 10, 2018
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "Library/ShadowPath/ShadowPath/shadowsocks-libev"]
path = Library/ShadowPath/ShadowPath/shadowsocks-libev
url = [email protected]:icodesign/shadowsocks-libev.git
url = Library/ShadowPath/ShadowPath/shadowsocks-libev.git
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something wrong here. It should be remote github url, not the local one.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I will fix it.

[submodule "Library/ShadowPath/ShadowPath/libmaxminddb"]
path = Library/ShadowPath/ShadowPath/libmaxminddb
url = [email protected]:haxpor/libmaxminddb.git
Expand Down
36 changes: 35 additions & 1 deletion Library/ShadowPath/ShadowPath.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
3EEE4F312004F567002551E3 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 3EEE4F2F2004F566002551E3 /* base64.c */; };
3EEE4F322004F567002551E3 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EEE4F302004F567002551E3 /* base64.h */; };
3EEE4F352004F582002551E3 /* rule.c in Sources */ = {isa = PBXBuildFile; fileRef = 3EEE4F332004F581002551E3 /* rule.c */; };
3EEE4F362004F582002551E3 /* rule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EEE4F342004F581002551E3 /* rule.h */; };
B81887591D2BFC1B00E41C89 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = B81887091D2BFC1B00E41C89 /* LICENSE */; };
B818875A1D2BFC1B00E41C89 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = B818870B1D2BFC1B00E41C89 /* aes.h */; };
B818875B1D2BFC1B00E41C89 /* asn1.h in Headers */ = {isa = PBXBuildFile; fileRef = B818870C1D2BFC1B00E41C89 /* asn1.h */; };
Expand Down Expand Up @@ -373,6 +377,10 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3EEE4F2F2004F566002551E3 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
3EEE4F302004F567002551E3 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = "<group>"; };
3EEE4F332004F581002551E3 /* rule.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rule.c; sourceTree = "<group>"; };
3EEE4F342004F581002551E3 /* rule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rule.h; sourceTree = "<group>"; };
B81887091D2BFC1B00E41C89 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
B818870B1D2BFC1B00E41C89 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
B818870C1D2BFC1B00E41C89 /* asn1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1284,6 +1292,8 @@
B86B04791D17DABB00613014 /* acl.h */,
B830CC661D2D69E300FA8E37 /* auth.c */,
B830CC671D2D69E300FA8E37 /* auth.h */,
3EEE4F2F2004F566002551E3 /* base64.c */,
3EEE4F302004F567002551E3 /* base64.h */,
B86B047B1D17DABB00613014 /* cache.c */,
B86B047C1D17DABB00613014 /* cache.h */,
B86B047D1D17DABB00613014 /* common.h */,
Expand All @@ -1306,6 +1316,8 @@
B830CC721D2D6A1700FA8E37 /* obfsutil.c */,
B86B048F1D17DABB00613014 /* resolv.c */,
B86B04901D17DABB00613014 /* resolv.h */,
3EEE4F332004F581002551E3 /* rule.c */,
3EEE4F342004F581002551E3 /* rule.h */,
B86B04931D17DABB00613014 /* shadowsocks.h */,
B86B04941D17DABB00613014 /* socks5.h */,
B830CC761D2D6A3400FA8E37 /* tls1.0_session.c */,
Expand Down Expand Up @@ -1521,6 +1533,7 @@
B818875A1D2BFC1B00E41C89 /* aes.h in Headers */,
B8DEFEFE1CEA1EB7003FC706 /* project.h in Headers */,
B81888921D2C09DA00E41C89 /* randombytes.h in Headers */,
3EEE4F362004F582002551E3 /* rule.h in Headers */,
B818887A1D2C09DA00E41C89 /* crypto_scalarmult.h in Headers */,
B818879E1D2BFC1B00E41C89 /* txt_db.h in Headers */,
B818875E1D2BFC1B00E41C89 /* bio.h in Headers */,
Expand Down Expand Up @@ -1599,6 +1612,7 @@
B81888881D2C09DA00E41C89 /* crypto_stream_salsa208.h in Headers */,
B81887911D2BFC1B00E41C89 /* safestack.h in Headers */,
B86B054E1D17DABB00613014 /* ev_wrap.h in Headers */,
3EEE4F322004F567002551E3 /* base64.h in Headers */,
B82D7D771CEC6BCE00357F5F /* expat.h in Headers */,
B86B084E1D17DABB00613014 /* json.h in Headers */,
B81887791D2BFC1B00E41C89 /* idea.h in Headers */,
Expand Down Expand Up @@ -1652,7 +1666,7 @@
B8DEFD721CE9C923003FC706 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0730;
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = TouchingApp;
TargetAttributes = {
B82847B31CEB14B000820456 = {
Expand Down Expand Up @@ -1726,6 +1740,7 @@
B8D0CD691CF1AF60007282A7 /* radix.c in Sources */,
B86B07E51D17DABB00613014 /* udns_misc.c in Sources */,
B82847801CEB10B800820456 /* actions.m in Sources */,
3EEE4F352004F582002551E3 /* rule.c in Sources */,
B82847841CEB10BF00820456 /* cgi.c in Sources */,
B82D7D7F1CEC6BCE00357F5F /* AntinatServer.m in Sources */,
B82847881CEB10C900820456 /* deanimate.c in Sources */,
Expand Down Expand Up @@ -1777,6 +1792,7 @@
B830CC6E1D2D6A0000FA8E37 /* http_simple.c in Sources */,
B82D7D7A1CEC6BCE00357F5F /* addrinfo.m in Sources */,
B830CC7A1D2D6A3400FA8E37 /* tls1.0_session.c in Sources */,
3EEE4F312004F567002551E3 /* base64.c in Sources */,
B86B07E01D17DABB00613014 /* udns_codes.c in Sources */,
B86B05371D17DABB00613014 /* process.c in Sources */,
B86B05881D17DABB00613014 /* allocation.c in Sources */,
Expand Down Expand Up @@ -1912,13 +1928,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -1960,13 +1984,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -1996,6 +2028,7 @@
B8DEFD841CE9C923003FC706 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down Expand Up @@ -2033,6 +2066,7 @@
B8DEFD851CE9C923003FC706 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down
2 changes: 1 addition & 1 deletion Library/ShadowPath/ShadowPath/Privoxy/radix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ typedef struct {
size_t size;
} radix_tree_t;

radix_tree_t *radix_tree_create();
radix_tree_t *radix_tree_create(void);

int radix32tree_insert(radix_tree_t *tree,
uint32_t key, uint32_t mask, char value);
Expand Down
2 changes: 1 addition & 1 deletion Library/ShadowPath/ShadowPath/shadowsocks-libev
Open in desktop
Submodule shadowsocks-libev updated from 6011d3 to 7d85c6
4 changes: 2 additions & 2 deletions PacketTunnel/PacketTunnel.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</array>
<key>com.apple.security.application-groups</key>
<array>
<string>group.io.wasin.potatso</string>
<string>group.com.aiyuangong.Aiyuangong</string>
</array>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)io.wasin.potatso</string>
<string>$(AppIdentifierPrefix)com.aiyuangong.Aiyuangong.tunnel</string>
</array>
</dict>
</plist>
26 changes: 13 additions & 13 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '9.0'
use_frameworks!

def fabric
pod 'Fabric'
pod 'Fabric' #crash日志收集
pod 'Crashlytics'
end

Expand All @@ -25,28 +25,28 @@ def socket
end

def model
pod 'RealmSwift', '~> 2.10.2'
pod 'RealmSwift'
end

target "Potatso" do
pod 'Aspects', :path => "./Library/Aspects/"
pod 'Cartography'
pod 'Aspects', :path => "./Library/Aspects/" #类方法的拦截
pod 'Cartography', :git => 'https://github.com/corujautx/Cartography.git' #自动布局约束
pod 'AsyncSwift'
pod 'SwiftColor'
pod 'Appirater'
pod 'Eureka', :path => "./Library/Eureka/"
pod 'Appirater' #提醒用户评论打分
pod 'Eureka', :path => "./Library/Eureka/" #talbeView 第三方库
pod 'MBProgressHUD'
pod 'CallbackURLKit', :path => "./Library/CallbackURLKit"
pod 'ICDMaterialActivityIndicatorView', '~> 0.1.0'
pod 'Reveal-iOS-SDK', '~> 1.6.2', :configurations => ['Debug']
pod 'Reveal-iOS-SDK', '~> 1.6.2', :configurations => ['Debug'] #界面调试工具
pod 'ICSPullToRefresh', '~> 0.6'
pod 'ISO8601DateFormatter', '~> 0.8'
pod 'Alamofire'
pod 'Alamofire' #requests工具
pod 'ObjectMapper'
pod 'CocoaLumberjack/Swift', '~> 3.0.0'
pod 'Helpshift', '5.6.1'
pod 'PSOperations', '~> 3.0.0'
pod 'LogglyLogger-CocoaLumberjack', '~> 3.0'
pod 'CocoaLumberjack/Swift', '~> 3.0.0' #抓取crash日志上传
# pod 'Helpshift', '5.6.1' #国外的客服系统
pod 'PSOperations', '~> 3.0.0' #线程管理工具
# pod 'LogglyLogger-CocoaLumberjack', '~> 3.0'
tunnel
library
fabric
Expand All @@ -64,7 +64,7 @@ target "PacketProcessor" do
end

target "TodayWidget" do
pod 'Cartography'
pod 'Cartography', :git => 'https://github.com/corujautx/Cartography.git'
pod 'SwiftColor'
library
socket
Expand Down
Loading