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

Add multicast delegates.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-01-27 00:23:04 +01:00
parent 1c4befa4c4
commit 7fb28f25c8
9 changed files with 265 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile
View file

@ -13,6 +13,7 @@ SRCS = XMPPAuthenticator.m \
XMPPIQ.m \
XMPPJID.m \
XMPPMessage.m \
XMPPMulticastDelegate.m \
XMPPPLAINAuth.m \
XMPPPresence.m \
XMPPRoster.m \

33
src/XMPPConnection.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2011, Jonathan Schleifer <js@webkeks.org>
* Copyright (c) 2010, 2011, 2012, Jonathan Schleifer <js@webkeks.org>
* Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de>
*
* https://webkeks.org/hg/objxmpp/
@ -32,6 +32,7 @@
@class XMPPRoster;
@class XMPPRosterItem;
@class SSLSocket;
@class XMPPMulticastDelegate;
@protocol XMPPConnectionDelegate
#ifndef XMPP_CONNECTION_M
@ -77,7 +78,7 @@
OFString *domain, *domainToASCII;
XMPPJID *JID;
uint16_t port;
id <XMPPConnectionDelegate, OFObject> delegate;
XMPPMulticastDelegate *delegates;
OFMutableDictionary *callbacks;
XMPPAuthenticator *authModule;
BOOL streamOpen;
@ -92,7 +93,6 @@
@property (copy) OFString *privateKeyFile, *certificateFile;
@property (copy, readonly) XMPPJID *JID;
@property (assign) uint16_t port;
@property (assign) id <XMPPConnectionDelegate> delegate;
@property (readonly, retain) XMPPRoster *roster;
@property (readonly, retain, getter=socket) OFTCPSocket *sock;
@property (assign) BOOL encryptionRequired;
@ -105,6 +105,20 @@
*/
+ connection;
/**
* Adds the specified delegate.
*
* \param delegate The delegate to add
*/
- (void)addDelegate: (id <XMPPConnectionDelegate>)delegate;
/**
* Removes the specified delegate.
*
* \param delegate The delegate to remove
*/
- (void)removeDelegate: (id <XMPPConnectionDelegate>)delegate;
/**
* Connects to the XMPP service.
*/
@ -174,9 +188,9 @@
* \param selector The selector of the callback method,
* must take exactly one parameter of type XMPPIQ*
*/
- (void)sendIQ: (XMPPIQ*)iq
withCallbackObject: (id)object
selector: (SEL)selector;
- (void)sendIQ: (XMPPIQ*)iq
withCallbackObject: (id)object
selector: (SEL)selector;
#ifdef OF_HAVE_BLOCKS
/**
@ -184,8 +198,8 @@ withCallbackObject: (id)object
*
* \param callback The callback block
*/
- (void)sendIQ: (XMPPIQ*)iq
withCallbackBlock: (void(^)(XMPPIQ*))callback;
- (void)sendIQ: (XMPPIQ*)iq
withCallbackBlock: (void(^)(XMPPIQ*))block;
#endif
/**
@ -208,8 +222,6 @@ withCallbackBlock: (void(^)(XMPPIQ*))callback;
- (XMPPJID*)JID;
- (void)setPort: (uint16_t)port;
- (uint16_t)port;
- (void)setDelegate: (id <XMPPConnectionDelegate>)delegate;
- (id <XMPPConnectionDelegate>)delegate;
- (XMPPRoster*)roster;
- (void)XMPP_startStream;
@ -229,6 +241,7 @@ withCallbackBlock: (void(^)(XMPPIQ*))callback;
- (void)XMPP_sendSession;
- (void)XMPP_handleSession: (XMPPIQ*)iq;
- (OFString*)XMPP_IDNAToASCII: (OFString*)domain;
- (XMPPMulticastDelegate*)XMPP_delegates;
@end
@interface OFObject (XMPPConnectionDelegate) <XMPPConnectionDelegate>

133
src/XMPPConnection.m
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2011, Jonathan Schleifer <js@webkeks.org>
* Copyright (c) 2010, 2011, 2012, Jonathan Schleifer <js@webkeks.org>
* Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de>
*
* https://webkeks.org/hg/objxmpp/
@ -49,6 +49,7 @@
#import "XMPPPresence.h"
#import "XMPPRoster.h"
#import "XMPPRosterItem.h"
#import "XMPPMulticastDelegate.h"
#import "XMPPExceptions.h"
#import "namespaces.h"
@ -67,6 +68,7 @@
port = 5222;
encrypted = NO;
streamOpen = NO;
delegates = [[XMPPMulticastDelegate alloc] init];
callbacks = [[OFMutableDictionary alloc] init];
} @catch (id e) {
[self release];
@ -89,6 +91,7 @@
[domain release];
[resource release];
[JID release];
[delegates release];
[callbacks release];
[authModule release];
[roster release];
@ -304,9 +307,9 @@
- (void)parseBuffer: (const char*)buffer
withLength: (size_t)length
{
if (length < 1 && [delegate respondsToSelector:
@selector(connectionWasClosed:)]) {
[delegate connectionWasClosed: self];
if (length < 1) {
[delegates broadcastSelector: @selector(connectionWasClosed:)
forConnection: self];
return;
}
@ -375,10 +378,9 @@
- (void)sendStanza: (OFXMLElement*)element
{
if ([delegate respondsToSelector:
@selector(connection:didSendElement:)])
[delegate connection: self
didSendElement: element];
[delegates broadcastSelector: @selector(connection:didSendElement:)
forConnection: self
withObject: element];
[sock writeString: [element XMLString]];
}
@ -387,37 +389,37 @@
withCallbackObject: (id)object
selector: (SEL)selector
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
@try {
if (![iq ID])
[iq setID: [self generateStanzaID]];
OFAutoreleasePool *pool;
XMPPCallback *callback;
[callbacks setObject: [XMPPCallback
callbackWithCallbackObject: object
selector: selector]
forKey: [iq ID]];
} @finally {
[pool release];
}
if (![iq ID])
[iq setID: [self generateStanzaID]];
pool = [[OFAutoreleasePool alloc] init];
callback = [XMPPCallback callbackWithCallbackObject: object
selector: selector];
[callbacks setObject: callback
forKey: [iq ID]];
[pool release];
[self sendStanza: iq];
}
#ifdef OF_HAVE_BLOCKS
- (void)sendIQ: (XMPPIQ*)iq
withCallbackBlock: (xmpp_callback_block_t)callback;
withCallbackBlock: (xmpp_callback_block_t)block;
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
@try {
if (![iq ID])
[iq setID: [self generateStanzaID]];
OFAutoreleasePool *pool;
XMPPCallback *callback;
[callbacks setObject: [XMPPCallback
callbackWithCallbackBlock: callback]
forKey: [iq ID]];
} @finally {
[pool release];
}
if (![iq ID])
[iq setID: [self generateStanzaID]];
pool = [[OFAutoreleasePool alloc] init];
callback = [XMPPCallback callbackWithCallbackBlock: block];
[callbacks setObject: callback
forKey: [iq ID]];
[pool release];
[self sendStanza: iq];
}
@ -486,10 +488,9 @@
[element setPrefix: @"stream"
forNamespace: XMPP_NS_STREAM];
if ([delegate respondsToSelector:
@selector(connection:didReceiveElement:)])
[delegate connection: self
didReceiveElement: element];
[delegates broadcastSelector: @selector(connection:didReceiveElement:)
forConnection: self
withObject: element];
if ([[element namespace] isEqual: XMPP_NS_CLIENT])
[self XMPP_handleStanza: element];
@ -692,9 +693,9 @@
/* FIXME: Catch errors here */
SSLSocket *newSock;
if ([delegate respondsToSelector:
@selector(connectionWillUpgradeToTLS:)])
[delegate connectionWillUpgradeToTLS: self];
[delegates broadcastSelector: @selector(
connectionWillUpgradeToTLS:)
forConnection: self];
newSock = [[SSLSocket alloc] initWithSocket: sock
privateKeyFile: privateKeyFile
@ -704,9 +705,9 @@
encrypted = YES;
if ([delegate respondsToSelector:
@selector(connectionDidUpgradeToTLS:)])
[delegate connectionDidUpgradeToTLS: self];
[delegates broadcastSelector: @selector(
connectionDidUpgradeToTLS:)
forConnection: self];
/* Stream restart */
[self XMPP_startStream];
@ -748,9 +749,9 @@
[authModule continueWithData: [OFDataArray
dataArrayWithBase64EncodedString: [element stringValue]]];
if ([delegate respondsToSelector:
@selector(connectionWasAuthenticated:)])
[delegate connectionWasAuthenticated: self];
[delegates broadcastSelector: @selector(
connectionWWasAuthenticated:)
forConnection: self];
/* Stream restart */
[self XMPP_startStream];
@ -786,9 +787,10 @@
if ([roster handleIQ: iq])
return;
if ([delegate respondsToSelector: @selector(connection:didReceiveIQ:)])
handled = [delegate connection: self
didReceiveIQ: iq];
handled = [delegates broadcastSelector: @selector(
connection:didReceiveIQ:)
forConnection: self
withObject: iq];
if (!handled && ![[iq type] isEqual: @"error"] &&
![[iq type] isEqual: @"result"]) {
@ -799,18 +801,16 @@
- (void)XMPP_handleMessage: (XMPPMessage*)message
{
if ([delegate respondsToSelector:
@selector(connection:didReceiveMessage:)])
[delegate connection: self
didReceiveMessage: message];
[delegates broadcastSelector: @selector(connection:didReceiveMessage:)
forConnection: self
withObject: message];
}
- (void)XMPP_handlePresence: (XMPPPresence*)presence
{
if ([delegate respondsToSelector:
@selector(connection:didReceivePresence:)])
[delegate connection: self
didReceivePresence: presence];
[delegates broadcastSelector: @selector(connection:didReceivePresence:)
forConnection: self
withObject: presence];
}
- (void)XMPP_handleFeatures: (OFXMLElement*)element
@ -979,9 +979,9 @@
return;
}
if ([delegate respondsToSelector: @selector(connection:wasBoundToJID:)])
[delegate connection: self
wasBoundToJID: JID];
[delegates broadcastSelector: @selector(connection:wasBoundToJID:)
forConnection: self
withObject: JID];
}
- (void)XMPP_sendSession
@ -1002,9 +1002,9 @@
if (![[iq type] isEqual: @"result"])
assert(0);
if ([delegate respondsToSelector: @selector(connection:wasBoundToJID:)])
[delegate connection: self
wasBoundToJID: JID];
[delegates broadcastSelector: @selector(connection:wasBoundToJID:)
forConnection: self
withObject: JID];
}
- (OFString*)XMPP_IDNAToASCII: (OFString*)domain_
@ -1045,14 +1045,19 @@
return port;
}
- (void)setDelegate: (id <XMPPConnectionDelegate>)delegate_
- (void)addDelegate: (id <XMPPConnectionDelegate>)delegate
{
delegate = (id <XMPPConnectionDelegate, OFObject>)delegate_;
[delegates addDelegate: delegate];
}
- (id <XMPPConnectionDelegate>)delegate
- (void)removeDelegate: (id <XMPPConnectionDelegate>)delegate
{
return delegate;
[delegates removeDelegate: delegate];
}
- (XMPPMulticastDelegate*)XMPP_delegates
{
return delegates;
}
- (XMPPRoster*)roster

