Overview
Comment: | Initial commit.
Work done by me and Florian Zeitz. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | descendants | trunk |
Files: | files | file ages | folders |
SHA3-256: |
acb2c5cbf0e1b27e4c7e87c3685d8357 |
User & Date: | js on 2011-02-08 19:45:21 |
Other Links: | manifest | tags |
Context
2011-02-10
| ||
02:54 | Add stanza classes XMPPStanza, XMPPIQ, XMPPMessage and XMPPPresence check-in: 109b15316d user: florob@babelmonkeys.de tags: trunk | |
2011-02-08
| ||
19:45 | Initial commit. check-in: acb2c5cbf0 user: js tags: trunk | |
Changes
Added XMPPConnection.h version [c80e848a7e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #import <ObjFW/ObjFW.h> @class XMPPConnection; @class XMPPIQ; @class XMPPMessage; @class XMPPPresence; @protocol XMPPConnectionDelegate - (void)connectionWasClosed: (XMPPConnection*)conn; - (void)connection: (XMPPConnection*)conn didReceiveIQ: (XMPPIQ*)iq; - (void)connection: (XMPPConnection*)conn didReceivePresence: (XMPPPresence*)pres; - (void)connection: (XMPPConnection*)conn didReceiveMessage: (XMPPMessage*)msg; @end @interface XMPPConnection: OFObject <OFXMLElementBuilderDelegate> { OFTCPSocket *sock; OFXMLParser *parser; OFXMLElementBuilder *elementBuilder; OFString *username; OFString *password; OFString *server; OFString *resource; short port; BOOL useTLS; id <XMPPConnectionDelegate> delegate; OFMutableArray *mechanisms; } @property (copy) OFString *username; @property (copy) OFString *password; @property (copy) OFString *server; @property (copy) OFString *resource; @property (assign) short port; @property (assign) BOOL useTLS; @property (retain) id <XMPPConnectionDelegate> delegate; - (void)connect; - (void)handleConnection; @end |
Added XMPPConnection.m version [376ec31f52].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | #import "XMPPConnection.h" #define NS_BIND @"urn:ietf:params:xml:ns:xmpp-bind" #define NS_CLIENT @"jabber:client" #define NS_SASL @"urn:ietf:params:xml:ns:xmpp-sasl" #define NS_STREAM @"http://etherx.jabber.org/streams" @implementation XMPPConnection @synthesize username; @synthesize password; @synthesize server; @synthesize resource; @synthesize port; @synthesize useTLS; @synthesize delegate; - init { self = [super init]; sock = [[OFTCPSocket alloc] init]; parser = [[OFXMLParser alloc] init]; elementBuilder = [[OFXMLElementBuilder alloc] init]; port = 5222; useTLS = YES; mechanisms = [[OFMutableArray alloc] init]; parser.delegate = self; elementBuilder.delegate = self; return self; } - (void)dealloc { [sock release]; [parser release]; [elementBuilder release]; [super dealloc]; } - (void)_startStream { [sock writeFormat: @"<?xml version='1.0'?>\n" @"<stream:stream to='%@' xmlns='" NS_CLIENT @"' " @"xmlns:stream='" NS_STREAM @"' " @"version='1.0'>", server]; } - (void)connect { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; [sock connectToService: [OFString stringWithFormat: @"%u", port] onNode: server]; [self _startStream]; [pool release]; } - (void)handleConnection { char buf[512]; for (;;) { size_t len = [sock readNBytes: 512 intoBuffer: buf]; if (len < 1) [delegate connectionWasClosed: self]; [of_stdout writeNBytes: len fromBuffer: buf]; [parser parseBuffer: buf withSize: len]; } } - (void)parser: (OFXMLParser*)p didStartElement: (OFString*)name withPrefix: (OFString*)prefix namespace: (OFString*)ns attributes: (OFArray*)attrs { if (![name isEqual: @"stream"] || ![prefix isEqual: @"stream"] || ![ns isEqual: NS_STREAM]) of_log(@"Did not get expected stream start!"); for (OFXMLAttribute *attr in attrs) if ([attr.name isEqual: @"from"] && ![attr.stringValue isEqual: server]) of_log(@"Got invalid from in stream start!"); parser.delegate = elementBuilder; } - (void)_addAuthMechanisms: (OFXMLElement*)mechanisms_ { for (OFXMLElement *mechanism in mechanisms_.children) [mechanisms addObject: [mechanism.children.firstObject stringValue]]; } - (void)_sendPLAINAuth { OFXMLElement *authTag; OFDataArray *message; message = [OFDataArray dataArrayWithItemSize: 1]; /* XXX: authzid would go here */ //[message addItem: authzid]; /* separator */ [message addItem: ""]; /* authcid */ [message addNItems: [username cStringLength] fromCArray: [username cString]]; /* separator */ [message addItem: ""]; /* passwd */ [message addNItems: [password cStringLength] fromCArray: [password cString]]; authTag = [OFXMLElement elementWithName: @"auth" namespace: NS_SASL]; [authTag addAttributeWithName: @"mechanism" stringValue: @"PLAIN"]; [authTag addChild: [OFXMLElement elementWithCharacters: [message stringByBase64Encoding]]]; [sock writeString: [authTag stringValue]]; } - (void)_sendResourceBind { OFXMLElement *iq = [OFXMLElement elementWithName: @"iq"]; [iq addAttributeWithName: @"type" stringValue: @"set"]; [iq addChild: [OFXMLElement elementWithName: @"bind" namespace: NS_BIND]]; [sock writeString: [iq stringValue]]; } - (void)_handleFeatures: (OFXMLElement*)elem { for (OFXMLElement *child in elem.children) { if ([[child name] isEqual: @"mechanisms"] && [[child namespace] isEqual: NS_SASL]) [self _addAuthMechanisms: child]; else if ([[child name] isEqual: @"bind"] && [[child namespace] isEqual: NS_BIND]) [self _sendResourceBind]; } if ([mechanisms containsObject: @"PLAIN"]) [self _sendPLAINAuth]; } - (void)elementBuilder: (OFXMLElementBuilder*)b didBuildElement: (OFXMLElement*)elem { elem.defaultNamespace = NS_CLIENT; [elem setPrefix: @"stream" forNamespace: NS_STREAM]; if ([elem.name isEqual: @"features"] && [elem.namespace isEqual: NS_STREAM]) { [self _handleFeatures: elem]; return; } if ([elem.namespace isEqual: NS_SASL]) { if ([elem.name isEqual: @"success"]) { of_log(@"Auth successful"); /* Stream restart */ [mechanisms release]; mechanisms = [[OFMutableArray alloc] init]; parser.delegate = self; [self _startStream]; return; } if ([elem.name isEqual: @"failure"]) of_log(@"Auth failed!"); // FIXME: Handle! } } - (void)elementBuilder: (OFXMLElementBuilder*)b didNotExpectCloseTag: (OFString*)name withPrefix: (OFString*)prefix namespace: (OFString*)ns { // TODO } @end |
Added test.m version [6897d0dd8c].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #include <ObjFW/ObjFW.h> #import "XMPPConnection.h" @interface AppDelegate: OFObject { XMPPConnection *conn; } @end OF_APPLICATION_DELEGATE(AppDelegate) @implementation AppDelegate - (void)applicationDidFinishLaunching { OFArray *arguments = [OFApplication arguments]; conn = [[XMPPConnection alloc] init]; if (arguments.count != 3) { of_log(@"Invalid count of command line arguments!"); [OFApplication terminateWithStatus: 1]; } [conn setServer: [arguments objectAtIndex: 0]]; [conn setUsername: [arguments objectAtIndex: 1]]; [conn setPassword: [arguments objectAtIndex: 2]]; [conn setResource: @"ObjXMPP"]; [conn setUseTLS: NO]; [conn connect]; [conn handleConnection]; } @end |