Author: ArcRiley
Date: 2009-01-08 15:14:53 -0500 (Thu, 08 Jan 2009)
New Revision: 1444

Modified:
   trunk/concordance/src/Core.h
Log:
 * consolidated CON_E_IQ CON_E_MESSAGE and CON_E_PRESENCE to CON_E_CLIENT
 * added session->efrom and session->eto for element routing


Modified: trunk/concordance/src/Core.h
===================================================================
--- trunk/concordance/src/Core.h        2009-01-08 06:59:24 UTC (rev 1443)
+++ trunk/concordance/src/Core.h        2009-01-08 20:14:53 UTC (rev 1444)
@@ -59,12 +59,10 @@
 
 
 enum conSessionState {
-  CON_E_CLOSE = 0,                  /* close </stream>      */
-  CON_E_OPEN,                       /* inside <stream>      */
-  CON_E_PRESENCE,                   /* <presence>           */
-  CON_E_MESSAGE,                    /* <message>            */
-  CON_E_IQ,                         /* <iq>                 */
-  CON_E_SASL,                       /* <auth> or <response> */
+  CON_E_CLOSE = 0,                  /* close </stream>           */
+  CON_E_OPEN,                       /* inside <stream>           */
+  CON_E_CLIENT,                     /* <iq> <message> <presence> */
+  CON_E_SASL,                       /* <auth> <response>         */
 };
 
 
@@ -76,10 +74,12 @@
   XML_Parser       pars;               /* expat parser for this session */
   gchar            host[256];          /* verified hostname or NULL */
   gboolean         tls;                /* flag for whether tls is enabled */
+  gint             state;              /* current session state */
+  gint             depth;              /* parser element depth */
   GString*         wbuff;              /* write buffer */
   GString*         ebuff;              /* element buffer */
-  gint             state;              /* current session state */
-  gint             depth;              /* parser element depth */
+  GString*         efrom;              /* JID of origin */
+  GString*         eto;                /* JID of destination */
 } conSession;
 
 PyTypeObject conCore_Type;

_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn

Reply via email to