![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/pedro/pedroxmpp.h b/src/pedro/pedroxmpp.h
index 502dd1f082cd085b4307f9bd7546a29e586beb92..ee3234fd4a69e8778c3ab9bd3c6333637102ec74 100644 (file)
--- a/src/pedro/pedroxmpp.h
+++ b/src/pedro/pedroxmpp.h
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2007 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*/
#include <stdio.h>
+#include <glib.h>
#include <vector>
+#include <map>
#include <string>
*/
static const int EVENT_DISCONNECTED = 11;
+ /**
+ * Client has begun speaking to the server in SSL. This is usually
+ * emitted just before EVENT_CONNECTED, since authorization has not
+ * yet taken place.
+ */
+ static const int EVENT_SSL_STARTED = 12;
+
/**
* Client has successfully registered a new account on a server.
* The server is in getFrom(), the user in getTo()
static const int EVENT_REGISTRATION_NEW = 20;
/**
- * Client has successfully modified an existing account on a server.
+ * Client has successfully changed the password of an existing account on a server.
* The server is in getFrom(), the user in getTo()
*/
- static const int EVENT_REGISTRATION_MODIFY = 21;
+ static const int EVENT_REGISTRATION_CHANGE_PASS = 21;
/**
* Client has successfully cancelled an existing account on a server.
/**
* Assignment
*/
- XmppEventListener(const XmppEventListener &other)
+ XmppEventListener(const XmppEventListener &/*other*/)
{}
* event handling. Use event.getType() to decide what to do
* with the event.
*/
- virtual void processXmppEvent(const XmppEvent &event)
+ virtual void processXmppEvent(const XmppEvent &/*event*/)
{}
};
/**
* Send an error message to all subscribers
*/
- void error(char *fmt, ...);
+ void error(const char *fmt, ...) G_GNUC_PRINTF(2,3);
/**
* Send a status message to all subscribers
*/
- void status(char *fmt, ...);
+ void status(const char *fmt, ...) G_GNUC_PRINTF(2,3);
//###########################
//# LISTENERS
std::vector<XmppEvent> eventQueue;
bool eventQueueEnabled;
-
- static const int targetWriteBufLen = 2048;
-
- char targetWriteBuf[targetWriteBufLen];
};
/**
*
*/
- virtual bool write(char *fmt, ...);
+ virtual bool write(const char *fmt, ...) G_GNUC_PRINTF(2,3);
//#######################
//# V A R I A B L E S
/**
*
*/
- virtual DOMString getJid()
- { return jid; }
+ virtual void setJid(const DOMString &val)
+ { jid = val; }
/**
*
*/
- virtual int getMsgId()
- { return msgId++; }
+ virtual DOMString getJid()
+ { return jid; }
- /**
- *
- */
- virtual void setDoRegister(bool val)
- { doRegister = val; }
/**
*
*/
- virtual bool getDoRegister()
- { return doRegister; }
+ virtual int getMsgId()
+ { return msgId++; }
*/
virtual void rosterShow(const DOMString &jid, const DOMString &show);
+ //#######################
+ //# REGISTRATION
+ //#######################
+
+ /**
+ * Set whether the client should to in-band registration
+ * before authentication. Causes inBandRegistrationNew() to be called
+ * synchronously, before async is started.
+ */
+ virtual void setDoRegister(bool val)
+ { doRegister = val; }
+
+ /**
+ * Change the password of an existing account with a server
+ */
+ bool inBandRegistrationChangePassword(const DOMString &newPassword);
+
+ /**
+ * Cancel an existing account with a server
+ */
+ bool inBandRegistrationCancel();
+
+
//#######################
//# CHAT (individual)
//#######################
*
*/
virtual std::vector<XmppUser>
- XmppClient::groupChatGetUserList(const DOMString &groupJid);
+ groupChatGetUserList(const DOMString &groupJid);
/**
*
/**
*
*/
- virtual int outputStreamOpen(const DOMString &jid,
+ virtual bool outputStreamOpen(const DOMString &jid,
const DOMString &streamId);
/**
*
*/
- virtual int outputStreamWrite(int streamId,
- const unsigned char *buf, unsigned long len);
+ virtual bool outputStreamWrite(const DOMString &streamId,
+ const std::vector<unsigned char> &buf);
/**
*
*/
- virtual int outputStreamClose(int streamId);
+ virtual bool outputStreamClose(const DOMString &streamId);
/**
*
*/
- virtual int inputStreamOpen(const DOMString &jid,
+ virtual bool inputStreamOpen(const DOMString &jid,
const DOMString &streamId,
const DOMString &iqId);
/**
*
*/
- virtual int inputStreamAvailable(int streamId);
-
- /**
- *
- */
- virtual std::vector<unsigned char> inputStreamRead(int streamId);
-
- /**
- *
- */
- virtual bool inputStreamClosing(int streamId);
-
- /**
- *
- */
- virtual int inputStreamClose(int streamId);
+ virtual bool inputStreamClose(const DOMString &streamId);
//#######################
bool saslPlainAuthenticate();
- bool saslAuthenticate();
+ bool saslAuthenticate(const DOMString &streamId);
bool iqAuthenticate(const DOMString &streamId);
/**
- * Register a new account with a server
+ * Register a new account with a server. Not done by user
*/
bool inBandRegistrationNew();
- /**
- * Modify an existing account with a server
- */
- bool inBandRegistrationModify();
-
- /**
- * Cancel an existing account with a server
- */
- bool inBandRegistrationCancel();
-
bool keepGoing;
bool doRegister;
- static const int writeBufLen = 2048;
+ std::vector<XmppGroupChat *>groupChats;
- unsigned char writeBuf[writeBufLen];
+ //#### Roster
+ std::vector<XmppUser>roster;
- std::vector<XmppGroupChat *>groupChats;
- static const int outputStreamCount = 16;
+ //#### Streams
+
+ bool processInBandByteStreamMessage(Element *root);
+
+ DOMString streamPacket;
- XmppStream *outputStreams[outputStreamCount];
+ std::map<DOMString, XmppStream *> outputStreams;
- static const int inputStreamCount = 16;
+ std::map<DOMString, XmppStream *> inputStreams;
- XmppStream *inputStreams[inputStreamCount];
- static const int fileSendCount = 16;
+ //#### File send
+
+ bool processFileMessage(Element *root);
- XmppStream *fileSends[fileSendCount];
+ std::map<DOMString, XmppStream *> fileSends;
- std::vector<XmppUser>roster;
};