ObjXMPP  Check-in [b31637cfd1]

Overview
Comment:Avoid string duplication
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b31637cfd1da7d0b147b508f5777603fb3ed2b96bc2671604055b96e91f7a2cf
User & Date: js 2021-04-29 00:14:09
Context
2021-04-29
00:15
heap.zone -> nil.im Leaf check-in: ae703bd9ba user: js tags: trunk
00:14
Avoid string duplication check-in: b31637cfd1 user: js tags: trunk
00:06
Adjust to ObjFW style check-in: 9919057cb8 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/Makefile.

︙︙
25
26
27
28
29
30
31
32

33
34
35
36
37
38
39
40
41
42

       XMPPPLAINAuth.m		\
       XMPPPresence.m		\
       XMPPRoster.m		\
       XMPPRosterItem.m		\
       XMPPSCRAMAuth.m		\
       XMPPStanza.m		\
       XMPPStreamManagement.m	\
       XMPPXMLElementBuilder.m


INCLUDES = ${SRCS:.m=.h}	\
	   namespaces.h		\
	   ObjXMPP.h		\
	   XMPPStorage.h

include ../buildsys.mk

CPPFLAGS += -I..
LD = ${OBJC}








|
>


<








25
26
27
28
29
30
31
32
33
34
35

36
37
38
39
40
41
42

       XMPPPLAINAuth.m		\
       XMPPPresence.m		\
       XMPPRoster.m		\
       XMPPRosterItem.m		\
       XMPPSCRAMAuth.m		\
       XMPPStanza.m		\
       XMPPStreamManagement.m	\
       XMPPXMLElementBuilder.m	\
       namespaces.m

INCLUDES = ${SRCS:.m=.h}	\

	   ObjXMPP.h		\
	   XMPPStorage.h

include ../buildsys.mk

CPPFLAGS += -I..
LD = ${OBJC}
︙︙

Changes to src/XMPPConnection.m.

︙︙
634
635
636
637
638
639
640
641
642
643




644
645
646
647
648
649
650


	if (_language != nil)
		langString = [OFString stringWithFormat: @"xml:lang='%@' ",
							 _language];

	[_socket writeFormat: @"<?xml version='1.0'?>\n"
			      @"<stream:stream to='%@' "
			      @"xmlns='" XMPPClientNS @"' "
			      @"xmlns:stream='" XMPPStreamNS @"' %@"
			      @"version='1.0'>", _domain, langString];





	_streamOpen = true;
}

- (void)close
{
	if (_streamOpen)








|
|
|
>
>
>
>








634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654


	if (_language != nil)
		langString = [OFString stringWithFormat: @"xml:lang='%@' ",
							 _language];

	[_socket writeFormat: @"<?xml version='1.0'?>\n"
			      @"<stream:stream to='%@' "
			      @"xmlns='%@' "
			      @"xmlns:stream='%@' %@"
			      @"version='1.0'>",
			      _domain, 
			      XMPPClientNS,
			      XMPPStreamNS,
			      langString];

	_streamOpen = true;
}

- (void)close
{
	if (_streamOpen)
︙︙

Changes to src/namespaces.h.

︙︙
16
17
18
19
20
21
22

23

24
25
26
27
28
29
30
31
32
33
34
35
36
37

 * 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.
 */


#define XMPPBindNS @"urn:ietf:params:xml:ns:xmpp-bind"

#define XMPPCapsNS @"http://jabber.org/protocol/caps"
#define XMPPClientNS @"jabber:client"
#define XMPPDiscoInfoNS @"http://jabber.org/protocol/disco#info"
#define XMPPDiscoItemsNS @"http://jabber.org/protocol/disco#items"
#define XMPPMUCNS @"http://jabber.org/protocol/muc"
#define XMPPRosterNS @"jabber:iq:roster"
#define XMPPRosterVerNS @"urn:xmpp:features:rosterver"
#define XMPPSASLNS @"urn:ietf:params:xml:ns:xmpp-sasl"
#define XMPPSessionNS @"urn:ietf:params:xml:ns:xmpp-session"
#define XMPPSMNS @"urn:xmpp:sm:3"
#define XMPPStanzasNS @"urn:ietf:params:xml:ns:xmpp-stanzas"
#define XMPPStartTLSNS @"urn:ietf:params:xml:ns:xmpp-tls"
#define XMPPStreamNS @"http://etherx.jabber.org/streams"
#define XMPPXMPPStreamNS @"urn:ietf:params:xml:ns:xmpp-streams"








>
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|

16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

 * 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 <ObjFW/ObjFW.h>

extern OFString *const XMPPBindNS;
extern OFString *const XMPPCapsNS;
extern OFString *const XMPPClientNS;
extern OFString *const XMPPDiscoInfoNS;
extern OFString *const XMPPDiscoItemsNS;
extern OFString *const XMPPMUCNS;
extern OFString *const XMPPRosterNS;
extern OFString *const XMPPRosterVerNS;
extern OFString *const XMPPSASLNS;
extern OFString *const XMPPSessionNS;
extern OFString *const XMPPSMNS;
extern OFString *const XMPPStanzasNS;
extern OFString *const XMPPStartTLSNS;
extern OFString *const XMPPStreamNS;
extern OFString *const XMPPXMPPStreamNS;

Added src/namespaces.m. 

















































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>

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

/*
 * Copyright (c) 2011, 2021, Jonathan Schleifer <js@nil.im>
 *
 * https://heap.zone/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 "namespaces.h"

OFString *const XMPPBindNS = @"urn:ietf:params:xml:ns:xmpp-bind";
OFString *const XMPPCapsNS = @"http://jabber.org/protocol/caps";
OFString *const XMPPClientNS = @"jabber:client";
OFString *const XMPPDiscoInfoNS = @"http://jabber.org/protocol/disco#info";
OFString *const XMPPDiscoItemsNS = @"http://jabber.org/protocol/disco#items";
OFString *const XMPPMUCNS = @"http://jabber.org/protocol/muc";
OFString *const XMPPRosterNS = @"jabber:iq:roster";
OFString *const XMPPRosterVerNS = @"urn:xmpp:features:rosterver";
OFString *const XMPPSASLNS = @"urn:ietf:params:xml:ns:xmpp-sasl";
OFString *const XMPPSessionNS = @"urn:ietf:params:xml:ns:xmpp-session";
OFString *const XMPPSMNS = @"urn:xmpp:sm:3";
OFString *const XMPPStanzasNS = @"urn:ietf:params:xml:ns:xmpp-stanzas";
OFString *const XMPPStartTLSNS = @"urn:ietf:params:xml:ns:xmpp-tls";
OFString *const XMPPStreamNS = @"http://etherx.jabber.org/streams";
OFString *const XMPPXMPPStreamNS = @"urn:ietf:params:xml:ns:xmpp-streams";