bypassSession => skipStartSession

Author: ObjColumnist

Core/XMPPStream.h

@@ -225,13 +225,20 @@ extern const NSTimeInterval XMPPStreamTimeoutNone;
 @property (readwrite, strong) id tag;
 
 /**
- * Session is a deprecated stream feature now that is usually sent now to handle any needed 
- * backwards compatibility with server implementations. If set, the stream will not 
- * send the Session element after Binding.
+ * RFC 6121 states that starting a session is no longer required.
+ * To skip this step set skipStartSession to YES.
  *
- * The default value is NO
+ * [RFC3921] specified one additional
+ * precondition: formal establishment of an instant messaging and
+ * presence session.  Implementation and deployment experience has
+ * shown that this additional step is unnecessary.  However, for
+ * backward compatibility an implementation MAY still offer that
+ * feature.  This enables older software to connect while letting
+ * newer software save a round trip.
+ *
+ * The default value is NO.
 **/
-@property (readwrite, assign) BOOL bypassSession;
+@property (readwrite, assign) BOOL skipStartSession;
 
 #if TARGET_OS_IPHONE
 

Core/XMPPStream.m

@@ -109,7 +109,7 @@ @interface XMPPStream ()
 	UInt16 hostPort;
 
 	BOOL autoStartTLS;
-  BOOL bypassSession;
+    BOOL skipStartSession;
 
 	id <XMPPSASLAuthentication> auth;
 	NSDate *authenticationDate;
@@ -670,32 +670,32 @@ - (void)setResetByteCountPerConnection:(BOOL)flag
 		dispatch_async(xmppQueue, block);
 }
 
-- (BOOL)bypassSession
+- (BOOL)skipStartSession
 {
-  __block BOOL result = NO;
-  
-  dispatch_block_t block = ^{
-    result = bypassSession;
-  };
-  
-  if (dispatch_get_specific(xmppQueueTag))
-    block();
-  else
-    dispatch_sync(xmppQueue, block);
-  
-  return result;
+    __block BOOL result = NO;
+    
+    dispatch_block_t block = ^{
+        result = skipStartSession;
+    };
+    
+    if (dispatch_get_specific(xmppQueueTag))
+        block();
+    else
+        dispatch_sync(xmppQueue, block);
+    
+    return result;
 }
 
-- (void)setBypassSession:(BOOL)flag
+- (void)setSkipStartSession:(BOOL)flag
 {
-  dispatch_block_t block = ^{
-    bypassSession = flag;
-  };
-  
-  if (dispatch_get_specific(xmppQueueTag))
-    block();
-  else
-    dispatch_async(xmppQueue, block);
+    dispatch_block_t block = ^{
+        skipStartSession = flag;
+    };
+    
+    if (dispatch_get_specific(xmppQueueTag))
+        block();
+    else
+        dispatch_async(xmppQueue, block);
 }
 
 #if TARGET_OS_IPHONE
@@ -3517,7 +3517,7 @@ - (void)handleBinding:(NSXMLElement *)response
 		// Don't forget about that NSXMLElement bug you reported to apple (xmlns is required or element won't be found)
 		NSXMLElement *f_session = [features elementForName:@"session" xmlns:@"urn:ietf:params:xml:ns:xmpp-session"];
 
-		if (f_session && (![self bypassSession]))
+		if (f_session && (![self skipStartSession]))
 		{
 			NSXMLElement *session = [NSXMLElement elementWithName:@"session"];
 			[session setXmlns:@"urn:ietf:params:xml:ns:xmpp-session"];