Skip to content

O
Openfire
Commit 464be9c7 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

[GATE-84] Added list of ports to readme 

[GATE-79] Proper statuses should all be reflected now
[GATE-95] Logged out status should always be set on logout now
[GATE-75] Working on this, works from MSN now.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5721 b35dd754-fafc-0310-a699-88a17e54d16e
parent e9cdafae
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 18 deletions
src/plugins/gateway/readme.html
View file @ 464be9c7
......@@ -16,7 +16,7 @@ body, td, th {
font-size : 10pt;
}
pre, tt, code {
font-family : courier new, monospaced;
font-family : courier new, monospace;
font-size : 9pt;
}
#pageContainer {
......@@ -27,7 +27,6 @@ pre, tt, code {
border: 1px solid #999;
padding: 40px;
margin: 30px;
-moz-border-radius: 6px;
}
#pageHeader {
display: block;
......@@ -36,7 +35,6 @@ pre, tt, code {
background-color: #e7eaee;
border: 1px solid #cccccc;
border-bottom: none;
-moz-border-radius: 5px 5px 0px 0px;
margin: 10px 0px 0px 0px;
}
#pageBody {
......@@ -126,7 +124,7 @@ li {
padding-bottom : 4px;
}
tt {
font-family : courier new;
font-family : courier new, monospace;
font-weight : bold;
color : #060;
}
......@@ -222,6 +220,22 @@ hr {
registrations only. If a specific transport has any options, they will
be made available from the web interface.
</p>
<p>
If you have a firewall set up, you do not need to open any inbound ports.
However, you will need to make sure the following outgoing connections
will work based on the transport in question:
<ul>
<li>AIM: login.oscar.aol.com 5190</li>
<li>ICQ: login.oscar.aol.com 5190</li>
<li>IRC: currently irc.freenode.net 7000 (in the future this will be configurable)</li>
<li>MSN: messenger.hotmail.com 1863</li>
<li>Yahoo: scs.msg.yahoo.com 5050</li>
</ul>
</p>
<p>
There is additional documentation available at:
<a href="http://wiki.jivesoftware.org/display/WILDFIRE/IM+Gateway+Plugin">IM Gateway Plugin Wiki</a>
</p>
<h3>For end users:</h3>
<p>
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/irc/IRCSession.java
View file @ 464be9c7
......@@ -164,9 +164,18 @@ public class IRCSession extends TransportSession {
String awayMsg = ((IRCTransport)getTransport()).convertJabStatusToIRC(presenceType, verboseStatus);
if (awayMsg == null) {
conn.doAway();
Presence p = new Presence();
p.setTo(getJID());
p.setFrom(getTransport().getJID());
getTransport().sendPacket(p);
}
else {
conn.doAway(awayMsg);
Presence p = new Presence();
p.setShow(Presence.Show.away);
p.setTo(getJID());
p.setFrom(getTransport().getJID());
getTransport().sendPacket(p);
}
}
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/irc/IRCTransport.java
View file @ 464be9c7
......@@ -10,10 +10,7 @@
package org.jivesoftware.wildfire.gateway.protocols.irc;
import org.jivesoftware.wildfire.gateway.BaseTransport;
import org.jivesoftware.wildfire.gateway.TransportSession;
import org.jivesoftware.wildfire.gateway.Registration;
import org.jivesoftware.wildfire.gateway.PresenceType;
import org.jivesoftware.wildfire.gateway.*;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils;
import org.xmpp.packet.JID;
......@@ -99,6 +96,8 @@ public class IRCTransport extends BaseTransport {
Log.debug("Logging out of IRC gateway.");
((IRCSession)session).logOut();
// session.sessionDone();
// Just in case.
session.setLoginStatus(TransportLoginStatus.LOGGED_OUT);
}
/**
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNListener.java
View file @ 464be9c7
......@@ -143,6 +143,28 @@ public class MSNListener extends MsnAdapter {
msnSession.storeFriend(friend);
}
/**
* Someone added us to their contact list.
*/
public void contactAddedMe(MsnMessenger messenger, MsnContact friend) {
Presence p = new Presence();
p.setType(Presence.Type.subscribe);
p.setTo(msnSession.getJID());
p.setFrom(msnSession.getTransport().convertIDToJID(friend.getEmail().toString()));
msnSession.getTransport().sendPacket(p);
}
/**
* Someone removed us from their contact list.
*/
public void contactRemovedMe(MsnMessenger messenger, MsnContact friend) {
Presence p = new Presence();
p.setType(Presence.Type.unsubscribe);
p.setTo(msnSession.getJID());
p.setFrom(msnSession.getTransport().convertIDToJID(friend.getEmail().toString()));
msnSession.getTransport().sendPacket(p);
}
/**
* Owner status has changed.
*/
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/msn/MSNTransport.java
View file @ 464be9c7
......@@ -12,10 +12,7 @@ package org.jivesoftware.wildfire.gateway.protocols.msn;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.BaseTransport;
import org.jivesoftware.wildfire.gateway.PresenceType;
import org.jivesoftware.wildfire.gateway.Registration;
import org.jivesoftware.wildfire.gateway.TransportSession;
import org.jivesoftware.wildfire.gateway.*;
import org.xmpp.packet.JID;
import org.xmpp.packet.Presence;
import net.sf.jml.MsnUserStatus;
......@@ -101,6 +98,8 @@ public class MSNTransport extends BaseTransport {
Log.debug("Logging out of MSN gateway.");
((MSNSession)session).logOut();
// session.sessionDone();
// Just in case.
session.setLoginStatus(TransportLoginStatus.LOGGED_OUT);
}
/**
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/OSCARSession.java
View file @ 464be9c7
......@@ -445,9 +445,18 @@ public class OSCARSession extends TransportSession {
awayMsg = verboseStatus;
}
request(new SetInfoCmd(new InfoData(awayMsg, null, MY_CAPS, null)));
Presence p = new Presence();
p.setShow(Presence.Show.away);
p.setTo(getJID());
p.setFrom(getTransport().getJID());
getTransport().sendPacket(p);
}
else {
request(new SetInfoCmd(new InfoData(InfoData.NOT_AWAY, null, MY_CAPS, null)));
Presence p = new Presence();
p.setTo(getJID());
p.setFrom(getTransport().getJID());
getTransport().sendPacket(p);
}
this.presenceType = presenceType;
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/OSCARTransport.java
View file @ 464be9c7
......@@ -98,6 +98,8 @@ public class OSCARTransport extends BaseTransport {
public void registrationLoggedOut(TransportSession session) {
((OSCARSession)session).logOut();
// session.sessionDone();
// Just in case.
session.setLoginStatus(TransportLoginStatus.LOGGED_OUT);
}
}
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooSession.java
View file @ 464be9c7
......@@ -338,6 +338,22 @@ public class YahooSession extends TransportSession {
catch (Exception e) {
Log.error("Unable to set Yahoo Status:", e);
}
Presence p = new Presence();
if (presenceType == PresenceType.away) {
p.setShow(Presence.Show.away);
}
else if (presenceType == PresenceType.xa) {
p.setShow(Presence.Show.xa);
}
else if (presenceType == PresenceType.dnd) {
p.setShow(Presence.Show.dnd);
}
else if (presenceType == PresenceType.chat) {
p.setShow(Presence.Show.chat);
}
p.setTo(getJID());
p.setFrom(getTransport().getJID());
getTransport().sendPacket(p);
this.presenceType = presenceType;
this.verboseStatus = verboseStatus;
}
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooSessionListener.java
View file @ 464be9c7
......@@ -117,7 +117,7 @@ public class YahooSessionListener implements SessionListener {
* @see ymsg.network.event.SessionListener#friendAddedReceived(ymsg.network.event.SessionFriendEvent)
*/
public void friendAddedReceived(SessionFriendEvent event) {
Presence p = new Presence(Presence.Type.subscribed);
Presence p = new Presence(Presence.Type.subscribe);
p.setTo(yahooSession.getJID());
p.setFrom(yahooSession.getTransport().convertIDToJID(event.getFrom()));
yahooSession.getTransport().sendPacket(p);
......@@ -127,7 +127,7 @@ public class YahooSessionListener implements SessionListener {
* @see ymsg.network.event.SessionListener#friendRemovedReceived(ymsg.network.event.SessionFriendEvent)
*/
public void friendRemovedReceived(SessionFriendEvent event) {
Presence p = new Presence(Presence.Type.unsubscribed);
Presence p = new Presence(Presence.Type.unsubscribe);
p.setTo(yahooSession.getJID());
p.setFrom(yahooSession.getTransport().convertIDToJID(event.getFrom()));
yahooSession.getTransport().sendPacket(p);
......
src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/yahoo/YahooTransport.java
View file @ 464be9c7
......@@ -12,10 +12,7 @@ package org.jivesoftware.wildfire.gateway.protocols.yahoo;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.BaseTransport;
import org.jivesoftware.wildfire.gateway.PresenceType;
import org.jivesoftware.wildfire.gateway.Registration;
import org.jivesoftware.wildfire.gateway.TransportSession;
import org.jivesoftware.wildfire.gateway.*;
import org.xmpp.packet.JID;
import org.xmpp.packet.Presence;
import ymsg.network.StatusConstants;
......@@ -101,6 +98,8 @@ public class YahooTransport extends BaseTransport {
Log.debug("Logging out of Yahoo gateway.");
((YahooSession)session).logOut();
// session.sessionDone();
// Just in case.
session.setLoginStatus(TransportLoginStatus.LOGGED_OUT);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023