Skip to content

Use String.cString for non-const char * conversions #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scareything merged 1 commit into from
Apr 4, 2025
Merged

Use String.cString for non-const char * conversions #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 10 additions & 41 deletions lib/Ziti.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,36 +412,17 @@ import CZitiPrivate
let refresh_interval = 90
#endif

// convert key and id info to char * types that ziti-sdk-c can use.
// also considered .withCString - https://stackoverflow.com/questions/31378120/convert-swift-string-into-cchar-pointer
let ctrlPtr = UnsafeMutablePointer<Int8>.allocate(capacity: id.ztAPI.count + 1)
ctrlPtr.initialize(from: id.ztAPI, count: id.ztAPI.count + 1)

let certPEMPtr = UnsafeMutablePointer<Int8>.allocate(capacity: certPEM.count + 1)
certPEMPtr.initialize(from: certPEM, count: certPEM.count + 1)

let privKeyPEMPtr = UnsafeMutablePointer<Int8>.allocate(capacity: privKeyPEM.count + 1)
privKeyPEMPtr.initialize(from: privKeyPEM, count: privKeyPEM.count + 1)

var caPEMPtr:UnsafeMutablePointer<Int8>? = nil // todo empty string
if (id.ca != nil) {
caPEMPtr = UnsafeMutablePointer<Int8>.allocate(capacity: id.ca!.count + 1)
caPEMPtr!.initialize(from: id.ca!, count: id.ca!.count + 1)
}

// set up the ziti_config with our cert, etc.
var ctrls:model_list = model_list()
id.ztAPIs?.forEach { c in
let ctrlPtr = UnsafeMutablePointer<Int8>.allocate(capacity: c.count + 1)
ctrlPtr.initialize(from: c, count: c.count + 1)
model_list_append(&ctrls, ctrlPtr)
model_list_append(&ctrls, c.cstring)
}

var zitiCfg = ziti_config(
controller_url: ctrlPtr,
controller_url: id.ztAPI.cstring,
controllers: ctrls,
id: ziti_id_cfg(cert: certPEMPtr, key: privKeyPEMPtr, ca: caPEMPtr, oidc: nil),
cfg_source: nil) // todo what is cfg_source?
id: ziti_id_cfg(cert: certPEM.cstring, key: privKeyPEM.cstring, ca: id.ca?.cstring, oidc: nil),
cfg_source: nil)

var zitiStatus = ziti_context_init(&self.ztx, &zitiCfg)
guard zitiStatus == Ziti.ZITI_OK else {
Expand All @@ -450,24 +431,6 @@ import CZitiPrivate
initCallback(ZitiError(errStr, errorCode: Int(zitiStatus)))
return
}

ctrlPtr.deallocate()
certPEMPtr.deallocate()
privKeyPEMPtr.deallocate()
if (caPEMPtr != nil) {
caPEMPtr!.deallocate()
}

withUnsafeMutablePointer(to: &ctrls) { ctrlListPtr in
var i = model_list_iterator(ctrlListPtr)
while i != nil {
let ctrlPtr = model_list_it_element(i)
if let ctrl = UnsafeMutablePointer<CChar>(OpaquePointer(ctrlPtr)) {
ctrl.deallocate()
}
i = model_list_it_next(i)
}
}

ziti_log_init_wrapper(loop)

Expand Down Expand Up @@ -1160,3 +1123,9 @@ func scan<
}
return result
}

extension String {
var cstring: UnsafePointer<CChar> {
(self as NSString).cString(using: String.Encoding.utf8.rawValue)!
}
}
Loading