ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split up XMPP_handleStanza.

Browse source 
Non-Stanzas are now handled in separate functions
This commit is contained in:
Florian Zeitz 2011-04-07 23:13:19 +02:00
parent 91b2a0b119
commit 683fc1e3ae
2 changed files with 106 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/XMPPConnection.h
View file

@ -163,6 +163,9 @@
- (XMPPRoster*)roster; - (XMPPRoster*)roster;
- (void)XMPP_startStream; - (void)XMPP_startStream;
- (void)XMPP_handleStream: (OFXMLElement*)elem;
- (void)XMPP_handleTLS: (OFXMLElement*)elem;
- (void)XMPP_handleSASL: (OFXMLElement*)elem;
- (void)XMPP_handleStanza: (OFXMLElement*)elem; - (void)XMPP_handleStanza: (OFXMLElement*)elem;
- (void)XMPP_sendAuth: (OFString*)name; - (void)XMPP_sendAuth: (OFString*)name;
- (void)XMPP_handleIQ: (XMPPIQ*)iq; - (void)XMPP_handleIQ: (XMPPIQ*)iq;

24
src/XMPPConnection.m
View file

@ -297,8 +297,18 @@
of_log(@"In: %@", elem); of_log(@"In: %@", elem);
if ([[elem namespace] isEqual: XMPP_NS_CLIENT])
[self XMPP_handleStanza: elem]; [self XMPP_handleStanza: elem];
if ([[elem namespace] isEqual: XMPP_NS_STREAM])
[self XMPP_handleStream: elem];
if ([[elem namespace] isEqual: XMPP_NS_STARTTLS])
[self XMPP_handleTLS: elem];
if ([[elem namespace] isEqual: XMPP_NS_SASL])
[self XMPP_handleSASL: elem];
[pool release]; [pool release];
} }
@ -313,7 +323,6 @@
- (void)XMPP_handleStanza: (OFXMLElement*)elem - (void)XMPP_handleStanza: (OFXMLElement*)elem
{ {
if ([[elem namespace] isEqual: XMPP_NS_CLIENT]) {
if ([[elem name] isEqual: @"iq"]) { if ([[elem name] isEqual: @"iq"]) {
[self XMPP_handleIQ: [XMPPIQ stanzaWithElement: elem]]; [self XMPP_handleIQ: [XMPPIQ stanzaWithElement: elem]];
return; return;
@ -334,7 +343,9 @@
assert(0); assert(0);
} }
if ([[elem namespace] isEqual: XMPP_NS_STREAM]) {
- (void)XMPP_handleStream: (OFXMLElement*)elem
{
if ([[elem name] isEqual: @"features"]) { if ([[elem name] isEqual: @"features"]) {
[self XMPP_handleFeatures: elem]; [self XMPP_handleFeatures: elem];
return; return;
@ -343,7 +354,8 @@
assert(0); assert(0);
} }
if ([[elem namespace] isEqual: XMPP_NS_STARTTLS]) { - (void)XMPP_handleTLS: (OFXMLElement*)elem
{
if ([[elem name] isEqual: @"proceed"]) { if ([[elem name] isEqual: @"proceed"]) {
/* FIXME: Catch errors here */ /* FIXME: Catch errors here */
SSLSocket *newSock; SSLSocket *newSock;
@ -373,7 +385,8 @@
assert(0); assert(0);
} }
if ([[elem namespace] isEqual: XMPP_NS_SASL]) { - (void)XMPP_handleSASL: (OFXMLElement*)elem
{
if ([[elem name] isEqual: @"challenge"]) { if ([[elem name] isEqual: @"challenge"]) {
OFXMLElement *responseTag; OFXMLElement *responseTag;
OFDataArray *challenge = OFDataArray *challenge =
@ -420,9 +433,6 @@
assert(0); assert(0);
} }
assert(0);
}
- (void)XMPP_handleIQ: (XMPPIQ*)iq - (void)XMPP_handleIQ: (XMPPIQ*)iq
{ {
BOOL handled = NO; BOOL handled = NO;