39
src/XMPPMulticastDelegate.h Normal file
View file

@ -0,0 +1,39 @@
/*
* Copyright (c) 2012, Jonathan Schleifer <js@webkeks.org>
*
* https://webkeks.org/hg/objxmpp/
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice is present in all copies.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#import "XMPPConnection.h"
@class OFDataArray;
@interface XMPPMulticastDelegate: OFObject
{
OFDataArray *delegates;
}
- (void)addDelegate: (id <XMPPConnectionDelegate>)delegate;
- (void)removeDelegate: (id <XMPPConnectionDelegate>)delegate;
- (BOOL)broadcastSelector: (SEL)selector
forConnection: (XMPPConnection*)connection;
- (BOOL)broadcastSelector: (SEL)selector
forConnection: (XMPPConnection*)connection
withObject: (id)object;
@end

111
src/XMPPMulticastDelegate.m Normal file
View file

@ -0,0 +1,111 @@
/*
* Copyright (c) 2012, Jonathan Schleifer <js@webkeks.org>
*
* https://webkeks.org/hg/objxmpp/
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice is present in all copies.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#import <ObjFW/OFDataArray.h>
#import "XMPPMulticastDelegate.h"
@implementation XMPPMulticastDelegate
- init
{
self = [super init];
@try {
delegates = [[OFDataArray alloc] initWithItemSize: sizeof(id)];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[delegates release];
[super dealloc];
}
- (void)addDelegate: (id <XMPPConnectionDelegate>)delegate
{
[delegates addItem: &delegate];
}
- (void)removeDelegate: (id<XMPPConnectionDelegate>)delegate
{
id *cArray = [delegates cArray];
size_t i, count = [delegates count];
for (i = 0; i < count; i++) {
if (cArray[i] == delegate) {
[delegates removeItemAtIndex: i];
return;
}
}
}
- (BOOL)broadcastSelector: (SEL)selector
forConnection: (XMPPConnection*)connection
{
id *cArray = [delegates cArray];
size_t i, count = [delegates count];
BOOL handled = NO;
for (i = 0; i < count; i++) {
if (![cArray[i] respondsToSelector: selector])
continue;
BOOL (*imp)(id, SEL, id) = (BOOL(*)(id, SEL, id))
[cArray[i] methodForSelector: selector];
handled |= imp(cArray[i], selector, connection);
}
return handled;
}
- (BOOL)broadcastSelector: (SEL)selector
forConnection: (XMPPConnection*)connection
withObject: (id)object
{
id *cArray = [delegates cArray];
size_t i, count = [delegates count];
BOOL handled = NO;
for (i = 0; i < count; i++) {
if (![cArray[i] respondsToSelector: selector])
continue;
BOOL (*imp)(id, SEL, id, id) = (BOOL(*)(id, SEL, id, id))
[cArray[i] methodForSelector: selector];
handled |= imp(cArray[i], selector, connection, object);
}
return handled;
}
@end

20
src/XMPPRoster.m
View file

@ -31,6 +31,7 @@
#import "XMPPConnection.h"
#import "XMPPIQ.h"
#import "XMPPJID.h"
#import "XMPPMulticastDelegate.h"
#import "namespaces.h"
@implementation XMPPRoster
@ -157,19 +158,22 @@
else
[self XMPP_addRosterItem: rosterItem];
if (isPush && [[connection delegate] respondsToSelector:
@selector(connection:didReceiveRosterItem:)])
[[connection delegate] connection: connection
didReceiveRosterItem: rosterItem];
if (isPush) {
SEL sel = @selector(connection:didReceiveRosterItem:);
[[connection XMPP_delegates]
broadcastSelector: sel
forConnection: connection
withObject: rosterItem];
}
}
if (isPush) {
[connection sendStanza: [iq resultIQ]];
} else {
if ([[connection delegate] respondsToSelector:
@selector(connectionDidReceiveRoster:)])
[[connection delegate]
connectionDidReceiveRoster: connection];
[[connection XMPP_delegates]
broadcastSelector: @selector(connectionDidReceiveRoster:)
forConnection: connection];
[rosterID release];
rosterID = nil;