From 131b59b3ca3c8368c6ad179ef7fb9cc02e99ede4 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 22 Feb 2010 18:30:51 +0000 Subject: [PATCH] * Renamed the 'jabber' module to 'xmpp' module. Also renamed functions starting with jabber_ to xmpp_ . Obviously I did *not* rename any of the XML namespaces because that would break the protocol. --- citadel/modules/{jabber => xmpp}/serv_xmpp.c | 12 ++++++------ citadel/modules/{jabber => xmpp}/serv_xmpp.h | 10 +++++----- citadel/modules/{jabber => xmpp}/xmpp_messages.c | 4 ++-- citadel/modules/{jabber => xmpp}/xmpp_presence.c | 11 +++++------ .../modules/{jabber => xmpp}/xmpp_query_namespace.c | 8 ++++---- citadel/modules/{jabber => xmpp}/xmpp_queue.c | 0 citadel/modules/{jabber => xmpp}/xmpp_sasl_service.c | 2 +- 7 files changed, 23 insertions(+), 24 deletions(-) rename citadel/modules/{jabber => xmpp}/serv_xmpp.c (98%) rename citadel/modules/{jabber => xmpp}/serv_xmpp.h (91%) rename citadel/modules/{jabber => xmpp}/xmpp_messages.c (96%) rename citadel/modules/{jabber => xmpp}/xmpp_presence.c (93%) rename citadel/modules/{jabber => xmpp}/xmpp_query_namespace.c (96%) rename citadel/modules/{jabber => xmpp}/xmpp_queue.c (100%) rename citadel/modules/{jabber => xmpp}/xmpp_sasl_service.c (97%) diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c similarity index 98% rename from citadel/modules/jabber/serv_xmpp.c rename to citadel/modules/xmpp/serv_xmpp.c index 7f37e5acd..0b7da46e9 100644 --- a/citadel/modules/jabber/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -274,7 +274,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { && (!strcasecmp(XMPP->iq_query_xmlns, "jabber:iq:auth:query")) ) { - jabber_non_sasl_authenticate( + xmpp_non_sasl_authenticate( XMPP->iq_id, XMPP->iq_client_username, XMPP->iq_client_password, @@ -350,7 +350,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { /* Respond to a update by firing back with presence information * on the entire wholist. Check this assumption, it's probably wrong. */ - jabber_wholist_presence_dump(); + xmpp_wholist_presence_dump(); } else if ( (!strcasecmp(el, "body")) && (XMPP->html_tag_level == 0) ) { @@ -364,7 +364,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { } else if (!strcasecmp(el, "message")) { - jabber_send_message(XMPP->message_to, XMPP->message_body); + xmpp_send_message(XMPP->message_to, XMPP->message_body); XMPP->html_tag_level = 0; } @@ -439,7 +439,7 @@ void xmpp_cleanup_function(void) { * Here's where our XMPP session begins its happy day. */ void xmpp_greeting(void) { - strcpy(CC->cs_clientname, "Jabber session"); + strcpy(CC->cs_clientname, "XMPP session"); CC->session_specific_data = malloc(sizeof(struct citxmpp)); memset(XMPP, 0, sizeof(struct citxmpp)); XMPP->last_event_processed = queue_event_seq; @@ -488,7 +488,7 @@ void xmpp_command_loop(void) { */ void xmpp_async_loop(void) { xmpp_process_events(); - jabber_output_incoming_messages(); + xmpp_output_incoming_messages(); } @@ -510,7 +510,7 @@ void xmpp_logout_hook(void) { const char *CitadelServiceXMPP="XMPP"; -CTDL_MODULE_INIT(jabber) +CTDL_MODULE_INIT(xmpp) { if (!threading) { CtdlRegisterServiceHook(config.c_xmpp_c2s_port, diff --git a/citadel/modules/jabber/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h similarity index 91% rename from citadel/modules/jabber/serv_xmpp.h rename to citadel/modules/xmpp/serv_xmpp.h index f7d9e1452..dedc599ef 100644 --- a/citadel/modules/jabber/serv_xmpp.h +++ b/citadel/modules/xmpp/serv_xmpp.h @@ -73,11 +73,11 @@ void xmpp_async_loop(void); void xmpp_sasl_auth(char *, char *); void xmpp_output_auth_mechs(void); void xmpp_query_namespace(char *, char *, char *, char *); -void jabber_wholist_presence_dump(void); -void jabber_output_incoming_messages(void); +void xmpp_wholist_presence_dump(void); +void xmpp_output_incoming_messages(void); void xmpp_queue_event(int, char *); void xmpp_process_events(void); void xmpp_presence_notify(char *, int); -void jabber_roster_item(struct CitContext *); -void jabber_send_message(char *, char *); -void jabber_non_sasl_authenticate(char *, char *, char *, char *); +void xmpp_roster_item(struct CitContext *); +void xmpp_send_message(char *, char *); +void xmpp_non_sasl_authenticate(char *, char *, char *, char *); diff --git a/citadel/modules/jabber/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c similarity index 96% rename from citadel/modules/jabber/xmpp_messages.c rename to citadel/modules/xmpp/xmpp_messages.c index 405856e92..5ea435d4a 100644 --- a/citadel/modules/jabber/xmpp_messages.c +++ b/citadel/modules/xmpp/xmpp_messages.c @@ -64,7 +64,7 @@ * If the client session has instant messages waiting, it outputs * unsolicited XML stanzas containing them. */ -void jabber_output_incoming_messages(void) { +void xmpp_output_incoming_messages(void) { struct ExpressMessage *ptr; @@ -91,7 +91,7 @@ void jabber_output_incoming_messages(void) { /* * Client is sending a message. */ -void jabber_send_message(char *message_to, char *message_body) { +void xmpp_send_message(char *message_to, char *message_body) { char *recp = NULL; int message_sent = 0; struct CitContext *cptr; diff --git a/citadel/modules/jabber/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c similarity index 93% rename from citadel/modules/jabber/xmpp_presence.c rename to citadel/modules/xmpp/xmpp_presence.c index 96b4504b8..a60580fae 100644 --- a/citadel/modules/jabber/xmpp_presence.c +++ b/citadel/modules/xmpp/xmpp_presence.c @@ -62,7 +62,7 @@ /* * Initial dump of the entire wholist */ -void jabber_wholist_presence_dump(void) +void xmpp_wholist_presence_dump(void) { struct CitContext *cptr = NULL; int nContexts, i; @@ -71,7 +71,7 @@ void jabber_wholist_presence_dump(void) cptr = CtdlGetContextArray(&nContexts); if (!cptr) - return ; /** FIXME: Does jabber need to send something to maintain the protocol? */ + return ; /** FIXME: Does xmpp need to send something to maintain the protocol? */ for (i=0; i", ++unsolicited_id); cprintf(""); - jabber_roster_item(&cptr[i]); + xmpp_roster_item(&cptr[i]); cprintf("" ""); } diff --git a/citadel/modules/jabber/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c similarity index 96% rename from citadel/modules/jabber/xmpp_query_namespace.c rename to citadel/modules/xmpp/xmpp_query_namespace.c index 64aba16c5..5bfe7ae11 100644 --- a/citadel/modules/jabber/xmpp_query_namespace.c +++ b/citadel/modules/xmpp/xmpp_query_namespace.c @@ -61,7 +61,7 @@ /* * Output a single roster item, for roster queries or pushes */ -void jabber_roster_item(struct CitContext *cptr) { +void xmpp_roster_item(struct CitContext *cptr) { cprintf("", cptr->cs_inet_email, cptr->user.fullname @@ -77,7 +77,7 @@ void jabber_roster_item(struct CitContext *cptr) { * (minus any entries for this user -- don't tell me about myself) * */ -void jabber_iq_roster_query(void) +void xmpp_iq_roster_query(void) { struct CitContext *cptr; int nContexts, i; @@ -93,7 +93,7 @@ void jabber_iq_roster_query(void) (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide)) && (cptr[i].user.usernum != CC->user.usernum) ) { - jabber_roster_item(&cptr[i]); + xmpp_roster_item(&cptr[i]); } } } @@ -148,7 +148,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x */ if (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) { - jabber_iq_roster_query(); + xmpp_iq_roster_query(); } else if (!strcasecmp(query_xmlns, "jabber:iq:auth:query")) { diff --git a/citadel/modules/jabber/xmpp_queue.c b/citadel/modules/xmpp/xmpp_queue.c similarity index 100% rename from citadel/modules/jabber/xmpp_queue.c rename to citadel/modules/xmpp/xmpp_queue.c diff --git a/citadel/modules/jabber/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c similarity index 97% rename from citadel/modules/jabber/xmpp_sasl_service.c rename to citadel/modules/xmpp/xmpp_sasl_service.c index 1391512c4..8e952d2c8 100644 --- a/citadel/modules/jabber/xmpp_sasl_service.c +++ b/citadel/modules/xmpp/xmpp_sasl_service.c @@ -154,7 +154,7 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { /* * Non-SASL authentication */ -void jabber_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) { +void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) { int result; if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */ -- 2.30.2