Author: ArcRiley
Date: 2009-02-27 12:38:55 -0500 (Fri, 27 Feb 2009)
New Revision: 1536
Modified:
trunk/concordance/include/concordance.h
trunk/concordance/include/concordance.sockets.h
trunk/concordance/src/sockets/Client.c
trunk/concordance/src/sockets/Socket.c
Log:
further cleanup, each session now owns their own return queue
Modified: trunk/concordance/include/concordance.h
===================================================================
--- trunk/concordance/include/concordance.h 2009-02-27 17:38:51 UTC (rev
1535)
+++ trunk/concordance/include/concordance.h 2009-02-27 17:38:55 UTC (rev
1536)
@@ -52,17 +52,11 @@
typedef struct {
PyObject* self;
gchar* method;
- GAsyncQueue* queueReturn; /* callback queue output */
+ GAsyncQueue* queueReturn; /* callback return queue */
GString* message;
} concordCore_QueueMsg;
-
typedef struct {
- GSource base;
- PyObject* self;
-} concordCore_QueueSource;
-
-typedef struct {
guint major;
guint minor;
} concordVersion;
Modified: trunk/concordance/include/concordance.sockets.h
===================================================================
--- trunk/concordance/include/concordance.sockets.h 2009-02-27 17:38:51 UTC
(rev 1535)
+++ trunk/concordance/include/concordance.sockets.h 2009-02-27 17:38:55 UTC
(rev 1536)
@@ -41,8 +41,7 @@
GMainContext* context; /* Concordance's Glib context */
Gsasl* saslCntx; /* Concordance's SASL context */
GAsyncQueue* queueCall; /* callback queue input (global) */
- GAsyncQueue* queueXMPP; /* callback queue output for XMPP */
- GAsyncQueue* queueSASL; /* callback queue output for SASL */
+ GAsyncQueue* queueSasl; /* callback queue output for SASL */
GHashTable* domains; /* domain->service lookup */
const gchar* addr;
gushort port;
@@ -83,6 +82,7 @@
GString* ebuff; /* element buffer */
GString* efrom; /* JID of origin */
GString* eto; /* JID of destination */
+ GAsyncQueue* queue; /* callback return queue for XMPP */
} socketsClient_Data;
typedef struct {
PyTypeObject base;
Modified: trunk/concordance/src/sockets/Client.c
===================================================================
--- trunk/concordance/src/sockets/Client.c 2009-02-27 17:38:51 UTC (rev
1535)
+++ trunk/concordance/src/sockets/Client.c 2009-02-27 17:38:55 UTC (rev
1536)
@@ -121,6 +121,12 @@
session->efrom = g_string_new(""); /* element origin */
session->eto = g_string_new(""); /* element destination */
+ /* create callback return queue for XMPP messages
+
+ GAsyncQueue* g_async_queue_new (void);
+ */
+ session->queue = g_async_queue_new();
+
/* initialize session state */
session->state = CONCORD_E_OPEN;
session->depth = 0;
Modified: trunk/concordance/src/sockets/Socket.c
===================================================================
--- trunk/concordance/src/sockets/Socket.c 2009-02-27 17:38:51 UTC (rev
1535)
+++ trunk/concordance/src/sockets/Socket.c 2009-02-27 17:38:55 UTC (rev
1536)
@@ -288,12 +288,11 @@
self->queueCall = ((concordGlobals*)
PyModule_GetState(state->_core))->queueCall;
- /* create callback return queues
+ /* create callback return queue for SASL authentication
GAsyncQueue* g_async_queue_new (void);
*/
- self->queueXMPP = g_async_queue_new();
- self->queueSASL = g_async_queue_new();
+ self->queueSasl = g_async_queue_new();
/* create new domains hashtable
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
