X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fpedro%2Fpedroxmpp.h;h=ee3234fd4a69e8778c3ab9bd3c6333637102ec74;hb=18023a6d3838bec98725b5a745bd29350bb9e337;hp=a2fbd87a29df615c6bd53ef6da1536dec4e1a742;hpb=40f5f2a25537d1ba72c1510b3627f4ad310ff5f5;p=inkscape.git

diff --git a/src/pedro/pedroxmpp.h b/src/pedro/pedroxmpp.h
index a2fbd87a2..ee3234fd4 100644
--- a/src/pedro/pedroxmpp.h
+++ b/src/pedro/pedroxmpp.h
@@ -6,7 +6,7 @@
  * 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
@@ -24,7 +24,9 @@
  */
 
 #include <stdio.h>
+#include <glib.h>
 #include <vector>
+#include <map>
 
 #include <string>
 
@@ -503,7 +505,7 @@ public:
     /**
      *  Assignment
      */
-    XmppEventListener(const XmppEventListener &other)
+    XmppEventListener(const XmppEventListener &/*other*/)
         {}
 
 
@@ -518,7 +520,7 @@ public:
      *  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*/)
         {}
 
 };
@@ -565,13 +567,13 @@ public:
     /**
      * 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
@@ -628,10 +630,6 @@ private:
 
     std::vector<XmppEvent> eventQueue;
     bool eventQueueEnabled;
-
-    static const int targetWriteBufLen = 2048;
-
-    char targetWriteBuf[targetWriteBufLen];
 };
 
 
@@ -724,7 +722,7 @@ public:
     /**
      *
      */
-    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
@@ -1027,46 +1025,31 @@ public:
     /**
      *
      */
-    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);
 
 
     //#######################
@@ -1147,7 +1130,7 @@ private:
 
     bool saslPlainAuthenticate();
 
-    bool saslAuthenticate();
+    bool saslAuthenticate(const DOMString &streamId);
 
     bool iqAuthenticate(const DOMString &streamId);
 
@@ -1160,25 +1143,29 @@ private:
 
     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;
 };