Skip to content

Commit

Permalink
Issue #95: Fixed webtunnel support.
Browse files Browse the repository at this point in the history
  • Loading branch information
tladesignz committed Oct 22, 2024
1 parent 2a5ae6a commit db0376a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
3 changes: 3 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ def iptproxy
'~> 4.6'
# :git => 'https://github.com/tladesignz/IPtProxyUI-ios'
# :path => '../IPtProxyUI'

# pod 'IPtProxy',
# :path => '../IPtProxy-cohosh'
end

target 'Orbot' do
Expand Down
6 changes: 3 additions & 3 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PODS:
- GCDWebServerExtension/Core (= 3.5.4)
- GCDWebServerExtension/Core (3.5.4)
- IPtProxy (3.8.1)
- IPtProxyUI/AppEx (4.6.1):
- IPtProxyUI/AppEx (4.6.2):
- Eureka (~> 5.3)
- IPtProxy (~> 3.8.1)
- ProgressHUD (13.8.6)
Expand Down Expand Up @@ -42,10 +42,10 @@ SPEC CHECKSUMS:
Eureka: 1c18c7fcd8f772cc2ca42d6be36292dffa77eecb
GCDWebServerExtension: dd9ca142fd4063d0ffc0944f716646be3c5689b1
IPtProxy: d7e37d1faa9b2608b8b5b2743b1a4ae3eb723c5e
IPtProxyUI: b30db38039f283bdb92ef39c9911ffe64f0f4067
IPtProxyUI: 20e0a6a51bc203f34a35f281a902e4e1ceded86a
ProgressHUD: ee8924300accca88bfa39f6350f757c1c869a69c
Tor: 19907fc430953434a233c7532166d6409b9d509b

PODFILE CHECKSUM: 0aa323e5e2ddce2807c4c6917b58225d9b7aa542
PODFILE CHECKSUM: 633be61b7f1256b2af79d39e1d3ff5537eb94836

COCOAPODS: 1.15.2
13 changes: 7 additions & 6 deletions Shared/TorManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,13 @@ class TorManager {
}

private func transportConf<T>(_ cv: (String, String) -> T) -> [T] {

var arguments = transport.torConf(cv)

if transport == .custom, let bridgeLines = Settings.customBridges {
arguments += bridgeLines.map({ cv("Bridge", $0) })
}
// Since IPtProxyUI.Settings use `UserDefaults.standard` as source, instead of
// `UserDefaults(suiteName: Config.groupId)` as Orbot does, `custom` and `onDemand`
// bridge lines cannot be resolved by `IPtProxyUI.Transport.torConv()`.
var arguments = transport.torConf(
cv,
onDemandBridges: Settings.onDemandBridges,
customBridges: Settings.customBridges)

arguments.append(cv("UseBridges", transport == .none ? "0" : "1"))

Expand Down

0 comments on commit db0376a

Please sign in to comment.