projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5317e7
)
* cosmetic changes
author
Art Cancro
<ajc@citadel.org>
Mon, 3 May 2010 15:31:33 +0000
(15:31 +0000)
committer
Art Cancro
<ajc@citadel.org>
Mon, 3 May 2010 15:31:33 +0000
(15:31 +0000)
citadel/modules/xmpp/serv_xmpp.c
patch
|
blob
|
history
diff --git
a/citadel/modules/xmpp/serv_xmpp.c
b/citadel/modules/xmpp/serv_xmpp.c
index 682fdb2c44a854971cfcdff633124570a859be71..bab30ab7f9ada500861c0bf5fcde5452b9250abb 100644
(file)
--- a/
citadel/modules/xmpp/serv_xmpp.c
+++ b/
citadel/modules/xmpp/serv_xmpp.c
@@
-476,22
+476,22
@@
void xmpp_greeting(void) {
/*
* Main command loop for XMPP sessions.
/*
* Main command loop for XMPP sessions.
+ * Right now we're reading one byte at a time and sending it to the XML parser.
+ * There's got to be a better way to do this.
*/
void xmpp_command_loop(void) {
*/
void xmpp_command_loop(void) {
- char cmdbuf[
16
];
+ char cmdbuf[
2
];
int retval;
time(&CC->lastcmd);
int retval;
time(&CC->lastcmd);
- memset(cmdbuf, 0, sizeof cmdbuf);
/* Clear it, just in case */
+ memset(cmdbuf, 0, sizeof cmdbuf);
retval = client_read(cmdbuf, 1);
if (retval != 1) {
retval = client_read(cmdbuf, 1);
if (retval != 1) {
- CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\
r\
n");
+ CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\n");
CC->kill_me = 1;
return;
}
CC->kill_me = 1;
return;
}
- /* FIXME ... this is woefully inefficient. */
-
XML_Parse(XMPP->xp, cmdbuf, 1, 0);
}
XML_Parse(XMPP->xp, cmdbuf, 1, 0);
}
@@
-532,7
+532,8
@@
CTDL_MODULE_INIT(xmpp)
xmpp_greeting,
xmpp_command_loop,
xmpp_async_loop,
xmpp_greeting,
xmpp_command_loop,
xmpp_async_loop,
- CitadelServiceXMPP);
+ CitadelServiceXMPP
+ );
CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP);
CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN);
CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP);
CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN);
CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);