On Mon, Dec 01, 2003 at 08:14:32AM +0100, Dawid Szymanski wrote:
>
> Hello, I am running jabberd2 an trying to get GG transport working with it.
> What I have im sm.xml is:
>
> <items>
> <item category="gateway" type="x-gadugadu" jid="gg.im.lubin.edu.pl"
> name="GaduGadu Transport">
> <ns>jabber:iq:gateway</ns>
> <ns>jabber:iq:register</ns>
> <ns>jabber:iq:search</ns>
> <ns>jabber:iq:agent</ns>
> <ns>jabber:iq:browse</ns>
> </item>
> </items>
You don't need this as GG-Transport supports Disco.
> and in jggtrans.xml:
>
>
> <service jid="gg.im.lubin.edu.pl"/>
>
> <connect id="gglinker">
> <ip>213.25.76.72</ip>
> <port>5347</port>
> <secret>secret</secret>
> </connect>
That seems OK.
> Hint?
For jggtrans to work with jabberd2 you will also need the simple
attached patch (in CVS it is already applied).
Greets,
Jacek
diff -u -r1.91 -r1.92
--- ChangeLog 10 Sep 2003 09:11:54 -0000 1.91
+++ ChangeLog 14 Sep 2003 10:00:07 -0000 1.92
@@ -1,3 +1,11 @@
+2003-09-14 Jacek Konieczny <[EMAIL PROTECTED]>
+
+ * jggtrans.xml, jggtrans.xml.Pl:
+ - jabberd 2.0 configuration comments updates
+
+ * src/stream.c:
+ - jabberd 2.0 compatibility fix
+
2003-09-10 Jacek Konieczny <[EMAIL PROTECTED]>
* configure.ac: *** Version: 2.0.7 ***
diff -u -r1.18 -r1.19
--- jggtrans.xml 27 May 2003 08:51:58 -0000 1.18
+++ jggtrans.xml 14 Sep 2003 09:33:25 -0000 1.19
@@ -1,6 +1,6 @@
<jggtrans>
- <!-- For this to work, you should also update /etc/jabber/jabber.xml
+ <!-- For this to work with jabberd 1.4.x, you should also update
/etc/jabber/jabber.xml
Add the following (changed to your needs):
<browse>
@@ -33,9 +33,9 @@
<service jid="gg.localhost"/>
<!-- This connects the GG-transport process to the master process -->
- <connect id="gglinker">
+ <connect>
<ip>127.0.0.1</ip>
- <port>5353</port>
+ <port>5353</port> <!-- for jabberd 2.0 change to the router port (default: 5347)
-->
<secret>secret</secret>
</connect>
diff -u -r1.20 -r1.21
--- jggtrans.xml.Pl 27 May 2003 08:51:58 -0000 1.20
+++ jggtrans.xml.Pl 14 Sep 2003 09:33:25 -0000 1.21
@@ -6,7 +6,7 @@
<jggtrans>
- <!-- Ĺťeby to zadziaĹ?aĹ?o takĹźe plik jabber.xml musi byÄ? uaktualniony.
+ <!-- Ĺťeby to zadziaĹ?aĹ?o z jabberd 1.4.x takĹźe plik jabber.xml musi byÄ?
uaktualniony.
NaleĹźy dodaÄ? nastÄ?pujÄ?ce linie w sekcji <browse/>:
<item category="service" type="x-gadugadu" jid="gg.localhost" name="GaduGadu
Transport">
@@ -33,13 +33,14 @@
a secret na jakiĹ? dowolny ciÄ?g znakĂłw.
-->
- <!-- Ten wpis powinien zgadzaÄ? siÄ? z <service/> w sekcji <browse/> pliku
jabber.xml -->
+ <!-- Dla jabberd 1.4:
+ Ten wpis powinien zgadzaÄ? siÄ? z <service/> w sekcji <browse/> pliku
jabber.xml -->
<service jid="gg.localhost"/>
<!-- A ten, z <service id="gglinker/> -->
- <connect id="gglinker">
+ <connect>
<ip>127.0.0.1</ip>
- <port>5353</port>
+ <port>5353</port> <!-- Dla jabberd 2.0 zmieĹ? to na port routera (domyĹ?lnie:
5347) -->
<secret>secret</secret>
</connect>
diff -u -r1.20 -r1.21
--- src/stream.c 22 Apr 2003 08:44:29 -0000 1.20
+++ src/stream.c 14 Sep 2003 09:17:40 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: stream.c,v 1.20 2003/04/22 08:44:29 jajcus Exp $ */
+/* $Id: stream.c,v 1.21 2003/09/14 09:17:40 jajcus Exp $ */
/*
* (C) Copyright 2002 Jacek Konieczny <[EMAIL PROTECTED]>
@@ -29,6 +29,7 @@
#include "ggtrans.h"
#include "stream.h"
+#include "jabber.h"
#include "debug.h"
#define MAX_WRITE_BUF 102400
@@ -303,7 +304,7 @@
int stream_write_hello(Stream *s){
return stream_write_str(s,"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>")
|| stream_write_str(s,"<stream:stream to='")
- || stream_write_str(s,s->dest)
+ || stream_write_str(s,my_name)
|| stream_write_str(s,"' xmlns='jabber:component:accept'
xmlns:stream='http://etherx.jabber.org/streams'>");
};
