ObjXMPP  Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [c44699b3d2]:

To Artifact [5d5d301074]:

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

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














+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+
-
+

-
+
-
-
-
-
-
-
+
+
+
+







-
-
-
-
-








#import "XMPPStanza.h"

@implementation XMPPStanza
@synthesize from;
@synthesize to;
@synthesize type;
@synthesize ID;

+ stanzaWithName: (OFString*)name
{
	return [[[self alloc] initWithName: name] autorelease];
}

+ stanzaWithName: (OFString*)name
	    type: (OFString*)type_
{
	return [[[self alloc] initWithName: name
				      type: type_] autorelease];
}

+ stanzaWithName: (OFString*)name
	      ID: (OFString*)ID_
{
	return [[[self alloc] initWithName: name
					ID: ID_] autorelease];
}

+ stanzaWithName: (OFString*)name
	    type: (OFString*)type_
	      ID: (OFString*)ID_
{
	return [[[self alloc] initWithName: name
				      type: type_
					ID: ID_] autorelease];
}

+ stanzaWithElement: (OFXMLElement*)elem {
	return [[[self alloc] initWithElement: elem] autorelease];
}

- initWithName: (OFString*)name_
{
	return [self initWithName: name_
			     type: nil
			       ID: nil];
}

- initWithName: (OFString*)name_
	  type: (OFString*)type_
{
	return [self initWithName: name_
			     type: type_
			       ID: nil];
}

- initWithName: (OFString*)name_
	    ID: (OFString*)ID_
{
	return [self initWithName: name_
			     type: nil
			       ID: ID_];
}

- initWithName: (OFString*)name_
	  type: (OFString*)type_
	    ID: (OFString*)ID_
{
	if (!([name_ isEqual: @"iq"] ||
	      [name_ isEqual: @"message"] ||
	      [name_ isEqual: @"presence"]))
		of_log(@"Invalid stanza name!");

	id ret;
	self = [super initWithName: name_];
	ret = [super initWithName: name_];
	[self setDefaultNamespace: @"jabber:client"];

	if (type_)
	from = [[OFString alloc] init];
	to = [[OFString alloc] init];
	type = [[OFString alloc] init];
	ID = [[OFString alloc] init];

	return self;
		[ret setType: type_];
	if (ID_)
		[ret setID: ID_];
	return ret;
}

- initWithElement: (OFXMLElement*)elem
{
	self = [super initWithName: elem.name
			 namespace: elem.namespace];

	from = [[OFString alloc] init];
	to = [[OFString alloc] init];
	type = [[OFString alloc] init];
	ID = [[OFString alloc] init];

	OFXMLAttribute *attr;

	for (attr in elem.attributes) {
		if ([attr.name isEqual: @"from"]) {
			[self setFrom: [attr stringValue]];
		} else if ([attr.name isEqual: @"to"]) {
			[self setTo: [attr stringValue]];
︙
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

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
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238

239
240
241
242
243

244
245
246
247
248

249
250
251
252
253
254







255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289








-
+
+






+
+
+
+
+
+
+







-
-
-
-
+
+
+
-






-
+




-
+




-
+





-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+












-
+




-
+




-
+





-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+








}

- (void)setID: (OFString*)ID_
{
	OFString* old = ID;
	ID = [ID_ copy];
	[old release];
	[self addAttributeWithName: @"id" stringValue: ID];
	[self addAttributeWithName: @"id"
		       stringValue: ID];
}
@end

@implementation XMPPIQ
+ IQWithType: (OFString*)type_
	  ID: (OFString*)ID_
{
	return [[[self alloc] initWithType: type_
					ID: ID_] autorelease];
}

- initWithType: (OFString*)type_
	    ID: (OFString*)ID_
{
	if (!([type_ isEqual: @"get"] ||
	      [type_ isEqual: @"set"] ||
	      [type_ isEqual: @"result"] ||
	      [type_ isEqual: @"error"]))
		of_log(@"Invalid IQ type!");

	id ret;
	ret = [[[self alloc] initWithName: @"iq"] autorelease];
	[ret setType: type_];
	[ret setID: ID_];
	return [super initWithName: @"iq"
			     type: type_
			       ID: ID_];
	return ret;
}
@end

@implementation XMPPMessage
+ message
{
	return [self messageWithType: nil ID: nil];
	return [[[self alloc] init] autorelease];
}

+ messageWithID: (OFString*)ID_
{
	return [self messageWithType: nil ID: ID_];
	return [[[self alloc] initWithID: ID_] autorelease];
}

+ messageWithType: (OFString*)type_
{
	return [self messageWithType: type_ ID: nil];
	return [[[self alloc] initWithType: type_] autorelease];
}

+ messageWithType: (OFString*)type_
	       ID: (OFString*)ID_
{
	id ret;
	ret = [[[self alloc] initWithName: @"message"] autorelease];
	if (type_)
		[ret setType: type_];
	if (ID_)
		[ret setID: ID_];
	return ret;
	return [[[self alloc] initWithType: type_
					ID: ID_] autorelease];
}

- init
{
	return [self initWithType: nil
			       ID: nil];
}

- initWithID: (OFString*)ID_
{
	return [self initWithType: nil
			       ID: ID_];
}

- initWithType: (OFString*)type_
{
	return [self initWithType: type_
			       ID: nil];
}

- initWithType: (OFString*)type_
	    ID: (OFString*)ID_
{
	return [super initWithName: @"message"
			      type: type_
				ID: ID_];
}

- (void)addBody: (OFString*)body
{
	[self addChild: [OFXMLElement elementWithName: @"body"
					  stringValue: body]];
}
@end

@implementation XMPPPresence
+ presence
{
	return [self presenceWithType: nil ID: nil];
	return [[[self alloc] init] autorelease];
}

+ presenceWithID: (OFString*)ID_
{
	return [self presenceWithType: nil ID: ID_];
	return [[[self alloc] initWithID: ID_] autorelease];
}

+ presenceWithType: (OFString*)type_
{
	return [self presenceWithType: type_ ID: nil];
	return [[[self alloc] initWithType: type_] autorelease];
}

+ presenceWithType: (OFString*)type_
		ID: (OFString*)ID_
{
	id ret;
	ret = [[[self alloc] initWithName: @"presence"] autorelease];
	if (type_)
		[ret setType: type_];
	if (ID_)
		[ret setID: ID_];
	return ret;
	return [[[self alloc] initWithType: type_
					ID: ID_] autorelease];
}

- init
{
	return [self initWithType: nil
			       ID: nil];
}

- initWithID: (OFString*)ID_
{
	return [self initWithType: nil
			       ID: ID_];
}

- initWithType: (OFString*)type_
{
	return [self initWithType: type_
			       ID: nil];
}

- initWithType: (OFString*)type_
	    ID: (OFString*)ID_
{
	return [super initWithName: @"presence"
			      type: type_
				ID: ID_];
}

- (void)addShow: (OFString*)show
{
	[self addChild: [OFXMLElement elementWithName: @"show"
					  stringValue: show]];
}
︙