ObjXMPP  Check-in [bef8950d92]

Overview
Comment:Never send starttls when the connection is already encrypted
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: bef8950d92e94c8572ca09b190c865ccb133651ba4509f1824c63e3eba1ef0e3
User & Date: florob@babelmonkeys.de on 2013-01-31 14:16:30
Other Links: manifest | tags
Context
2013-02-02
21:59
Fix initialization of XMPPContact check-in: 3a055c9030 user: florob@babelmonkeys.de tags: trunk
2013-01-31
14:16
Never send starttls when the connection is already encrypted check-in: bef8950d92 user: florob@babelmonkeys.de tags: trunk
2013-01-29
19:46
Implement -initWithElement: for XMPPPresence check-in: d75ffa4c2e user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/XMPPConnection.m from [cc58892fc4] to [4a5affb637].

︙︙
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025

					   namespace: XMPP_NS_BIND];
	OFXMLElement *session = [element elementForName: @"session"
					      namespace: XMPP_NS_SESSION];
	OFXMLElement *mechs = [element elementForName: @"mechanisms"
					    namespace: XMPP_NS_SASL];
	OFMutableSet *mechanisms = [OFMutableSet set];

	if (starttls != nil) {
		[self sendStanza:
		    [OFXMLElement elementWithName: @"starttls"
					namespace: XMPP_NS_STARTTLS]];
		return;
	}

	if (encryptionRequired && !encrypted)








|








1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025

					   namespace: XMPP_NS_BIND];
	OFXMLElement *session = [element elementForName: @"session"
					      namespace: XMPP_NS_SESSION];
	OFXMLElement *mechs = [element elementForName: @"mechanisms"
					    namespace: XMPP_NS_SASL];
	OFMutableSet *mechanisms = [OFMutableSet set];

	if (!encrypted && starttls != nil) {
		[self sendStanza:
		    [OFXMLElement elementWithName: @"starttls"
					namespace: XMPP_NS_STARTTLS]];
		return;
	}

	if (encryptionRequired && !encrypted)
︙︙