dynamically enable CFNetwork implementation

build-mac/libetpan.xcodeproj/project.pbxproj

@@ -2838,7 +2838,10 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-DHAVE_CONFIG_H=1";
+				OTHER_CFLAGS = (
+					"-DHAVE_CFNETWORK=1",
+					"-DHAVE_CONFIG_H=1",
+				);
 				PREBINDING = NO;
 			};
 			name = Debug;
@@ -2851,7 +2854,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/include";
-				OTHER_CFLAGS = "-DHAVE_CONFIG_H=1";
+				OTHER_CFLAGS = (
+					"-DHAVE_CFNETWORK=1",
+					"-DHAVE_CONFIG_H=1",
+				);
 				PREBINDING = NO;
 			};
 			name = Release;

src/data-types/mailstream_cfstream.c

@@ -43,6 +43,8 @@
 
 #include <pthread.h>
 
+int mailstream_cfstream_enabled = 0;
+
 enum {
   STATE_NONE,
   STATE_WAIT_OPEN,

src/data-types/mailstream_cfstream.h

@@ -39,6 +39,8 @@
 extern "C" {
 #endif
   
+  extern int mailstream_cfstream_enabled;
+  
   enum {
     MAILSTREAM_CFSTREAM_SSL_ALLOWS_EXPIRED_CERTIFICATES = 1 << 0,
     MAILSTREAM_CFSTREAM_SSL_ALLOWS_EXPIRED_ROOTS = 1 << 1,

src/low-level/imap/mailimap_socket.c

@@ -66,7 +66,9 @@ int mailimap_socket_connect(mailimap * f, const char * server, uint16_t port)
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  return mailimap_cfsocket_connect(f, server, port);
+  if (mailstream_cfstream_enabled) {
+    return mailimap_cfsocket_connect(f, server, port);
+  }
 #endif
   
   if (port == 0) {

src/low-level/imap/mailimap_ssl.c

@@ -66,8 +66,10 @@ int mailimap_ssl_connect_with_callback(mailimap * f, const char * server, uint16
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  if (callback == NULL) {
-    return mailimap_cfssl_connect(f, server, port);
+  if (mailstream_cfstream_enabled) {
+    if (callback == NULL) {
+      return mailimap_cfssl_connect(f, server, port);
+    }
   }
 #endif
   

src/low-level/nntp/newsnntp_socket.c

@@ -63,7 +63,9 @@ int newsnntp_socket_connect(newsnntp * f, const char * server, uint16_t port)
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  return newsnntp_cfsocket_connect(f, server, port);
+  if (mailstream_cfstream_enabled) {
+    return newsnntp_cfsocket_connect(f, server, port);
+  }
 #endif
   
   if (port == 0) {

src/low-level/nntp/newsnntp_ssl.c

@@ -69,8 +69,10 @@ int newsnntp_ssl_connect_with_callback(newsnntp * f, const char * server, uint16
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  if (callback == NULL) {
-    return newsnntp_cfssl_connect(f, server, port);
+  if (mailstream_cfstream_enabled) {
+    if (callback == NULL) {
+      return newsnntp_cfssl_connect(f, server, port);
+    }
   }
 #endif
   

src/low-level/pop3/mailpop3_socket.c

@@ -63,7 +63,9 @@ int mailpop3_socket_connect(mailpop3 * f, const char * server, uint16_t port)
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  return mailpop3_cfsocket_connect(f, server, port);
+  if (mailstream_cfstream_enabled) {
+    return mailpop3_cfsocket_connect(f, server, port);
+  }
 #endif
   
   if (port == 0) {

src/low-level/pop3/mailpop3_ssl.c

@@ -70,8 +70,10 @@ int mailpop3_ssl_connect_with_callback(mailpop3 * f, const char * server, uint16
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  if (callback == NULL) {
-    return (mailpop3_cfssl_connect, server, port);
+  if (mailstream_cfstream_enabled) {
+    if (callback == NULL) {
+      return (mailpop3_cfssl_connect, server, port);
+    }
   }
 #endif
   

src/low-level/smtp/mailsmtp_socket.c

@@ -66,7 +66,9 @@ int mailsmtp_socket_connect(mailsmtp * session,
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  return mailsmtp_cfsocket_connect(session, server, port);
+  if (mailstream_cfstream_enabled) {
+    return mailsmtp_cfsocket_connect(session, server, port);
+  }
 #endif
   
   if (port == 0) {

src/low-level/smtp/mailsmtp_ssl.c

@@ -74,8 +74,10 @@ int mailsmtp_ssl_connect_with_callback(mailsmtp * session,
   mailstream * stream;
 
 #if HAVE_CFNETWORK
-  if (callback == NULL) {
-    return mailsmtp_cfssl_connect(session, server, port);
+  if (mailstream_cfstream_enabled) {
+    if (callback == NULL) {
+      return mailsmtp_cfssl_connect(session, server, port);
+    }
   }
 #endif