ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add guards against the obj-c code

This commit is contained in:
bossiel 2013-02-20 13:59:33 +00:00
parent 186abb0b92
commit 85afdb4f9c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
branches/2.0/doubango/tinyNET/src/tnet_transport_cfsocket.c
View File

@ -38,7 +38,10 @@
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 40000)
#import <CoreFoundation/CoreFoundation.h>
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#endif /* __OBJC__ */
#import <Security/Security.h>
#import <Security/SecureTransport.h>
#import <CFNetwork/CFNetwork.h>
@ -762,7 +765,7 @@ bail:
tsk_safeobj_unlock(context);
}
#import <Foundation/Foundation.h>
int wrapSocket(tnet_transport_t *transport, transport_socket_xt *sock)
{
@ -821,6 +824,7 @@ int wrapSocket(tnet_transport_t *transport, transport_socket_xt *sock)
CFDictionaryAddValue(settings, kCFStreamSSLPeerName, kCFNull);
#ifdef __OBJC__
// Set certificates (DER format)
if(!tsk_strnullORempty(transport->tls.ca)){
NSString *ca = [NSString stringWithCString:transport->tls.ca encoding: NSUTF8StringEncoding];
@ -841,6 +845,7 @@ int wrapSocket(tnet_transport_t *transport, transport_socket_xt *sock)
}
}
}
#endif /* __OBJC__ */
// Set the SSL settings
CFReadStreamSetProperty(sock->cf_read_stream, kCFStreamPropertySSLSettings, settings);