Commit 827802b2 authored by Stefan van den Oord's avatar Stefan van den Oord

Updated CocoaPods, switched to NetUtils 1.0, and ran `pod update`

parent 42d4aa4c
......@@ -10,7 +10,7 @@ pod 'lz4', '~> 128', :inhibit_warnings => true
pod 'Base32', '~> 1.0.2'
pod 'IGDigest', '~> 1.1.0'
pod 'OpenSSL-Framework', '~> 1.0.201'
pod 'NetUtils', '~> 0.3'
pod 'NetUtils', '~> 1.0'
target 'PulseTests' do
pod 'Quick', '~> 0.2'
......
......@@ -3,10 +3,10 @@ PODS:
- CocoaAsyncSocket (7.4.1)
- IGDigest (1.1.2)
- lz4 (128)
- NetUtils (0.4)
- NetUtils (1.0)
- Nimble (2.0.0-rc.1)
- OpenSSL-Framework (1.0.201)
- Quick (0.4.0)
- Quick (0.5.0)
- SwiftBytes (0.2.0)
DEPENDENCIES:
......@@ -14,7 +14,7 @@ DEPENDENCIES:
- CocoaAsyncSocket (~> 7.4)
- IGDigest (~> 1.1.0)
- lz4 (~> 128)
- NetUtils (~> 0.3)
- NetUtils (~> 1.0)
- Nimble (= 2.0.0-rc.1)
- OpenSSL-Framework (~> 1.0.201)
- Quick (~> 0.2)
......@@ -25,10 +25,10 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 7cbf214b27f8e7f7574db6a3fd96352ffaed433d
IGDigest: 066753c10f3f1b593b00037b9ee93dc96b9e7762
lz4: 5e066195ca751d552becaa026f8fe213ff738adf
NetUtils: 646a619cfdafdc5fa9dd73b2d3a040d558c02ac5
NetUtils: a83e4d66bd9b62a7e8d09f71b1e7159c5f71b44f
Nimble: 9572458605e65c9fc5a56754ab19a970f6ab5a88
OpenSSL-Framework: f10c6aa8a92f69fca94303c3774b4773860a9690
Quick: 2286bfff349102670c6d2dafd0d2cefab42f5f0b
Quick: 45494d91b43b34346217879491853ee3ca073f5d
SwiftBytes: a700beb32d020abedd3fc3bb4f0e3b5444cb18b6
COCOAPODS: 0.36.3
COCOAPODS: 0.38.0
......@@ -1486,6 +1486,13 @@ enum GCDAsyncUdpSocketConfig
if (strcmp(cursor->ifa_name, iface) == 0)
{
// Name match
///// SVDO
char ip[INET6_ADDRSTRLEN];
const char *conversion;
conversion = inet_ntop(AF_INET6, &addr->sin6_addr, ip, sizeof(ip));
///// END SVDO
struct sockaddr_in6 nativeAddr6 = *addr;
nativeAddr6.sin6_port = htons(port);
......@@ -3918,6 +3925,7 @@ enum GCDAsyncUdpSocketConfig
{
result = sendto(socket6FD, buffer, length, 0, dst, dstSize);
LogVerbose(@"sendto(socket6FD) = %d", result);
NSLog(@"sendto(socket6FD) = %d: %s", result, strerror(errno));
}
}
......
../../../Quick/Quick/DSL/World+DSL.h
\ No newline at end of file
../../../Quick/Quick/World.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/aes.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/asn1.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/asn1_mac.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/asn1t.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/bio.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/blowfish.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/bn.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/buffer.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/camellia.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/cast.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/cmac.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/cms.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/comp.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/conf.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/conf_api.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/crypto.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/des.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/des_old.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/dh.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/dsa.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/dso.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/dtls1.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/e_os2.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ebcdic.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ec.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ecdh.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ecdsa.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/engine.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/err.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/evp.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/hmac.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/idea.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/krb5_asn.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/kssl.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/lhash.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/md4.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/md5.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/mdc2.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/modes.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/obj_mac.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/objects.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ocsp.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/opensslconf.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/opensslv.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ossl_typ.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/pem.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/pem2.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/pkcs12.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/pkcs7.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/pqueue.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/rand.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/rc2.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/rc4.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ripemd.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/rsa.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/safestack.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/seed.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/sha.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/srp.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/srtp.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ssl.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ssl2.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ssl23.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ssl3.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/stack.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/symhacks.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/tls1.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ts.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/txt_db.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ui.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/ui_compat.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/whrlpool.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/x509.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/x509_vfy.h
\ No newline at end of file
../../../../OpenSSL-Framework/openssl.framework/Headers/x509v3.h
\ No newline at end of file
../../../Quick/Quick/NSString+QCKSelectorName.h
\ No newline at end of file
......@@ -3,10 +3,10 @@ PODS:
- CocoaAsyncSocket (7.4.1)
- IGDigest (1.1.2)
- lz4 (128)
- NetUtils (0.4)
- NetUtils (1.0)
- Nimble (2.0.0-rc.1)
- OpenSSL-Framework (1.0.201)
- Quick (0.4.0)
- Quick (0.5.0)
- SwiftBytes (0.2.0)
DEPENDENCIES:
......@@ -14,7 +14,7 @@ DEPENDENCIES:
- CocoaAsyncSocket (~> 7.4)
- IGDigest (~> 1.1.0)
- lz4 (~> 128)
- NetUtils (~> 0.3)
- NetUtils (~> 1.0)
- Nimble (= 2.0.0-rc.1)
- OpenSSL-Framework (~> 1.0.201)
- Quick (~> 0.2)
......@@ -25,10 +25,10 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 7cbf214b27f8e7f7574db6a3fd96352ffaed433d
IGDigest: 066753c10f3f1b593b00037b9ee93dc96b9e7762
lz4: 5e066195ca751d552becaa026f8fe213ff738adf
NetUtils: 646a619cfdafdc5fa9dd73b2d3a040d558c02ac5
NetUtils: a83e4d66bd9b62a7e8d09f71b1e7159c5f71b44f
Nimble: 9572458605e65c9fc5a56754ab19a970f6ab5a88
OpenSSL-Framework: f10c6aa8a92f69fca94303c3774b4773860a9690
Quick: 2286bfff349102670c6d2dafd0d2cefab42f5f0b
Quick: 45494d91b43b34346217879491853ee3ca073f5d
SwiftBytes: a700beb32d020abedd3fc3bb4f0e3b5444cb18b6
COCOAPODS: 0.36.3
COCOAPODS: 0.38.0
......@@ -68,6 +68,18 @@ public class Interface {
}
private static func extractAddress(address:sockaddr) -> String? {
if (address.sa_family == sa_family_t(AF_INET)) {
return extractAddress_ipv4(address)
}
else if (address.sa_family == sa_family_t(AF_INET6)) {
return extractAddress_ipv6(address)
}
else {
return nil
}
}
private static func extractAddress_ipv4(address:sockaddr) -> String? {
var addr = address
var address : String? = nil
var hostname = [CChar](count: Int(2049), repeatedValue: 0)
......@@ -81,6 +93,19 @@ public class Interface {
}
return address
}
private static func extractAddress_ipv6(address:sockaddr) -> String? {
var addr = address
var ip : [Int8] = [Int8](count: Int(INET6_ADDRSTRLEN), repeatedValue: Int8(0))
return inetNtoP(&addr, ip: &ip)
}
private static func inetNtoP(addr:UnsafeMutablePointer<sockaddr>, ip:UnsafeMutablePointer<Int8>) -> String? {
let addr6 = unsafeBitCast(addr, UnsafeMutablePointer<sockaddr_in6>.self)
let conversion:UnsafePointer<CChar> = inet_ntop(AF_INET6, &addr6.memory.sin6_addr, ip, socklen_t(INET6_ADDRSTRLEN))
let s = String.fromCString(conversion)
return s
}
public func getName() -> String { return name }
public func getFamily() -> Family { return family }
......
module ifaddrs [system] [extern_c] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/ifaddrs.h"
header "/Applications/Xcode-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/ifaddrs.h"
export *
}
module ifaddrs [system] [extern_c] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/ifaddrs.h"
header "/Applications/Xcode-beta.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/ifaddrs.h"
export *
}
module ifaddrs [system] [extern_c] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/ifaddrs.h"
header "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/ifaddrs.h"
export *
}
This diff is collapsed.
......@@ -43,7 +43,7 @@ public typealias ExampleFilter = (example: Example) -> Bool
All examples are filtered using all inclusion filters.
The remaining examples are run. If no examples remain, all examples are run.
:param: filter A filter that, given an example, returns a value indicating
- parameter filter: A filter that, given an example, returns a value indicating
whether that example should be included in the examples
that are run.
*/
......@@ -57,7 +57,7 @@ public typealias ExampleFilter = (example: Example) -> Bool
All examples that remain after being filtered by the inclusion filters are
then filtered via all exclusion filters.
:param: filter A filter that, given an example, returns a value indicating
- parameter filter: A filter that, given an example, returns a value indicating
whether that example should be excluded from the examples
that are run.
*/
......@@ -89,7 +89,7 @@ public typealias ExampleFilter = (example: Example) -> Bool
either. Mulitple beforeEach defined on a single configuration, however,
will be executed in the order they're defined.
:param: closure The closure to be executed before each example
- parameter closure: The closure to be executed before each example
in the test suite.
*/
public func beforeEach(closure: BeforeExampleClosure) {
......@@ -120,7 +120,7 @@ public typealias ExampleFilter = (example: Example) -> Bool
either. Mulitple afterEach defined on a single configuration, however,
will be executed in the order they're defined.
:param: closure The closure to be executed before each example
- parameter closure: The closure to be executed before each example
in the test suite.
*/
public func afterEach(closure: AfterExampleClosure) {
......
#import "QuickConfiguration.h"
#import <Quick/Quick-Swift.h>
#import "World.h"
#import <objc/runtime.h>
typedef void (^QCKClassEnumerationBlock)(Class klass);
......
This diff is collapsed.
#import <Foundation/Foundation.h>
@class ExampleMetadata;
/**
Provides a hook for Quick to be configured before any examples are run.
Within this scope, override the +[QuickConfiguration configure:] method
......@@ -46,6 +48,7 @@
typedef NSDictionary *(^QCKDSLSharedExampleContext)(void);
typedef void (^QCKDSLSharedExampleBlock)(QCKDSLSharedExampleContext);
typedef void (^QCKDSLEmptyBlock)(void);
typedef void (^QCKDSLExampleMetadataBlock)(ExampleMetadata *exampleMetadata);
extern void qck_beforeSuite(QCKDSLEmptyBlock closure);
extern void qck_afterSuite(QCKDSLEmptyBlock closure);
......@@ -53,7 +56,9 @@ extern void qck_sharedExamples(NSString *name, QCKDSLSharedExampleBlock closure)
extern void qck_describe(NSString *description, QCKDSLEmptyBlock closure);
extern void qck_context(NSString *description, QCKDSLEmptyBlock closure);
extern void qck_beforeEach(QCKDSLEmptyBlock closure);
extern void qck_beforeEachWithMetadata(QCKDSLExampleMetadataBlock closure);
extern void qck_afterEach(QCKDSLEmptyBlock closure);
extern void qck_afterEachWithMetadata(QCKDSLExampleMetadataBlock closure);
extern void qck_pending(NSString *description, QCKDSLEmptyBlock closure);
extern void qck_xdescribe(NSString *description, QCKDSLEmptyBlock closure);
extern void qck_xcontext(NSString *description, QCKDSLEmptyBlock closure);
......@@ -134,6 +139,14 @@ static inline void beforeEach(QCKDSLEmptyBlock closure) {
qck_beforeEach(closure);
}
/**
Identical to QCKDSL.beforeEach, except the closure is provided with
metadata on the example that the closure is being run prior to.
*/
static inline void beforeEachWithMetadata(QCKDSLExampleMetadataBlock closure) {
qck_beforeEachWithMetadata(closure);
}
/**
Defines a closure to be run after each example in the current example
group. This closure is not run for pending or otherwise disabled examples.
......@@ -146,6 +159,14 @@ static inline void afterEach(QCKDSLEmptyBlock closure) {
qck_afterEach(closure);
}
/**
Identical to QCKDSL.afterEach, except the closure is provided with
metadata on the example that the closure is being run after.
*/
static inline void afterEachWithMetadata(QCKDSLExampleMetadataBlock closure) {
qck_afterEachWithMetadata(closure);
}
/**
Defines an example or example group that should not be executed. Use `pending` to temporarily disable
examples or groups that should not be run yet.
......
#import "QCKDSL.h"
#import <Quick/Quick-Swift.h>
#import "World.h"
#import "World+DSL.h"
void qck_beforeSuite(QCKDSLEmptyBlock closure) {
[[World sharedWorld] beforeSuite:closure];
......@@ -25,10 +26,18 @@ void qck_beforeEach(QCKDSLEmptyBlock closure) {
[[World sharedWorld] beforeEach:closure];
}
void qck_beforeEachWithMetadata(QCKDSLExampleMetadataBlock closure) {
[[World sharedWorld] beforeEachWithMetadata:closure];
}
void qck_afterEach(QCKDSLEmptyBlock closure) {
[[World sharedWorld] afterEach:closure];
}
void qck_afterEachWithMetadata(QCKDSLExampleMetadataBlock closure) {
[[World sharedWorld] afterEachWithMetadata:closure];
}
QCKItBlock qck_it_builder(NSDictionary *flags, NSString *file, NSUInteger line) {
return ^(NSString *description, QCKDSLEmptyBlock closure) {
[[World sharedWorld] itWithDescription:description
......
#import <Quick/Quick-Swift.h>
@interface World (SWIFT_EXTENSION(Quick))
- (void)beforeSuite:(void (^ __nonnull)(void))closure;
- (void)afterSuite:(void (^ __nonnull)(void))closure;
- (void)sharedExamples:(NSString * __nonnull)name closure:(void (^ __nonnull)(NSDictionary * __nonnull (^ __nonnull)(void)))closure;
- (void)describe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
- (void)context:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
- (void)fdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
- (void)xdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure;
- (void)beforeEach:(void (^ __nonnull)(void))closure;
- (void)beforeEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
- (void)afterEach:(void (^ __nonnull)(void))closure;
- (void)afterEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
- (void)itWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure;
- (void)fitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure;
- (void)xitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure;
- (void)itBehavesLikeSharedExampleNamed:(NSString * __nonnull)name sharedExampleContext:(NSDictionary * __nonnull (^ __nonnull)(void))sharedExampleContext flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line;
- (void)pending:(NSString * __nonnull)description closure:(void (^ __nonnull)(void))closure;
@end
......@@ -4,19 +4,19 @@
writers use in their specs.
*/
extension World {