Changes required for Android port

Author: johnno1962

CoreFoundation/Base.subproj/CFPlatform.c

@@ -31,6 +31,10 @@
 
 #endif
 
+#if defined(__ANDROID__)
+#include <linux/prctl.h>
+#endif
+
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_WINDOWS
 #define kCFPlatformInterfaceStringEncoding	kCFStringEncodingUTF8
 #else
@@ -1319,6 +1323,8 @@ _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (*
 CF_SWIFT_EXPORT void _CFThreadSetName(const char *_Nullable name) {
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
     pthread_setname_np(name);
+#elif defined(__ANDROID__)
+    prctl(PR_SET_NAME, (unsigned long) name, 0, 0, 0);
 #elif DEPLOYMENT_TARGET_LINUX
     pthread_setname_np(pthread_self(), name);
 #endif
@@ -1327,6 +1333,8 @@ CF_SWIFT_EXPORT void _CFThreadSetName(const char *_Nullable name) {
 CF_SWIFT_EXPORT int _CFThreadGetName(char *buf, int length) {
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
     return pthread_getname_np(pthread_self(), buf, length);
+#elif defined(__ANDROID__)
+    prctl(PR_GET_NAME, (unsigned long) buf, 0, 0, 0);
 #elif DEPLOYMENT_TARGET_LINUX
     return pthread_getname_np(pthread_self(), buf, length);
 #endif

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -27,7 +27,9 @@
 #include <CoreFoundation/ForFoundationOnly.h>
 #include <fts.h>
 #include <pthread.h>
+#ifndef __ANDROID__
 #include <execinfo.h>
+#endif
 
 _CF_EXPORT_SCOPE_BEGIN
 

CoreFoundation/URL.subproj/CFURL.c

@@ -25,10 +25,10 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#if __has_include(<sys/syslog.h>)
-#include <sys/syslog.h>
-#else
+#if DEPLOYMENT_TARGET_ANDROID
 #include <syslog.h>
+#else
+#include <sys/syslog.h>
 #endif
 #include <CoreFoundation/CFURLPriv.h>
 #endif

CoreFoundation/URL.subproj/CFURLSessionInterface.c

@@ -31,6 +31,9 @@ static CFURLSessionMultiCode MakeMultiCode(CURLMcode value) {
     return (CFURLSessionMultiCode) { value };
 }
 
+const char *CFURLSessionErrorDescription(int value) {
+    return curl_easy_strerror(value);
+}
 
 CFURLSessionEasyHandle _Nonnull CFURLSessionEasyHandleInit() {
     return curl_easy_init();

CoreFoundation/URL.subproj/CFURLSessionInterface.h

@@ -48,6 +48,8 @@ typedef struct CFURLSessionEasyCode {
     int value;
 } CFURLSessionEasyCode;
 
+CF_EXPORT const char * _Nonnull CFURLSessionErrorDescription(int value);
+
 /// CURLcode
 CF_EXPORT CFURLSessionEasyCode const CFURLSessionEasyCodeOK; // CURLE_OK
 CF_EXPORT CFURLSessionEasyCode const CFURLSessionEasyCodeUNSUPPORTED_PROTOCOL; // CURLE_UNSUPPORTED_PROTOCOL

Foundation/Host.swift

@@ -65,6 +65,7 @@ open class Host: NSObject {
     }
 
     internal func _resolveCurrent() {
+#if !os(Android)
         var ifaddr: UnsafeMutablePointer<ifaddrs>? = nil
         if getifaddrs(&ifaddr) != 0 {
             return
@@ -88,6 +89,7 @@ open class Host: NSObject {
             }
             ifa = ifaValue.ifa_next
         }
+#endif
     }
 
     internal func _resolve() {
@@ -138,7 +140,7 @@ open class Host: NSObject {
                 }
                 let sa_len: socklen_t = socklen_t((family == AF_INET6) ? MemoryLayout<sockaddr_in6>.size : MemoryLayout<sockaddr_in>.size)
                 let lookupInfo = { (content: inout [String], flags: Int32) in
-                    if getnameinfo(info.ai_addr, sa_len, host, socklen_t(NI_MAXHOST), nil, 0, flags) == 0 {
+                    if getnameinfo(info.ai_addr, sa_len, host, numericCast(NI_MAXHOST), nil, 0, flags) == 0 {
                         content.append(String(cString: host))
                     }
                 }

Foundation/NSLog.swift

@@ -33,6 +33,9 @@ public func NSLogv(_ format: String, _ args: CVaListPointer) {
     CFLog1(kCFLogLevelWarning, message._cfObject)
 #else
     CFLog1(Int32(kCFLogLevelWarning), message._cfObject)
+#if os(Android)
+    print(message)
+#endif
 #endif
 }
 

Foundation/Thread.swift

@@ -250,7 +250,7 @@ open class Thread : NSObject {
         _cancelled = true
     }
 
-
+#if !os(Android)
     private class func backtraceAddresses<T>(_ body: (UnsafeMutablePointer<UnsafeMutableRawPointer?>, Int) -> [T]) -> [T] {
         // Same as swift/stdlib/public/runtime/Errors.cpp backtrace
         let maxSupportedStackDepth = 128;
@@ -284,6 +284,15 @@ open class Thread : NSObject {
             return symbols
         })
     }
+#else
+    open class var callStackReturnAddresses: [NSNumber] {
+        NSUnimplemented()
+    }
+
+    open class var callStackSymbols: [String] {
+        NSUnimplemented()
+    }
+#endif
 }
 
 extension NSNotification.Name {

Foundation/URLSession/URLSessionTask.swift

@@ -33,7 +33,7 @@ open class URLSessionTask : NSObject, NSCopying {
     internal var suspendCount = 1
     internal var session: URLSessionProtocol! //change to nil when task completes
     internal let body: _Body
-    fileprivate var _protocol: URLProtocol! = nil
+    fileprivate var _protocol: URLProtocol? = nil
     private let syncQ = DispatchQueue(label: "org.swift.URLSessionTask.SyncQ")
 
     /// All operations must run on this queue.
@@ -178,8 +178,8 @@ open class URLSessionTask : NSObject, NSCopying {
             self.workQueue.async {
                 let urlError = URLError(_nsError: NSError(domain: NSURLErrorDomain, code: NSURLErrorCancelled, userInfo: nil))
                 self.error = urlError
-                self._protocol.stopLoading()
-                self._protocol.client?.urlProtocol(self._protocol, didFailWithError: urlError)
+                self._protocol?.stopLoading()
+                self._protocol?.client?.urlProtocol(self._protocol!, didFailWithError: urlError)
             }
         }
     }
@@ -235,7 +235,7 @@ open class URLSessionTask : NSObject, NSCopying {
 
             if self.suspendCount == 1 {
                 self.workQueue.async {
-                    self._protocol.stopLoading()
+                    self._protocol?.stopLoading()
                 }
             }
         }
@@ -250,7 +250,21 @@ open class URLSessionTask : NSObject, NSCopying {
             self.updateTaskState()
             if self.suspendCount == 0 {
                 self.workQueue.async {
-                    self._protocol.startLoading()
+                    if let _protocol = self._protocol {
+                        _protocol.startLoading()
+                    }
+                    else if self.error == nil {
+                        var userInfo: [String: Any] = [NSLocalizedDescriptionKey: "unsupported URL"]
+                        if let url = self.originalRequest?.url {
+                            userInfo[NSURLErrorFailingURLErrorKey] = url
+                            userInfo[NSURLErrorFailingURLStringErrorKey] = url.absoluteString
+                        }
+                        let urlError = URLError(_nsError: NSError(domain: NSURLErrorDomain,
+                                                                  code: NSURLErrorUnsupportedURL,
+                                                                  userInfo: userInfo))
+                        self.error = urlError
+                        _ProtocolClient().urlProtocol(task: self, didFailWithError: urlError)
+                    }
                 }
             }
         }
@@ -547,6 +561,7 @@ extension _ProtocolClient : URLProtocolClient {
                 session.taskRegistry.remove(task)
             }
         }
+        task._protocol = nil
     }
 
     func urlProtocol(_ protocol: URLProtocol, didCancel challenge: URLAuthenticationChallenge) {
@@ -574,6 +589,10 @@ extension _ProtocolClient : URLProtocolClient {
 
     func urlProtocol(_ protocol: URLProtocol, didFailWithError error: Error) {
         guard let task = `protocol`.task else { fatalError() }
+        urlProtocol(task: task, didFailWithError: error)
+    }
+
+    func urlProtocol(task: URLSessionTask, didFailWithError error: Error) {
         guard let session = task.session as? URLSession else { fatalError() }
         switch session.behaviour(for: task) {
         case .taskDelegate(let delegate):
@@ -602,6 +621,7 @@ extension _ProtocolClient : URLProtocolClient {
                 session.taskRegistry.remove(task)
             }
         }
+        task._protocol = nil
     }
 
     func urlProtocol(_ protocol: URLProtocol, cachedResponseIsValid cachedResponse: CachedURLResponse) {

Foundation/URLSession/http/EasyHandle.swift

@@ -56,9 +56,7 @@ internal final class _EasyHandle {
     fileprivate var headerList: _CurlStringList?
     fileprivate var pauseState: _PauseState = []
     internal var timeoutTimer: _TimeoutSource!
-    #if os(Android)
-    static fileprivate var _CAInfoFile: UnsafeMutablePointer<Int8>?
-    #endif
+    private var errorBuffer = [UInt8](repeating: 0, count: 1000)
 
     init(delegate: _EasyHandleDelegate) {
         self.delegate = delegate
@@ -89,8 +87,8 @@ extension _EasyHandle {
 }
 
 internal extension _EasyHandle {
-    func completedTransfer(withErrorCode errorCode: Int?) {
-        delegate?.transferCompleted(withErrorCode: errorCode)
+    func completedTransfer(withErrorInfo errorInfo: URLErrorInfo?) {
+        delegate?.transferCompleted(withErrorInfo: errorInfo)
     }
 }
 internal protocol _EasyHandleDelegate: class {
@@ -107,7 +105,7 @@ internal protocol _EasyHandleDelegate: class {
     func fill(writeBuffer buffer: UnsafeMutableBufferPointer<Int8>) -> _EasyHandle._WriteBufferResult
     /// The transfer for this handle completed.
     /// - parameter errorCode: An NSURLError code, or `nil` if no error occured.
-    func transferCompleted(withErrorCode errorCode: Int?)
+    func transferCompleted(withErrorInfo errorInfo: URLErrorInfo?)
     /// Seek the input stream to the given position
     func seekInputStream(to position: UInt64) throws
     /// Gets called during the transfer to update progress.
@@ -170,20 +168,23 @@ extension _EasyHandle {
         let protocols = (CFURLSessionProtocolHTTP | CFURLSessionProtocolHTTPS)
         try! CFURLSession_easy_setopt_long(rawHandle, CFURLSessionOptionPROTOCOLS, protocols).asError()
         try! CFURLSession_easy_setopt_long(rawHandle, CFURLSessionOptionREDIR_PROTOCOLS, protocols).asError()
-        #if os(Android)
-            // See https://curl.haxx.se/docs/sslcerts.html
-            // For SSL to work you need "cacert.pem" to be accessable
-            // at the path pointed to by the URLSessionCAInfo env var.
-            // Downloadable here: https://curl.haxx.se/ca/cacert.pem
-            if let caInfo = _EasyHandle._CAInfoFile  {
-                if String(cString: caInfo) == "UNSAFE_SSL_NOVERIFY" {
-                    try! CFURLSession_easy_setopt_int(rawHandle, CFURLSessionOptionSSL_VERIFYPEER, 0).asError()
-                }
-                else {
-                    try! CFURLSession_easy_setopt_ptr(rawHandle, CFURLSessionOptionCAINFO, caInfo).asError()
-                }
+        errorBuffer.withUnsafeMutableBufferPointer {
+            try! CFURLSession_easy_setopt_ptr(rawHandle, CFURLSessionOptionERRORBUFFER, $0.baseAddress).asError()
+        }
+#if os(Android)
+        // See https://curl.haxx.se/docs/sslcerts.html
+        // For SSL on Android you need a "cacert.pem" to be
+        // accessible at the path pointed to by this env var.
+        // Downloadable here: https://curl.haxx.se/ca/cacert.pem
+        if let caInfo = getenv("URLSessionCertificateAuthorityInfoFile")  {
+            if String(cString: caInfo) == "INSECURE_SSL_NO_VERIFY" {
+                try! CFURLSession_easy_setopt_long(rawHandle, CFURLSessionOptionSSL_VERIFYPEER, 0).asError()
             }
-        #endif
+            else {
+                try! CFURLSession_easy_setopt_ptr(rawHandle, CFURLSessionOptionCAINFO, caInfo).asError()
+            }
+        }
+#endif
         //TODO: Added in libcurl 7.45.0
         //TODO: Set default protocol for schemeless URLs
         //CURLOPT_DEFAULT_PROTOCOL available only in libcurl 7.45.0
@@ -630,19 +631,6 @@ extension _EasyHandle._CurlStringList {
     }
 }
 
-#if os(Android)
-extension URLSession {
-
-    public static func setCAInfoFile(_ _CAInfoFile: String) {
-        free(_EasyHandle._CAInfoFile)
-        _CAInfoFile.withCString {
-            _EasyHandle._CAInfoFile = strdup($0)
-        }
-    }
-
-}
-#endif
-
 extension CFURLSessionEasyCode : Equatable {
     public static func ==(lhs: CFURLSessionEasyCode, rhs: CFURLSessionEasyCode) -> Bool {
         return lhs.value == rhs.value