![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 0429a172f5f3019d38b41e1503c4164c81e077e3..f5ce69e0b04a7438c7db3e93790e3dce373e717c 100644 (file)
#endif
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
#include <openssl/ssl.h>
#include <openssl/err.h>
#endif
static void hash(unsigned char *dataIn,
unsigned long len, unsigned char *digest);
- static DOMString hashHex(unsigned char *dataIn, unsigned long len);
+ static DOMString Md5::hashHex(unsigned char *dataIn, unsigned long len);
/**
* Initialize the context (also zeroizes contents)
{
do
{
- unsigned long t = (unsigned long)
+ unsigned long t = (unsigned long)
((unsigned) buf[3] << 8 | buf[2]) << 16 |
((unsigned) buf[1] << 8 | buf[0]);
*(unsigned long *) buf = t;
{}
virtual ~Runnable()
{}
-
+
/**
* The method of a delegate class which can
* be run by a Thread. Thread is completed when this
{
Thread *thread = (Thread *)context;
thread->execute();
+ return 0;
}
unsigned long receiveTimeout;
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
SSL_CTX *sslContext;
SSL *sslStream;
#endif
}
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
static void cryptoLockCallback(int mode, int type, const char *file, int line)
{
#ifdef __WIN32__
WORD wVersionRequested = MAKEWORD( 2, 2 );
WSADATA wsaData;
- int err = WSAStartup( wVersionRequested, &wsaData );
+ WSAStartup( wVersionRequested, &wsaData );
#endif
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
sslStream = NULL;
sslContext = NULL;
CRYPTO_set_locking_callback(cryptoLockCallback);
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
/*
static int password_cb(char *buf, int bufLen, int rwflag, void *userdata)
{
bool TcpSocket::startTls()
{
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
sslStream = NULL;
sslContext = NULL;
}
sslEnabled = true;
-#endif /*WITH_SSL*/
+#endif /*HAVE_SSL*/
return true;
}
{
bool ret = true;
connected = false;
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
if (sslEnabled)
{
if (sslStream)
}
sslStream = NULL;
sslContext = NULL;
-#endif /*WITH_SSL*/
+#endif /*HAVE_SSL*/
#ifdef __WIN32__
closesocket(sock);
#endif
if (count<=0 && sslEnabled)
{
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
return SSL_pending(sslStream);
#endif
}
if (sslEnabled)
{
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
int r = SSL_write(sslStream, &c, 1);
if (r<=0)
{
printf("write(str): socket closed\n");
return false;
}
- unsigned char *s = (unsigned char *)str;
int len = strlen(str);
if (sslEnabled)
{
-#ifdef WITH_SSL
- int r = SSL_write(sslStream, s, len);
+#ifdef HAVE_SSL
+ int r = SSL_write(sslStream, (unsigned char *)str, len);
if (r<=0)
{
switch(SSL_get_error(sslStream, r))
}
else
{
- if (send(sock, s, len, 0) < 0)
+ if (send(sock, str, len, 0) < 0)
//if (send(sock, &c, 1, 0) < 0)
{
printf("write: could not send data\n");
unsigned char ch;
if (sslEnabled)
{
-#ifdef WITH_SSL
+#ifdef HAVE_SSL
if (!sslStream)
return -1;
int r = SSL_read(sslStream, &ch, 1);
}
-static DOMString toXml(const DOMString &str)
+DOMString XmppClient::toXml(const DOMString &str)
{
return Parser::encode(str);
}
-static bool getGroupIds(const DOMString &jid,
- DOMString &groupJid, DOMString &userNick)
+static bool parseJid(const DOMString &fullJid,
+ DOMString &jid, DOMString &resource)
{
- int p = strIndex(jid, "/");
+ int p = strIndex(fullJid, "/");
if (p < 0)
{
- groupJid = jid;
- userNick = "";
+ jid = fullJid;
+ resource = "";
return true;
}
- groupJid = jid.substr(0, p);
- userNick = jid.substr(p+1, jid.size()-p-1);
+ jid = fullJid.substr(0, p);
+ resource = fullJid.substr(p+1, fullJid.size()-p-1);
return true;
}
{
DOMString fromGid;
DOMString fromNick;
- getGroupIds(from, fromGid, fromNick);
+ parseJid(from, fromGid, fromNick);
//printf("fromGid:%s fromNick:%s\n",
// fromGid.c_str(), fromNick.c_str());
DOMString toGid;
DOMString toNick;
- getGroupIds(to, toGid, toNick);
+ parseJid(to, toGid, toNick);
//printf("toGid:%s toNick:%s\n",
// toGid.c_str(), toNick.c_str());
bool XmppClient::processPresence(Element *root)
{
- DOMString from = root->getTagAttribute("presence", "from");
+ DOMString fullJid = root->getTagAttribute("presence", "from");
DOMString to = root->getTagAttribute("presence", "to");
DOMString presenceStr = root->getTagAttribute("presence", "type");
bool presence = true;
{
DOMString fromGid;
DOMString fromNick;
- getGroupIds(from, fromGid, fromNick);
+ parseJid(fullJid, fromGid, fromNick);
//printf("fromGid:%s fromNick:%s\n",
// fromGid.c_str(), fromNick.c_str());
DOMString item_jid = root->getTagAttribute("item", "jid");
if (presence)
{
groupChatCreate(fromGid);
- groupChatUserAdd(fromGid, fromNick);
+ groupChatUserAdd(fromGid, fromNick, "");
+ groupChatUserShow(fromGid, fromNick, "available");
XmppEvent event(XmppEvent::EVENT_MUC_JOIN);
event.setGroup(fromGid);
dispatchXmppEvent(event);
}
}
- else
+ else // someone else
{
if (presence)
- groupChatUserAdd(fromGid, fromNick);
+ {
+ groupChatUserAdd(fromGid, fromNick, "");
+ }
else
- groupChatUserDelete(fromGid, fromNick);
+ groupChatUserDelete(fromGid, fromNick);
+ groupChatUserShow(fromGid, fromNick, show);
XmppEvent event(XmppEvent::EVENT_MUC_PRESENCE);
event.setGroup(fromGid);
event.setFrom(fromNick);
}
else
{
+ DOMString shortJid;
+ DOMString dummy;
+ parseJid(fullJid, shortJid, dummy);
+ rosterShow(shortJid, show); //users in roster do not have resource
+
XmppEvent event(XmppEvent::EVENT_PRESENCE);
- event.setFrom(from);
+ event.setFrom(fullJid);
event.setPresence(presence);
event.setShow(show);
event.setStatus(status);
//We are now done with the synchronous handshaking. Let's go into
//async mode
- fmt =
- "<presence/>\n";
- if (!write(fmt))
- return false;
-
fmt =
"<iq type='get' id='roster%d'><query xmlns='jabber:iq:roster'/></iq>\n";
if (!write(fmt, msgId++))
if (!write(fmt, msgId++, realm.c_str()))
return false;
+ fmt =
+ "<presence/>\n";
+ if (!write(fmt))
+ return false;
+
/*
recbuf = readStanza();
status("stream received: '%s'", recbuf.c_str());
return ros;
}
+void XmppClient::rosterShow(const DOMString &jid, const DOMString &show)
+{
+ DOMString theShow = show;
+ if (theShow == "")
+ theShow = "available";
+
+ std::vector<XmppUser>::iterator iter;
+ for (iter=roster.begin() ; iter != roster.end() ; iter++)
+ {
+ if (iter->jid == jid)
+ iter->show = theShow;
+ }
+}
+
//#######################
//# CHAT (individual)
//#######################
*
*/
void XmppClient::groupChatUserAdd(const DOMString &groupJid,
- const DOMString &nick)
+ const DOMString &nick,
+ const DOMString &jid)
+{
+ std::vector<XmppGroupChat *>::iterator iter;
+ for (iter=groupChats.begin() ; iter!=groupChats.end() ; iter++)
+ {
+ if ((*iter)->getGroupJid() == groupJid)
+ {
+ (*iter)->userAdd(nick, jid);
+ }
+ }
+}
+
+/**
+ *
+ */
+void XmppClient::groupChatUserShow(const DOMString &groupJid,
+ const DOMString &nick,
+ const DOMString &show)
{
std::vector<XmppGroupChat *>::iterator iter;
for (iter=groupChats.begin() ; iter!=groupChats.end() ; iter++)
{
if ((*iter)->getGroupJid() == groupJid)
{
- (*iter)->userAdd("", nick);
+ (*iter)->userShow(nick, show);
}
}
}
{
if ((*iter)->getGroupJid() == groupJid)
{
- (*iter)->userDelete("", nick);
+ (*iter)->userDelete(nick);
}
}
}
}
-void XmppGroupChat::userAdd(const DOMString &jid, const DOMString &nick)
+void XmppGroupChat::userAdd(const DOMString &nick,
+ const DOMString &jid)
{
std::vector<XmppUser>::iterator iter;
for (iter= userList.begin() ; iter!=userList.end() ; iter++)
userList.push_back(user);
}
-void XmppGroupChat::userDelete(const DOMString &jid, const DOMString &nick)
+void XmppGroupChat::userShow(const DOMString &nick,
+ const DOMString &show)
+{
+ DOMString theShow = show;
+ if (theShow == "")
+ theShow = "available"; // a join message will now have a show
+ std::vector<XmppUser>::iterator iter;
+ for (iter= userList.begin() ; iter!=userList.end() ; iter++)
+ {
+ if (iter->nick == nick)
+ iter->show = theShow;
+ }
+}
+
+void XmppGroupChat::userDelete(const DOMString &nick)
{
std::vector<XmppUser>::iterator iter;
for (iter= userList.begin() ; iter!=userList.end() ; )