Merge pull request #40 from jensmeder/#39-DarkLightning-does-not-conn…

…ect-on-OSX-Sierra Fix for OSX Sierra bug (#39)
jensmeder · Mar 21, 2017 · 2621e09 · 2621e09
2 parents f01347b + dfea0ef
commit 2621e09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Source/Sockets/JMPathSocket.m b/Source/Sockets/JMPathSocket.m
@@ -86,7 +86,7 @@ -(BOOL)connect
 	setsockopt(_socketHandle, SOL_SOCKET, SO_REUSEADDR, (void *)&reuseAddress, sizeof(reuseAddress));
 
 	int reusePort = true;
-	setsockopt(_socketHandle, SOL_SOCKET, SO_REUSEPORT, (const char*)&reusePort, sizeof(reusePort));
+	setsockopt(_socketHandle, SOL_SOCKET, SO_REUSEPORT, (void*)&reusePort, sizeof(reusePort));
 
 	// Connect socket
 

diff --git a/Source/USB/USBMux/JMUSBMuxEncoder.m b/Source/USB/USBMux/JMUSBMuxEncoder.m
@@ -27,9 +27,11 @@
 static NSString* const JMUSBMuxEncoderDictionaryKeyMessageType 	= @"MessageType";
 static NSString* const JMUSBMuxEncoderDictionaryKeyDeviceID 	= @"DeviceID";
 static NSString* const JMUSBMuxEncoderDictionaryKeyPortNumber 	= @"PortNumber";
+static NSString* const JMUSBMuxEncoderDictionaryKeyProgName     = @"ProgName";
 
 static NSString* const JMUSBMuxEncoderMessageTypeListen 		= @"Listen";
 static NSString* const JMUSBMuxEncoderMessageTypeConnect 		= @"Connect";
+static NSString* const JMUSBMuxEncoderProgNameValue             = @"DarkLightning";
 
 @implementation JMUSBMuxEncoder
 
@@ -60,14 +62,16 @@ +(NSData*) packetForPList:(NSDictionary*)plist
 	return nil;
 }
 
+
 +(NSData *)encodeListeningPacket
 {
 	static NSData* packet = nil;
 
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken,
 	^{
-		NSDictionary *plist = @{JMUSBMuxEncoderDictionaryKeyMessageType:JMUSBMuxEncoderMessageTypeListen};
+		NSDictionary *plist = @{JMUSBMuxEncoderDictionaryKeyMessageType:JMUSBMuxEncoderMessageTypeListen,
+                                JMUSBMuxEncoderDictionaryKeyProgName: JMUSBMuxEncoderProgNameValue};
 
 		packet = [self packetForPList:plist];
 	});
@@ -87,7 +91,8 @@ +(NSData *)encodeConnectPacketForDeviceId:(NSNumber *)deviceId andPort:(uint32_t
 
 	NSDictionary *plist = @{JMUSBMuxEncoderDictionaryKeyMessageType:JMUSBMuxEncoderMessageTypeConnect,
 							JMUSBMuxEncoderDictionaryKeyDeviceID: deviceId,
-							JMUSBMuxEncoderDictionaryKeyPortNumber:@(port)};
+							JMUSBMuxEncoderDictionaryKeyPortNumber:@(port),
+                            JMUSBMuxEncoderDictionaryKeyProgName: JMUSBMuxEncoderProgNameValue};
 
 	return [self packetForPList:plist];
 }