Skip to content

Fix for empty (@"") endpoints. #8

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

Open
pbihler wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for empty (@"") endpoints. #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa14969
Fix for empty (@"") endpoints.
pbihler Apr 23, 2015
5d916a0
Refactored type-based if clauses for more code clarity
pbihler Apr 23, 2015
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
19 changes: 13 additions & 6 deletions SocketIOPacket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,15 @@ - (NSString *) toString
NSNumber *typeAsNumber = [self typeAsNumber];
NSMutableArray *encoded = [NSMutableArray arrayWithObject:typeAsNumber];

NSNumber *typeNumber = [self typeAsNumber];
if (!(self.endpoint == nil || [@"/" isEqualToString:self.endpoint]) && [typeNumber intValue] != 6 && [typeNumber intValue] != 2)
//BOOL typeIsDisconnect = [typeAsNumber intValue] == 0;
BOOL typeIsHeartbeat = [typeAsNumber intValue] == 2;
BOOL typeIsAck = [typeAsNumber intValue] == 6;

BOOL endpointIsEmpty = ! [self.endpoint length];
BOOL endpointIsRoot = [@"/" isEqualToString:self.endpoint];
BOOL endpointIsDefault = endpointIsEmpty || endpointIsRoot;

if (! (endpointIsDefault || typeIsHeartbeat || typeIsAck))
{
[encoded addObject:[self.endpoint stringByAppendingString:@","]];
}
Expand All @@ -97,19 +104,19 @@ - (NSString *) toString
}
} else {
// Engine.IO 1.0 expects payload with the ping packet
if ([typeAsNumber intValue] == 2) {
if (typeIsHeartbeat) {
[encoded addObject:@"probe"];
}
}

// Do not write pid for acknowledgements
if ([typeNumber intValue] != 6) {
if (! typeIsAck) {
[encoded addObject:pIdL];
}

// Add the end point for the namespace to be used, as long as it is not
// an ACK, heartbeat, or disconnect packet
/*if ([type intValue] != 6 && [type intValue] != 2 && [type intValue] != 0) {
/*if (! (typeIsHeartbeat || typeIsAck || typeIsDisconnect)) {
[encoded addObject:endpoint];
}
else {
Expand All @@ -120,7 +127,7 @@ - (NSString *) toString
{
NSString *ackpId = @"";
// This is an acknowledgement packet, so, prepend the ack pid to the data
if ([typeNumber intValue] == 6)
if (typeIsAck)
{
if( !([self isKindOfClass:[SocketIOPacketV10x class]]) )
ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
Expand Down