Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for OSX Sierra bug (#39) #40

Merged
merged 1 commit into from
Mar 21, 2017
Merged

Fix for OSX Sierra bug (#39) #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Sockets/JMPathSocket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 7 additions & 2 deletions Source/USB/USBMux/JMUSBMuxEncoder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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];
});
Expand All @@ -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];
}
Expand Down