meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added ssl support and address:port parsing logic

Browse source
This commit is contained in:
Ben Meadors 2023-08-10 10:46:30 -05:00
parent 367e45f382
commit 0810ab8a7c
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Meshtastic/Helpers/Mqtt/MqttClientProxyManager.swift
View file

@ -50,11 +50,16 @@ class MqttClientProxyManager {
func connectFromConfigSettings(node: NodeInfoEntity) {
let defaultServerAddress = "mqtt.meshtastic.org"
let defaultServerPort = 1883
let useSsl = node.mqttConfig?.tlsEnabled == true
var defaultServerPort = useSsl ? 8883 : 1883
var host = node.mqttConfig?.address
if host == nil || host!.isEmpty {
host = defaultServerAddress
}
else if host != nil && host!.contains(":") {
host = host!.components(separatedBy: ":")[0]
defaultServerPort = Int(host!.components(separatedBy: ":")[1])!
}
if let host = host {
let port = defaultServerPort
@ -65,11 +70,11 @@ class MqttClientProxyManager {
let prefix = root! + "/2/c"
topic = prefix + "/#"
let qos = CocoaMQTTQoS(rawValue :UInt8(1))!
connect(host: host, port: port, username: username, password: password, topic: topic, qos: qos, cleanSession: true)
connect(host: host, port: port, useSsl: useSsl, username: username, password: password, topic: topic, qos: qos, cleanSession: true)
}
}
func connect(host: String, port: Int, username: String?, password: String?, topic: String?, qos: CocoaMQTTQoS, cleanSession: Bool) {
func connect(host: String, port: Int, useSsl: Bool, username: String?, password: String?, topic: String?, qos: CocoaMQTTQoS, cleanSession: Bool) {
guard !host.isEmpty else {
delegate?.onMqttDisconnected()
@ -83,6 +88,8 @@ class MqttClientProxyManager {
mqttClientProxy = CocoaMQTT(clientID: clientId, host: host, port: UInt16(port))
if let mqttClient = mqttClientProxy {
mqttClient.enableSSL = useSsl
mqttClient.allowUntrustCACertificate = true
mqttClient.username = username
mqttClient.password = password
mqttClient.keepAlive = 60