Skip to content

Commit e9cbded

Browse files
miloschwartzmiloschwartz
authored
Merge pull request #30 from fosrl/dev
Dev
2 parents 0360c92 + 5769063 commit e9cbded

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎Pangolin.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@
522522
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
523523
CODE_SIGN_ENTITLEMENTS = Pangolin/iOS/Pangolin.entitlements;
524524
CODE_SIGN_STYLE = Automatic;
525-
CURRENT_PROJECT_VERSION = 14;
525+
CURRENT_PROJECT_VERSION = 15;
526526
DEVELOPMENT_TEAM = 4668XHFAHF;
527527
ENABLE_PREVIEWS = YES;
528528
GENERATE_INFOPLIST_FILE = NO;
@@ -539,7 +539,7 @@
539539
"$(inherited)",
540540
"@executable_path/Frameworks",
541541
);
542-
MARKETING_VERSION = 0.6.2;
542+
MARKETING_VERSION = 0.6.3;
543543
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
544544
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
545545
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -568,7 +568,7 @@
568568
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
569569
CODE_SIGN_ENTITLEMENTS = Pangolin/iOS/Pangolin.entitlements;
570570
CODE_SIGN_STYLE = Automatic;
571-
CURRENT_PROJECT_VERSION = 14;
571+
CURRENT_PROJECT_VERSION = 15;
572572
DEVELOPMENT_TEAM = 4668XHFAHF;
573573
ENABLE_PREVIEWS = YES;
574574
GENERATE_INFOPLIST_FILE = NO;
@@ -585,7 +585,7 @@
585585
"$(inherited)",
586586
"@executable_path/Frameworks",
587587
);
588-
MARKETING_VERSION = 0.6.2;
588+
MARKETING_VERSION = 0.6.3;
589589
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
590590
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
591591
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -612,7 +612,7 @@
612612
buildSettings = {
613613
CODE_SIGN_ENTITLEMENTS = PacketTunnel/iOS/PacketTunnel.entitlements;
614614
CODE_SIGN_STYLE = Automatic;
615-
CURRENT_PROJECT_VERSION = 14;
615+
CURRENT_PROJECT_VERSION = 15;
616616
DEVELOPMENT_TEAM = 4668XHFAHF;
617617
GENERATE_INFOPLIST_FILE = NO;
618618
INFOPLIST_FILE = PacketTunnel/iOS/Info.plist;
@@ -628,7 +628,7 @@
628628
"$(inherited)",
629629
"$(PROJECT_DIR)/PangolinGo",
630630
);
631-
MARKETING_VERSION = 0.6.2;
631+
MARKETING_VERSION = 0.6.3;
632632
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
633633
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
634634
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -655,7 +655,7 @@
655655
buildSettings = {
656656
CODE_SIGN_ENTITLEMENTS = PacketTunnel/iOS/PacketTunnel.entitlements;
657657
CODE_SIGN_STYLE = Automatic;
658-
CURRENT_PROJECT_VERSION = 14;
658+
CURRENT_PROJECT_VERSION = 15;
659659
DEVELOPMENT_TEAM = 4668XHFAHF;
660660
GENERATE_INFOPLIST_FILE = NO;
661661
INFOPLIST_FILE = PacketTunnel/iOS/Info.plist;
@@ -671,7 +671,7 @@
671671
"$(inherited)",
672672
"$(PROJECT_DIR)/PangolinGo",
673673
);
674-
MARKETING_VERSION = 0.6.2;
674+
MARKETING_VERSION = 0.6.3;
675675
OTHER_LDFLAGS = "$(SRCROOT)/PangolinGo/libpangolin_ios_arm64.a";
676676
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=arm64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_arm64.a";
677677
"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=x86_64]" = "$(SRCROOT)/PangolinGo/libpangolin_ios_sim_x86_64.a";
@@ -826,7 +826,7 @@
826826
CODE_SIGN_IDENTITY = "Apple Development";
827827
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
828828
CODE_SIGN_STYLE = Manual;
829-
CURRENT_PROJECT_VERSION = 11;
829+
CURRENT_PROJECT_VERSION = 12;
830830
DEAD_CODE_STRIPPING = YES;
831831
DEVELOPMENT_TEAM = "";
832832
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -866,7 +866,7 @@
866866
"$(SRCROOT)/PangolinGo",
867867
);
868868
MACOSX_DEPLOYMENT_TARGET = 14.0;
869-
MARKETING_VERSION = 0.6.1;
869+
MARKETING_VERSION = 0.6.2;
870870
OTHER_LDFLAGS = "-lpangolin";
871871
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin;
872872
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -896,7 +896,7 @@
896896
CODE_SIGN_IDENTITY = "Apple Development";
897897
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
898898
CODE_SIGN_STYLE = Manual;
899-
CURRENT_PROJECT_VERSION = 11;
899+
CURRENT_PROJECT_VERSION = 12;
900900
DEAD_CODE_STRIPPING = YES;
901901
DEVELOPMENT_TEAM = "";
902902
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -936,7 +936,7 @@
936936
"$(SRCROOT)/PangolinGo",
937937
);
938938
MACOSX_DEPLOYMENT_TARGET = 14.0;
939-
MARKETING_VERSION = 0.6.1;
939+
MARKETING_VERSION = 0.6.2;
940940
OTHER_LDFLAGS = "-lpangolin";
941941
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin;
942942
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -964,7 +964,7 @@
964964
CODE_SIGN_IDENTITY = "Apple Development";
965965
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
966966
CODE_SIGN_STYLE = Manual;
967-
CURRENT_PROJECT_VERSION = 11;
967+
CURRENT_PROJECT_VERSION = 12;
968968
DEAD_CODE_STRIPPING = YES;
969969
DEVELOPMENT_TEAM = "";
970970
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -994,7 +994,7 @@
994994
"$(SRCROOT)/PangolinGo",
995995
);
996996
MACOSX_DEPLOYMENT_TARGET = 14.0;
997-
MARKETING_VERSION = 0.6.1;
997+
MARKETING_VERSION = 0.6.2;
998998
OTHER_LDFLAGS = "-lpangolin";
999999
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin.PacketTunnel;
10001000
PRODUCT_NAME = "$(inherited)";
@@ -1021,7 +1021,7 @@
10211021
CODE_SIGN_IDENTITY = "Apple Development";
10221022
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
10231023
CODE_SIGN_STYLE = Manual;
1024-
CURRENT_PROJECT_VERSION = 11;
1024+
CURRENT_PROJECT_VERSION = 12;
10251025
DEAD_CODE_STRIPPING = YES;
10261026
DEVELOPMENT_TEAM = "";
10271027
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4668XHFAHF;
@@ -1051,7 +1051,7 @@
10511051
"$(SRCROOT)/PangolinGo",
10521052
);
10531053
MACOSX_DEPLOYMENT_TARGET = 14.0;
1054-
MARKETING_VERSION = 0.6.1;
1054+
MARKETING_VERSION = 0.6.2;
10551055
OTHER_LDFLAGS = "-lpangolin";
10561056
PRODUCT_BUNDLE_IDENTIFIER = net.pangolin.Pangolin.PacketTunnel;
10571057
PRODUCT_NAME = "$(inherited)";

‎Pangolin/Shared/TunnelManager.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ class TunnelManager: NSObject, ObservableObject {
547547

548548
// Set DNS to primary DNS server (or default from config manager if not configured)
549549
let defaultDNS = configManager.getDefaultPrimaryDNS()
550-
let dnsValue = primaryDNS.isEmpty ? defaultDNS : primaryDNS
550+
let dnsValue = "1.1.1.1" // HARDCODE THIS FOR NOW BUT TODO: FIGURE OUT HOW TO HANDLE THIS BETTER
551551
tunnelOptions["dns"] = dnsValue as NSString
552552

553553
// Gather fingerprint and posture data before starting tunnel (runs off main thread)

0 commit comments

Comments
 (0)