gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Can get Central JSON bundle back to zerotier-one window

Browse Source
This commit is contained in:
Grant Limberg
2021-12-16 11:37:58 -08:00
parent 1375e3e2f5
commit 2293b0703f
5 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zeroidc/src/ext.rs
View File

@@ -166,15 +166,15 @@ pub extern "C" fn zeroidc_get_auth_url(ptr: *mut ZeroIDC) -> *const c_char {
}
#[no_mangle]
pub extern "C" fn zeroidc_token_exchange(idc: *mut ZeroIDC, code: *const c_char ) {
pub extern "C" fn zeroidc_token_exchange(idc: *mut ZeroIDC, code: *const c_char ) -> *const c_char {
if idc.is_null() {
println!("idc is null");
return
return std::ptr::null();
}
if code.is_null() {
println!("code is null");
return
return std::ptr::null();
}
let idc = unsafe {
&mut *idc
@@ -182,7 +182,9 @@ pub extern "C" fn zeroidc_token_exchange(idc: *mut ZeroIDC, code: *const c_char
let code = unsafe{CStr::from_ptr(code)}.to_str().unwrap();
idc.do_token_exchange( code);
let ret = idc.do_token_exchange( code);
let ret = CString::new(ret).unwrap();
return ret.into_raw();
}
#[no_mangle]