/*
- * $Id$
- *
- * Copyright (c) 2000-2009 by the citadel.org development team
- *
* This module dumps and/or loads the Citadel database in XML format.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
+ * Copyright (c) 1987-2014 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
+ */
+
+/*
+ * Explanation of <progress> tags:
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
+ * 0% nothing
+ * 1% finished exporting config
+ * 2% finished exporting control
+ * 7% finished exporting users
+ * 12% finished exporting openids
+ * 17% finished exporting rooms
+ * 18% finished exporting floors
+ * 25% finished exporting visits
+ * 100% finished exporting messages
*/
#include "sysdep.h"
#include "user_ops.h"
#include "control.h"
#include "euidindex.h"
-
-
#include "ctdl_module.h"
-
-
#define END_OF_MESSAGE "---eom---dbd---"
char migr_tempfilename1[PATH_MAX];
char migr_tempfilename2[PATH_MAX];
FILE *migr_global_message_list;
-
-
+int total_msgs = 0;
/*
* Code which implements the export appears in this section
*/
-
-
/*
* Output a string to the client with these characters escaped: & < >
*/
char *c = str;
+ if (str == NULL) {
+ return;
+ }
+
while (*c != 0) {
- if (*c == '&') {
- client_write("&", 5);
+ if (*c == '\"') {
+ client_write(""", 6);
+ }
+ else if (*c == '\'') {
+ client_write("'", 6);
}
else if (*c == '<') {
client_write("<", 4);
else if (*c == '>') {
client_write(">", 4);
}
+ else if (*c == '&') {
+ client_write("&", 5);
+ }
else {
client_write(c, 1);
}
cprintf("<QRhighest>%ld</QRhighest>\n", buf->QRhighest);
cprintf("<QRgen>%ld</QRgen>\n", (long)buf->QRgen);
cprintf("<QRflags>%u</QRflags>\n", buf->QRflags);
- client_write("<QRdirname>", 11); xml_strout(buf->QRdirname); client_write("</QRdirname>\n", 13);
+ if (buf->QRflags & QR_DIRECTORY) {
+ client_write("<QRdirname>", 11);
+ xml_strout(buf->QRdirname);
+ client_write("</QRdirname>\n", 13);
+ }
cprintf("<QRinfo>%ld</QRinfo>\n", buf->QRinfo);
cprintf("<QRfloor>%d</QRfloor>\n", buf->QRfloor);
cprintf("<QRmtime>%ld</QRmtime>\n", (long)buf->QRmtime);
* this will be handled by exporting the reference count, not by
* exporting the message multiple times.)
*/
- snprintf(cmd, sizeof cmd, "sort <%s >%s", migr_tempfilename1, migr_tempfilename2);
- if (system(cmd) != 0) CtdlLogPrintf(CTDL_ALERT, "Error %d\n", errno);
+ snprintf(cmd, sizeof cmd, "sort -n <%s >%s", migr_tempfilename1, migr_tempfilename2);
+ if (system(cmd) != 0) syslog(LOG_ALERT, "Error %d\n", errno);
snprintf(cmd, sizeof cmd, "uniq <%s >%s", migr_tempfilename2, migr_tempfilename1);
- if (system(cmd) != 0) CtdlLogPrintf(CTDL_ALERT, "Error %d\n", errno);
+ if (system(cmd) != 0) syslog(LOG_ALERT, "Error %d\n", errno);
+
+
+ snprintf(cmd, sizeof cmd, "wc -l %s", migr_tempfilename1);
+ FILE *fp = popen(cmd, "r");
+ if (fp) {
+ fgets(cmd, sizeof cmd, fp);
+ pclose(fp);
+ total_msgs = atoi(cmd);
+ }
+ else {
+ total_msgs = 1; // any nonzero just to keep it from barfing
+ }
+ syslog(LOG_DEBUG, "Total messages to be exported: %d", total_msgs);
}
}
+/*
+ * Return nonzero if the supplied string contains only characters which are valid in a sequence set.
+ */
+int is_sequence_set(char *s) {
+ if (!s) return(0);
+
+ char *c = s;
+ char ch;
+ while (ch = *c++, ch) {
+ if (!strchr("0123456789*,:", ch)) {
+ return(0);
+ }
+ }
+ return(1);
+}
+
+
/*
* Traverse the visits file...
*/
void migr_export_visits(void) {
- struct visit vbuf;
+ visit vbuf;
struct cdbdata *cdbv;
cdb_rewind(CDB_VISIT);
while (cdbv = cdb_next_item(CDB_VISIT), cdbv != NULL) {
- memset(&vbuf, 0, sizeof(struct visit));
+ memset(&vbuf, 0, sizeof(visit));
memcpy(&vbuf, cdbv->ptr,
- ((cdbv->len > sizeof(struct visit)) ?
- sizeof(struct visit) : cdbv->len));
+ ((cdbv->len > sizeof(visit)) ?
+ sizeof(visit) : cdbv->len));
cdb_free(cdbv);
client_write("<visit>\n", 8);
cprintf("<v_usernum>%ld</v_usernum>\n", vbuf.v_usernum);
client_write("<v_seen>", 8);
- if (!IsEmptyStr(vbuf.v_seen)) {
+ if ( (!IsEmptyStr(vbuf.v_seen)) && (is_sequence_set(vbuf.v_seen)) ) {
xml_strout(vbuf.v_seen);
}
else {
}
client_write("</v_seen>", 9);
- client_write("<v_answered>", 12); xml_strout(vbuf.v_answered); client_write("</v_answered>\n", 14);
+ if ( (!IsEmptyStr(vbuf.v_answered)) && (is_sequence_set(vbuf.v_answered)) ) {
+ client_write("<v_answered>", 12);
+ xml_strout(vbuf.v_answered);
+ client_write("</v_answered>\n", 14);
+ }
+
cprintf("<v_flags>%u</v_flags>\n", vbuf.v_flags);
cprintf("<v_view>%d</v_view>\n", vbuf.v_view);
client_write("</visit>\n", 9);
client_write("<msg_meta_content_type>", 23); xml_strout(smi.meta_content_type); client_write("</msg_meta_content_type>\n", 25);
client_write("<msg_text>", 10);
- serialize_message(&smr, msg);
- CtdlFreeMessage(msg);
+ CtdlSerializeMessage(&smr, msg);
+ CM_Free(msg);
/* Predict the buffer size we need. Expand the buffer if necessary. */
int encoded_len = smr.len * 15 / 10 ;
char buf[SIZ];
long msgnum;
int count = 0;
+ int progress = 0;
+ int prev_progress = 0;
CitContext *Ctx;
Ctx = CC;
migr_global_message_list = fopen(migr_tempfilename1, "r");
if (migr_global_message_list != NULL) {
- CtdlLogPrintf(CTDL_INFO, "Opened %s\n", migr_tempfilename1);
- while ((Ctx->kill_me != 1) &&
+ syslog(LOG_INFO, "Opened %s\n", migr_tempfilename1);
+ while ((Ctx->kill_me == 0) &&
(fgets(buf, sizeof(buf), migr_global_message_list) != NULL)) {
msgnum = atol(buf);
if (msgnum > 0L) {
migr_export_message(msgnum);
++count;
}
+ progress = (count * 74 / total_msgs) + 25 ;
+ if ((progress > prev_progress) && (progress < 100)) {
+ cprintf("<progress>%d</progress>\n", progress);
+ }
+ prev_progress = progress;
}
fclose(migr_global_message_list);
}
- if (Ctx->kill_me != 1)
- CtdlLogPrintf(CTDL_INFO, "Exported %d messages.\n", count);
+ if (Ctx->kill_me == 0)
+ syslog(LOG_INFO, "Exported %d messages.\n", count);
else
- CtdlLogPrintf(CTDL_ERR, "Export aborted due to client disconnect! \n");
+ syslog(LOG_ERR, "Export aborted due to client disconnect! \n");
migr_export_message(-1L); /* This frees the encoding buffer */
}
void migr_do_export(void) {
- struct config *buf;
- buf = &config;
CitContext *Ctx;
Ctx = CC;
client_write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n", 40);
client_write("<citadel_migrate_data>\n", 23);
cprintf("<version>%d</version>\n", REV_LEVEL);
+ cprintf("<progress>%d</progress>\n", 0);
/* export the config file (this is done using x-macros) */
client_write("<config>\n", 9);
cprintf("<c_restrict>%d</c_restrict>\n", config.c_restrict);
client_write("<c_site_location>", 17); xml_strout(config.c_site_location); client_write("</c_site_location>\n", 19);
client_write("<c_sysadm>", 10); xml_strout(config.c_sysadm); client_write("</c_sysadm>\n", 12);
- cprintf("<c_setup_level>%d</c_setup_level>\n", config.c_setup_level);
cprintf("<c_maxsessions>%d</c_maxsessions>\n", config.c_maxsessions);
client_write("<c_ip_addr>", 11); xml_strout(config.c_ip_addr); client_write("</c_ip_addr>\n", 13);
cprintf("<c_port_number>%d</c_port_number>\n", config.c_port_number);
cprintf("<c_pop3s_port>%d</c_pop3s_port>\n", config.c_pop3s_port);
cprintf("<c_smtps_port>%d</c_smtps_port>\n", config.c_smtps_port);
cprintf("<c_auto_cull>%d</c_auto_cull>\n", config.c_auto_cull);
- cprintf("<c_instant_expunge>%d</c_instant_expunge>\n", config.c_instant_expunge);
cprintf("<c_allow_spoofing>%d</c_allow_spoofing>\n", config.c_allow_spoofing);
cprintf("<c_journal_email>%d</c_journal_email>\n", config.c_journal_email);
cprintf("<c_journal_pubmsgs>%d</c_journal_pubmsgs>\n", config.c_journal_pubmsgs);
cprintf("<c_pop3_fetch>%ld</c_pop3_fetch>\n", config.c_pop3_fetch);
cprintf("<c_pop3_fastest>%ld</c_pop3_fastest>\n", config.c_pop3_fastest);
cprintf("<c_spam_flag_only>%d</c_spam_flag_only>\n", config.c_spam_flag_only);
+ cprintf("<c_nntp_port>%d</c_nntp_port>\n", config.c_nntp_port);
+ cprintf("<c_nntps_port>%d</c_nntps_port>\n", config.c_nntps_port);
client_write("</config>\n", 10);
+ cprintf("<progress>%d</progress>\n", 1);
/* Export the control file */
get_control();
cprintf("<control_nextroom>%ld</control_nextroom>\n", CitControl.MMnextroom);
cprintf("<control_version>%d</control_version>\n", CitControl.version);
client_write("</control>\n", 11);
-
- if (Ctx->kill_me != 1) migr_export_users();
- if (Ctx->kill_me != 1) migr_export_openids();
- if (Ctx->kill_me != 1) migr_export_rooms();
- if (Ctx->kill_me != 1) migr_export_floors();
- if (Ctx->kill_me != 1) migr_export_visits();
- if (Ctx->kill_me != 1) migr_export_messages();
+ cprintf("<progress>%d</progress>\n", 2);
+
+ if (Ctx->kill_me == 0) migr_export_users();
+ cprintf("<progress>%d</progress>\n", 7);
+ if (Ctx->kill_me == 0) migr_export_openids();
+ cprintf("<progress>%d</progress>\n", 12);
+ if (Ctx->kill_me == 0) migr_export_rooms();
+ cprintf("<progress>%d</progress>\n", 17);
+ if (Ctx->kill_me == 0) migr_export_floors();
+ cprintf("<progress>%d</progress>\n", 18);
+ if (Ctx->kill_me == 0) migr_export_visits();
+ cprintf("<progress>%d</progress>\n", 25);
+ if (Ctx->kill_me == 0) migr_export_messages();
client_write("</citadel_migrate_data>\n", 24);
+ cprintf("<progress>%d</progress>\n", 100);
client_write("000\n", 4);
Ctx->dont_term = 0;
}
int citadel_migrate_data = 0; /* Are we inside a <citadel_migrate_data> tag pair? */
-char *migr_chardata = NULL;
-int migr_chardata_len = 0;
+StrBuf *migr_chardata = NULL;
+StrBuf *migr_MsgData = NULL;
struct ctdluser usbuf;
struct ctdlroom qrbuf;
char openid_url[512];
char FRname[ROOMNAMELEN];
struct floor flbuf;
int floornum = 0;
-struct visit vbuf;
+visit vbuf;
struct MetaData smi;
long import_msgnum = 0;
-char *decoded_msg = NULL;
/*
* This callback stores up the data which appears in between tags.
*/
-void migr_xml_chardata(void *data, const XML_Char *s, int len) {
- int old_len;
- int new_len;
- char *new_buffer;
-
- old_len = migr_chardata_len;
- new_len = old_len + len;
- new_buffer = realloc(migr_chardata, new_len + 1);
- if (new_buffer != NULL) {
- memcpy(&new_buffer[old_len], s, len);
- new_buffer[new_len] = 0;
- migr_chardata = new_buffer;
- migr_chardata_len = new_len;
- }
+void migr_xml_chardata(void *data, const XML_Char *s, int len)
+{
+ StrBufAppendBufPlain(migr_chardata, s, len, 0);
}
/*** GENERAL STUFF ***/
- /* Throw away any existing chardata */
- if (migr_chardata != NULL) {
- free(migr_chardata);
- migr_chardata = NULL;
- migr_chardata_len = 0;
- }
+ /* Reset chardata_len to zero and init buffer */
+ FlushStrBuf(migr_chardata);
+ FlushStrBuf(migr_MsgData);
if (!strcasecmp(el, "citadel_migrate_data")) {
++citadel_migrate_data;
}
if (citadel_migrate_data != 1) {
- CtdlLogPrintf(CTDL_ALERT, "Out-of-sequence tag <%s> detected. Warning: ODD-DATA!\n");
+ syslog(LOG_ALERT, "Out-of-sequence tag <%s> detected. Warning: ODD-DATA!\n", el);
return;
}
else if (!strcasecmp(el, "room")) memset(&qrbuf, 0, sizeof (struct ctdlroom));
else if (!strcasecmp(el, "room_messages")) memset(FRname, 0, sizeof FRname);
else if (!strcasecmp(el, "floor")) memset(&flbuf, 0, sizeof (struct floor));
- else if (!strcasecmp(el, "visit")) memset(&vbuf, 0, sizeof (struct visit));
+ else if (!strcasecmp(el, "visit")) memset(&vbuf, 0, sizeof (visit));
else if (!strcasecmp(el, "message")) {
memset(&smi, 0, sizeof (struct MetaData));
import_msgnum = 0;
- if (decoded_msg != NULL) {
- free(decoded_msg);
- decoded_msg = NULL;
- }
}
}
-void migr_xml_end(void *data, const char *el, const char **attr) {
- char *ptr;
+int migr_config(void *data, const char *el)
+{
+ if (!strcasecmp(el, "c_nodename")) SET_CFGSTRBUF(c_nodename, migr_chardata);
+ else if (!strcasecmp(el, "c_fqdn")) SET_CFGSTRBUF(c_fqdn, migr_chardata);
+ else if (!strcasecmp(el, "c_humannode")) SET_CFGSTRBUF(c_humannode, migr_chardata);
+ else if (!strcasecmp(el, "c_phonenum")) SET_CFGSTRBUF(c_phonenum, migr_chardata);
+ else if (!strcasecmp(el, "c_ctdluid")) config.c_ctdluid = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_creataide")) config.c_creataide = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_sleeping")) config.c_sleeping = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_initax")) config.c_initax = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_regiscall")) config.c_regiscall = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_twitdetect")) config.c_twitdetect = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_twitroom")) SET_CFGSTRBUF(c_twitroom, migr_chardata);
+ else if (!strcasecmp(el, "c_moreprompt")) SET_CFGSTRBUF(c_moreprompt, migr_chardata);
+ else if (!strcasecmp(el, "c_restrict")) config.c_restrict = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_site_location")) SET_CFGSTRBUF(c_site_location, migr_chardata);
+ else if (!strcasecmp(el, "c_sysadm")) SET_CFGSTRBUF(c_sysadm, migr_chardata);
+ else if (!strcasecmp(el, "c_maxsessions")) config.c_maxsessions = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_ip_addr")) SET_CFGSTRBUF(c_ip_addr, migr_chardata);
+ else if (!strcasecmp(el, "c_port_number")) config.c_port_number = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_ep_expire_mode")) config.c_ep.expire_mode = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_ep_expire_value")) config.c_ep.expire_value = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_userpurge")) config.c_userpurge = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_roompurge")) config.c_roompurge = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_logpages")) SET_CFGSTRBUF(c_logpages, migr_chardata);
+ else if (!strcasecmp(el, "c_createax")) config.c_createax = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_maxmsglen")) config.c_maxmsglen = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_min_workers")) config.c_min_workers = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_max_workers")) config.c_max_workers = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_pop3_port")) config.c_pop3_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_smtp_port")) config.c_smtp_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_rfc822_strict_from")) config.c_rfc822_strict_from = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_aide_zap")) config.c_aide_zap = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_imap_port")) config.c_imap_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_net_freq")) config.c_net_freq = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_disable_newu")) config.c_disable_newu = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_enable_fulltext")) config.c_enable_fulltext = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_baseroom")) SET_CFGSTRBUF(c_baseroom, migr_chardata);
+ else if (!strcasecmp(el, "c_aideroom")) SET_CFGSTRBUF(c_aideroom, migr_chardata);
+ else if (!strcasecmp(el, "c_purge_hour")) config.c_purge_hour = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_mbxep_expire_mode")) config.c_mbxep.expire_mode = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_mbxep_expire_value")) config.c_mbxep.expire_value = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_ldap_host")) SET_CFGSTRBUF(c_ldap_host, migr_chardata);
+ else if (!strcasecmp(el, "c_ldap_port")) config.c_ldap_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_ldap_base_dn")) SET_CFGSTRBUF(c_ldap_base_dn, migr_chardata);
+ else if (!strcasecmp(el, "c_ldap_bind_dn")) SET_CFGSTRBUF(c_ldap_bind_dn, migr_chardata);
+ else if (!strcasecmp(el, "c_ldap_bind_pw")) SET_CFGSTRBUF(c_ldap_bind_pw, migr_chardata);
+ else if (!strcasecmp(el, "c_msa_port")) config.c_msa_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_imaps_port")) config.c_imaps_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_pop3s_port")) config.c_pop3s_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_smtps_port")) config.c_smtps_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_auto_cull")) config.c_auto_cull = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_allow_spoofing")) config.c_allow_spoofing = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_journal_email")) config.c_journal_email = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_journal_pubmsgs")) config.c_journal_pubmsgs = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_journal_dest")) SET_CFGSTRBUF(c_journal_dest, migr_chardata);
+ else if (!strcasecmp(el, "c_default_cal_zone")) SET_CFGSTRBUF(c_default_cal_zone, migr_chardata);
+ else if (!strcasecmp(el, "c_pftcpdict_port")) config.c_pftcpdict_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_managesieve_port")) config.c_managesieve_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_auth_mode")) config.c_auth_mode = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_funambol_host")) SET_CFGSTRBUF(c_funambol_host, migr_chardata);
+ else if (!strcasecmp(el, "c_funambol_port")) config.c_funambol_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_funambol_source")) SET_CFGSTRBUF(c_funambol_source, migr_chardata);
+ else if (!strcasecmp(el, "c_funambol_auth")) SET_CFGSTRBUF(c_funambol_auth, migr_chardata);
+ else if (!strcasecmp(el, "c_rbl_at_greeting")) config.c_rbl_at_greeting = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_master_user")) SET_CFGSTRBUF(c_master_user, migr_chardata);
+ else if (!strcasecmp(el, "c_master_pass")) SET_CFGSTRBUF(c_master_pass, migr_chardata);
+ else if (!strcasecmp(el, "c_pager_program")) SET_CFGSTRBUF(c_pager_program, migr_chardata);
+ else if (!strcasecmp(el, "c_imap_keep_from")) config.c_imap_keep_from = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_xmpp_c2s_port")) config.c_xmpp_c2s_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_xmpp_s2s_port")) config.c_xmpp_s2s_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_pop3_fetch")) config.c_pop3_fetch = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_pop3_fastest")) config.c_pop3_fastest = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_spam_flag_only")) config.c_spam_flag_only = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_nntp_port")) config.c_nntp_port = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "c_nntps_port")) config.c_nntps_port = atoi(ChrPtr(migr_chardata));
+ else return 0;
+ return 1; /* Found above...*/
+}
+
+int migr_controlrecord(void *data, const char *el)
+{
+ if (!strcasecmp(el, "control_highest")) CitControl.MMhighest = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "control_flags")) CitControl.MMflags = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "control_nextuser")) CitControl.MMnextuser = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "control_nextroom")) CitControl.MMnextroom = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "control_version")) CitControl.version = atoi(ChrPtr(migr_chardata));
+
+ else if (!strcasecmp(el, "control")) {
+ CitControl.MMfulltext = (-1L); /* always flush */
+ put_control();
+ syslog(LOG_INFO, "Completed import of control record\n");
+ }
+ else return 0;
+ return 1;
+
+}
+
+
+int migr_userrecord(void *data, const char *el)
+{
+ if (!strcasecmp(el, "u_version")) usbuf.version = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_uid")) usbuf.uid = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_password")) safestrncpy(usbuf.password, ChrPtr(migr_chardata), sizeof usbuf.password);
+ else if (!strcasecmp(el, "u_flags")) usbuf.flags = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_timescalled")) usbuf.timescalled = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_posted")) usbuf.posted = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_axlevel")) usbuf.axlevel = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_usernum")) usbuf.usernum = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_lastcall")) usbuf.lastcall = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_USuserpurge")) usbuf.USuserpurge = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "u_fullname")) safestrncpy(usbuf.fullname, ChrPtr(migr_chardata), sizeof usbuf.fullname);
+ else return 0;
+ return 1;
+}
+
+int migr_roomrecord(void *data, const char *el)
+{
+ if (!strcasecmp(el, "QRname")) safestrncpy(qrbuf.QRname, ChrPtr(migr_chardata), sizeof qrbuf.QRname);
+ else if (!strcasecmp(el, "QRpasswd")) safestrncpy(qrbuf.QRpasswd, ChrPtr(migr_chardata), sizeof qrbuf.QRpasswd);
+ else if (!strcasecmp(el, "QRroomaide")) qrbuf.QRroomaide = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRhighest")) qrbuf.QRhighest = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRgen")) qrbuf.QRgen = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRflags")) qrbuf.QRflags = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRdirname")) safestrncpy(qrbuf.QRdirname, ChrPtr(migr_chardata), sizeof qrbuf.QRdirname);
+ else if (!strcasecmp(el, "QRinfo")) qrbuf.QRinfo = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRfloor")) qrbuf.QRfloor = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRmtime")) qrbuf.QRmtime = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRexpire_mode")) qrbuf.QRep.expire_mode = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRexpire_value")) qrbuf.QRep.expire_value = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRnumber")) qrbuf.QRnumber = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRorder")) qrbuf.QRorder = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRflags2")) qrbuf.QRflags2 = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "QRdefaultview")) qrbuf.QRdefaultview = atoi(ChrPtr(migr_chardata));
+ else return 0;
+ return 1;
+}
+
+int migr_floorrecord(void *data, const char *el)
+{
+ if (!strcasecmp(el, "f_num")) floornum = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "f_flags")) flbuf.f_flags = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "f_name")) safestrncpy(flbuf.f_name, ChrPtr(migr_chardata), sizeof flbuf.f_name);
+ else if (!strcasecmp(el, "f_ref_count")) flbuf.f_ref_count = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "f_ep_expire_mode")) flbuf.f_ep.expire_mode = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "f_ep_expire_value")) flbuf.f_ep.expire_value = atoi(ChrPtr(migr_chardata));
+ else return 0;
+ return 1;
+}
+
+int migr_visitrecord(void *data, const char *el)
+{
+ if (!strcasecmp(el, "v_roomnum")) vbuf.v_roomnum = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "v_roomgen")) vbuf.v_roomgen = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "v_usernum")) vbuf.v_usernum = atol(ChrPtr(migr_chardata));
+
+ else if (!strcasecmp(el, "v_seen")) {
+ int is_textual_seen = 0;
+ int i;
+ int max = StrLength(migr_chardata);
+
+ vbuf.v_lastseen = atol(ChrPtr(migr_chardata));
+ is_textual_seen = 0;
+ for (i=0; i < max; ++i)
+ if (!isdigit(ChrPtr(migr_chardata)[i]))
+ is_textual_seen = 1;
+ if (is_textual_seen)
+ safestrncpy(vbuf.v_seen, ChrPtr(migr_chardata), sizeof vbuf.v_seen);
+ }
+
+ else if (!strcasecmp(el, "v_answered")) safestrncpy(vbuf.v_answered, ChrPtr(migr_chardata), sizeof vbuf.v_answered);
+ else if (!strcasecmp(el, "v_flags")) vbuf.v_flags = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "v_view")) vbuf.v_view = atoi(ChrPtr(migr_chardata));
+ else return 0;
+ return 1;
+}
+void migr_xml_end(void *data, const char *el)
+{
+ const char *ptr;
int msgcount = 0;
long msgnum = 0L;
long *msglist = NULL;
int msglist_alloc = 0;
- int i;
- int is_textual_seen = 0;
- long msglen;
- int len;
-
/*** GENERAL STUFF ***/
if (!strcasecmp(el, "citadel_migrate_data")) {
}
if (citadel_migrate_data != 1) {
- CtdlLogPrintf(CTDL_ALERT, "Out-of-sequence tag <%s> detected. Warning: ODD-DATA!\n");
+ syslog(LOG_ALERT, "Out-of-sequence tag <%s> detected. Warning: ODD-DATA!\n", el);
return;
}
- if (migr_chardata == NULL) { /* If NULL chardata, substitute an empty string instead. */
- migr_chardata = strdup("");
- migr_chardata_len = 0;
- }
-
- // CtdlLogPrintf(CTDL_DEBUG, "END TAG: <%s> DATA: <%s>\n", el, (migr_chardata_len ? migr_chardata : ""));
+ // syslog(LOG_DEBUG, "END TAG: <%s> DATA: <%s>\n", el, (migr_chardata_len ? migr_chardata : ""));
/*** CONFIG ***/
if (!strcasecmp(el, "config")) {
config.c_enable_fulltext = 0; /* always disable */
put_config();
- CtdlLogPrintf(CTDL_INFO, "Completed import of server configuration\n");
- }
-
- else if (!strcasecmp(el, "c_nodename")) safestrncpy(config.c_nodename, migr_chardata, sizeof config.c_nodename);
- else if (!strcasecmp(el, "c_fqdn")) safestrncpy(config.c_fqdn, migr_chardata, sizeof config.c_fqdn);
- else if (!strcasecmp(el, "c_humannode")) safestrncpy(config.c_humannode, migr_chardata, sizeof config.c_humannode);
- else if (!strcasecmp(el, "c_phonenum")) safestrncpy(config.c_phonenum, migr_chardata, sizeof config.c_phonenum);
- else if (!strcasecmp(el, "c_ctdluid")) config.c_ctdluid = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_creataide")) config.c_creataide = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_sleeping")) config.c_sleeping = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_initax")) config.c_initax = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_regiscall")) config.c_regiscall = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_twitdetect")) config.c_twitdetect = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_twitroom")) safestrncpy(config.c_twitroom, migr_chardata, sizeof config.c_twitroom);
- else if (!strcasecmp(el, "c_moreprompt")) safestrncpy(config.c_moreprompt, migr_chardata, sizeof config.c_moreprompt);
- else if (!strcasecmp(el, "c_restrict")) config.c_restrict = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_site_location")) safestrncpy(config.c_site_location, migr_chardata, sizeof config.c_site_location);
- else if (!strcasecmp(el, "c_sysadm")) safestrncpy(config.c_sysadm, migr_chardata, sizeof config.c_sysadm);
- else if (!strcasecmp(el, "c_setup_level")) config.c_setup_level = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_maxsessions")) config.c_maxsessions = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_ip_addr")) safestrncpy(config.c_ip_addr, migr_chardata, sizeof config.c_ip_addr);
- else if (!strcasecmp(el, "c_port_number")) config.c_port_number = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_ep_expire_mode")) config.c_ep.expire_mode = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_ep_expire_value")) config.c_ep.expire_value = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_userpurge")) config.c_userpurge = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_roompurge")) config.c_roompurge = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_logpages")) safestrncpy(config.c_logpages, migr_chardata, sizeof config.c_logpages);
- else if (!strcasecmp(el, "c_createax")) config.c_createax = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_maxmsglen")) config.c_maxmsglen = atol(migr_chardata);
- else if (!strcasecmp(el, "c_min_workers")) config.c_min_workers = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_max_workers")) config.c_max_workers = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_pop3_port")) config.c_pop3_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_smtp_port")) config.c_smtp_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_rfc822_strict_from")) config.c_rfc822_strict_from = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_aide_zap")) config.c_aide_zap = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_imap_port")) config.c_imap_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_net_freq")) config.c_net_freq = atol(migr_chardata);
- else if (!strcasecmp(el, "c_disable_newu")) config.c_disable_newu = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_enable_fulltext")) config.c_enable_fulltext = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_baseroom")) safestrncpy(config.c_baseroom, migr_chardata, sizeof config.c_baseroom);
- else if (!strcasecmp(el, "c_aideroom")) safestrncpy(config.c_aideroom, migr_chardata, sizeof config.c_aideroom);
- else if (!strcasecmp(el, "c_purge_hour")) config.c_purge_hour = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_mbxep_expire_mode")) config.c_mbxep.expire_mode = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_mbxep_expire_value")) config.c_mbxep.expire_value = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_ldap_host")) safestrncpy(config.c_ldap_host, migr_chardata, sizeof config.c_ldap_host);
- else if (!strcasecmp(el, "c_ldap_port")) config.c_ldap_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_ldap_base_dn")) safestrncpy(config.c_ldap_base_dn, migr_chardata, sizeof config.c_ldap_base_dn);
- else if (!strcasecmp(el, "c_ldap_bind_dn")) safestrncpy(config.c_ldap_bind_dn, migr_chardata, sizeof config.c_ldap_bind_dn);
- else if (!strcasecmp(el, "c_ldap_bind_pw")) safestrncpy(config.c_ldap_bind_pw, migr_chardata, sizeof config.c_ldap_bind_pw);
- else if (!strcasecmp(el, "c_msa_port")) config.c_msa_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_imaps_port")) config.c_imaps_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_pop3s_port")) config.c_pop3s_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_smtps_port")) config.c_smtps_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_auto_cull")) config.c_auto_cull = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_instant_expunge")) config.c_instant_expunge = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_allow_spoofing")) config.c_allow_spoofing = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_journal_email")) config.c_journal_email = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_journal_pubmsgs")) config.c_journal_pubmsgs = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_journal_dest")) safestrncpy(config.c_journal_dest, migr_chardata, sizeof config.c_journal_dest);
- else if (!strcasecmp(el, "c_default_cal_zone")) safestrncpy(config.c_default_cal_zone, migr_chardata, sizeof config.c_default_cal_zone);
- else if (!strcasecmp(el, "c_pftcpdict_port")) config.c_pftcpdict_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_managesieve_port")) config.c_managesieve_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_auth_mode")) config.c_auth_mode = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_funambol_host")) safestrncpy(config.c_funambol_host, migr_chardata, sizeof config.c_funambol_host);
- else if (!strcasecmp(el, "c_funambol_port")) config.c_funambol_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_funambol_source")) safestrncpy(config.c_funambol_source, migr_chardata, sizeof config.c_funambol_source);
- else if (!strcasecmp(el, "c_funambol_auth")) safestrncpy(config.c_funambol_auth, migr_chardata, sizeof config.c_funambol_auth);
- else if (!strcasecmp(el, "c_rbl_at_greeting")) config.c_rbl_at_greeting = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_master_user")) safestrncpy(config.c_master_user, migr_chardata, sizeof config.c_master_user);
- else if (!strcasecmp(el, "c_master_pass")) safestrncpy(config.c_master_pass, migr_chardata, sizeof config.c_master_pass);
- else if (!strcasecmp(el, "c_pager_program")) safestrncpy(config.c_pager_program, migr_chardata, sizeof config.c_pager_program);
- else if (!strcasecmp(el, "c_imap_keep_from")) config.c_imap_keep_from = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_xmpp_c2s_port")) config.c_xmpp_c2s_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_xmpp_s2s_port")) config.c_xmpp_s2s_port = atoi(migr_chardata);
- else if (!strcasecmp(el, "c_pop3_fetch")) config.c_pop3_fetch = atol(migr_chardata);
- else if (!strcasecmp(el, "c_pop3_fastest")) config.c_pop3_fastest = atol(migr_chardata);
- else if (!strcasecmp(el, "c_spam_flag_only")) config.c_spam_flag_only = atoi(migr_chardata);
-
- /*** CONTROL ***/
-
- else if (!strcasecmp(el, "control_highest")) CitControl.MMhighest = atol(migr_chardata);
- else if (!strcasecmp(el, "control_flags")) CitControl.MMflags = atoi(migr_chardata);
- else if (!strcasecmp(el, "control_nextuser")) CitControl.MMnextuser = atol(migr_chardata);
- else if (!strcasecmp(el, "control_nextroom")) CitControl.MMnextroom = atol(migr_chardata);
- else if (!strcasecmp(el, "control_version")) CitControl.version = atoi(migr_chardata);
-
- else if (!strcasecmp(el, "control")) {
- CitControl.MMfulltext = (-1L); /* always flush */
- put_control();
- CtdlLogPrintf(CTDL_INFO, "Completed import of control record\n");
+ syslog(LOG_INFO, "Completed import of server configuration\n");
}
+ else if ((!strncasecmp(el, HKEY("c_"))) &&
+ migr_config(data, el))
+ ; /* Nothing to do anymore */
+
+ /*** CONTROL ***/
+ else if ((!strncasecmp(el, HKEY("control"))) &&
+ migr_controlrecord(data, el))
+ ; /* Nothing to do anymore */
/*** USER ***/
-
- else if (!strcasecmp(el, "u_version")) usbuf.version = atoi(migr_chardata);
- else if (!strcasecmp(el, "u_uid")) usbuf.uid = atol(migr_chardata);
- else if (!strcasecmp(el, "u_password")) safestrncpy(usbuf.password, migr_chardata, sizeof usbuf.password);
- else if (!strcasecmp(el, "u_flags")) usbuf.flags = atoi(migr_chardata);
- else if (!strcasecmp(el, "u_timescalled")) usbuf.timescalled = atol(migr_chardata);
- else if (!strcasecmp(el, "u_posted")) usbuf.posted = atol(migr_chardata);
- else if (!strcasecmp(el, "u_axlevel")) usbuf.axlevel = atoi(migr_chardata);
- else if (!strcasecmp(el, "u_usernum")) usbuf.usernum = atol(migr_chardata);
- else if (!strcasecmp(el, "u_lastcall")) usbuf.lastcall = atol(migr_chardata);
- else if (!strcasecmp(el, "u_USuserpurge")) usbuf.USuserpurge = atoi(migr_chardata);
- else if (!strcasecmp(el, "u_fullname")) safestrncpy(usbuf.fullname, migr_chardata, sizeof usbuf.fullname);
-
+ else if ((!strncasecmp(el, HKEY("u_"))) &&
+ migr_userrecord(data, el))
+ ; /* Nothing to do anymore */
else if (!strcasecmp(el, "user")) {
CtdlPutUser(&usbuf);
- CtdlLogPrintf(CTDL_INFO, "Imported user: %s\n", usbuf.fullname);
+ syslog(LOG_INFO, "Imported user: %s\n", usbuf.fullname);
}
/*** OPENID ***/
- else if (!strcasecmp(el, "oid_url")) safestrncpy(openid_url, migr_chardata, sizeof openid_url);
- else if (!strcasecmp(el, "oid_usernum")) openid_usernum = atol(migr_chardata);
+ else if (!strcasecmp(el, "oid_url")) safestrncpy(openid_url, ChrPtr(migr_chardata), sizeof openid_url);
+ else if (!strcasecmp(el, "oid_usernum")) openid_usernum = atol(ChrPtr(migr_chardata));
else if (!strcasecmp(el, "openid")) { /* see serv_openid_rp.c for a description of the record format */
char *oid_data;
memcpy(&oid_data[sizeof(long)], openid_url, strlen(openid_url) + 1);
cdb_store(CDB_OPENID, openid_url, strlen(openid_url), oid_data, oid_data_len);
free(oid_data);
- CtdlLogPrintf(CTDL_INFO, "Imported OpenID: %s (%ld)\n", openid_url, openid_usernum);
+ syslog(LOG_INFO, "Imported OpenID: %s (%ld)\n", openid_url, openid_usernum);
}
/*** ROOM ***/
-
- else if (!strcasecmp(el, "QRname")) safestrncpy(qrbuf.QRname, migr_chardata, sizeof qrbuf.QRname);
- else if (!strcasecmp(el, "QRpasswd")) safestrncpy(qrbuf.QRpasswd, migr_chardata, sizeof qrbuf.QRpasswd);
- else if (!strcasecmp(el, "QRroomaide")) qrbuf.QRroomaide = atol(migr_chardata);
- else if (!strcasecmp(el, "QRhighest")) qrbuf.QRhighest = atol(migr_chardata);
- else if (!strcasecmp(el, "QRgen")) qrbuf.QRgen = atol(migr_chardata);
- else if (!strcasecmp(el, "QRflags")) qrbuf.QRflags = atoi(migr_chardata);
- else if (!strcasecmp(el, "QRdirname")) safestrncpy(qrbuf.QRdirname, migr_chardata, sizeof qrbuf.QRdirname);
- else if (!strcasecmp(el, "QRinfo")) qrbuf.QRinfo = atol(migr_chardata);
- else if (!strcasecmp(el, "QRfloor")) qrbuf.QRfloor = atoi(migr_chardata);
- else if (!strcasecmp(el, "QRmtime")) qrbuf.QRmtime = atol(migr_chardata);
- else if (!strcasecmp(el, "QRexpire_mode")) qrbuf.QRep.expire_mode = atoi(migr_chardata);
- else if (!strcasecmp(el, "QRexpire_value")) qrbuf.QRep.expire_value = atoi(migr_chardata);
- else if (!strcasecmp(el, "QRnumber")) qrbuf.QRnumber = atol(migr_chardata);
- else if (!strcasecmp(el, "QRorder")) qrbuf.QRorder = atoi(migr_chardata);
- else if (!strcasecmp(el, "QRflags2")) qrbuf.QRflags2 = atoi(migr_chardata);
- else if (!strcasecmp(el, "QRdefaultview")) qrbuf.QRdefaultview = atoi(migr_chardata);
-
+ else if ((!strncasecmp(el, HKEY("QR"))) &&
+ migr_roomrecord(data, el))
+ ; /* Nothing to do anymore */
else if (!strcasecmp(el, "room")) {
CtdlPutRoom(&qrbuf);
- CtdlLogPrintf(CTDL_INFO, "Imported room: %s\n", qrbuf.QRname);
+ syslog(LOG_INFO, "Imported room: %s\n", qrbuf.QRname);
}
/*** ROOM MESSAGE POINTERS ***/
- else if (!strcasecmp(el, "FRname")) safestrncpy(FRname, migr_chardata, sizeof FRname);
+ else if (!strcasecmp(el, "FRname")) safestrncpy(FRname, ChrPtr(migr_chardata), sizeof FRname);
else if (!strcasecmp(el, "FRmsglist")) {
if (!IsEmptyStr(FRname)) {
msglist_alloc = 1000;
msglist = malloc(sizeof(long) * msglist_alloc);
- CtdlLogPrintf(CTDL_DEBUG, "Message list for: %s\n", FRname);
+ syslog(LOG_DEBUG, "Message list for: %s\n", FRname);
- ptr = migr_chardata;
+ ptr = ChrPtr(migr_chardata);
while (*ptr != 0) {
while ((*ptr != 0) && (!isdigit(*ptr))) {
++ptr;
}
}
if (msgcount > 0) {
- CtdlSaveMsgPointersInRoom(FRname, msglist, msgcount, 0, NULL);
+ CtdlSaveMsgPointersInRoom(FRname, msglist, msgcount, 0, NULL, 1);
}
free(msglist);
msglist = NULL;
msglist_alloc = 0;
- CtdlLogPrintf(CTDL_DEBUG, "Imported %d messages.\n", msgcount);
- if (CtdlThreadCheckStop()) {
+ syslog(LOG_DEBUG, "Imported %d messages.\n", msgcount);
+ if (server_shutting_down) {
return;
}
}
/*** FLOORS ***/
-
- else if (!strcasecmp(el, "f_num")) floornum = atoi(migr_chardata);
- else if (!strcasecmp(el, "f_flags")) flbuf.f_flags = atoi(migr_chardata);
- else if (!strcasecmp(el, "f_name")) safestrncpy(flbuf.f_name, migr_chardata, sizeof flbuf.f_name);
- else if (!strcasecmp(el, "f_ref_count")) flbuf.f_ref_count = atoi(migr_chardata);
- else if (!strcasecmp(el, "f_ep_expire_mode")) flbuf.f_ep.expire_mode = atoi(migr_chardata);
- else if (!strcasecmp(el, "f_ep_expire_value")) flbuf.f_ep.expire_value = atoi(migr_chardata);
+ else if ((!strncasecmp(el, HKEY("f_"))) &&
+ migr_floorrecord(data, el))
+ ; /* Nothing to do anymore */
else if (!strcasecmp(el, "floor")) {
CtdlPutFloor(&flbuf, floornum);
- CtdlLogPrintf(CTDL_INFO, "Imported floor #%d (%s)\n", floornum, flbuf.f_name);
+ syslog(LOG_INFO, "Imported floor #%d (%s)\n", floornum, flbuf.f_name);
}
/*** VISITS ***/
-
- else if (!strcasecmp(el, "v_roomnum")) vbuf.v_roomnum = atol(migr_chardata);
- else if (!strcasecmp(el, "v_roomgen")) vbuf.v_roomgen = atol(migr_chardata);
- else if (!strcasecmp(el, "v_usernum")) vbuf.v_usernum = atol(migr_chardata);
-
- else if (!strcasecmp(el, "v_seen")) {
- vbuf.v_lastseen = atol(migr_chardata);
- is_textual_seen = 0;
- for (i=0; migr_chardata[i]; ++i) if (!isdigit(migr_chardata[i])) is_textual_seen = 1;
- if (is_textual_seen) safestrncpy(vbuf.v_seen, migr_chardata, sizeof vbuf.v_seen);
- }
-
- else if (!strcasecmp(el, "v_answered")) safestrncpy(vbuf.v_answered, migr_chardata, sizeof vbuf.v_answered);
- else if (!strcasecmp(el, "v_flags")) vbuf.v_flags = atoi(migr_chardata);
- else if (!strcasecmp(el, "v_view")) vbuf.v_view = atoi(migr_chardata);
-
+ else if ((!strncasecmp(el, HKEY("v_"))) &&
+ migr_visitrecord(data, el))
+ ; /* Nothing to do anymore */
else if (!strcasecmp(el, "visit")) {
put_visit(&vbuf);
- CtdlLogPrintf(CTDL_INFO, "Imported visit: %ld/%ld/%ld\n", vbuf.v_roomnum, vbuf.v_roomgen, vbuf.v_usernum);
+ syslog(LOG_INFO, "Imported visit: %ld/%ld/%ld\n", vbuf.v_roomnum, vbuf.v_roomgen, vbuf.v_usernum);
}
/*** MESSAGES ***/
+
+ else if (!strcasecmp(el, "msg_msgnum")) import_msgnum = atol(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "msg_meta_refcount")) smi.meta_refcount = atoi(ChrPtr(migr_chardata));
+ else if (!strcasecmp(el, "msg_meta_content_type")) safestrncpy(smi.meta_content_type, ChrPtr(migr_chardata), sizeof smi.meta_content_type);
- else if (!strcasecmp(el, "msg_msgnum")) import_msgnum = atol(migr_chardata);
- else if (!strcasecmp(el, "msg_meta_refcount")) smi.meta_refcount = atoi(migr_chardata);
- else if (!strcasecmp(el, "msg_meta_content_type")) safestrncpy(smi.meta_content_type, migr_chardata, sizeof smi.meta_content_type);
+ else if (!strcasecmp(el, "msg_text"))
+ {
- else if (!strcasecmp(el, "msg_text")) {
- if (decoded_msg != NULL) {
- free(decoded_msg);
- }
- len = strlen(migr_chardata);
- decoded_msg = malloc(len);
- msglen = CtdlDecodeBase64(decoded_msg, migr_chardata, len);
- cdb_store(CDB_MSGMAIN, &import_msgnum, sizeof(long), decoded_msg, msglen);
- free(decoded_msg);
- decoded_msg = NULL;
+ FlushStrBuf(migr_MsgData);
+ StrBufDecodeBase64To(migr_MsgData, migr_MsgData);
+
+ cdb_store(CDB_MSGMAIN,
+ &import_msgnum,
+ sizeof(long),
+ ChrPtr(migr_MsgData),
+ StrLength(migr_MsgData) + 1);
+
+ smi.meta_msgnum = import_msgnum;
PutMetaData(&smi);
- CtdlLogPrintf(CTDL_INFO, "Imported message #%ld, size=%ld, refcount=%d, content-type: %s\n",
- import_msgnum, msglen, smi.meta_refcount, smi.meta_content_type);
+
+ syslog(LOG_INFO,
+ "Imported message #%ld, size=%d, refcount=%d, content-type: %s\n",
+ import_msgnum,
+ StrLength(migr_MsgData),
+ smi.meta_refcount,
+ smi.meta_content_type);
}
/*** MORE GENERAL STUFF ***/
- if (migr_chardata != NULL) {
- free(migr_chardata);
- migr_chardata = NULL;
- migr_chardata_len = 0;
- }
+ FlushStrBuf(migr_chardata);
}
* Import begins here
*/
void migr_do_import(void) {
- char buf[SIZ];
+ StrBuf *Buf;
XML_Parser xp;
- int linelen;
+ int Finished = 0;
unbuffer_output();
-
+ migr_chardata = NewStrBufPlain(NULL, SIZ * 20);
+ migr_MsgData = NewStrBufPlain(NULL, SIZ * 20);
+ Buf = NewStrBufPlain(NULL, SIZ);
xp = XML_ParserCreate(NULL);
if (!xp) {
cprintf("%d Failed to create XML parser instance\n", ERROR+INTERNAL_ERROR);
cprintf("%d sock it to me\n", SEND_LISTING);
unbuffer_output();
- while (client_getln(buf, sizeof buf) >= 0 && strcmp(buf, "000")) {
- linelen = strlen(buf);
- strcpy(&buf[linelen++], "\n");
+ client_set_inbound_buf(SIZ * 10);
- if (CtdlThreadCheckStop())
+ while (!Finished && client_read_random_blob(Buf, -1) >= 0) {
+ if ((StrLength(Buf) > 4) &&
+ !strcmp(ChrPtr(Buf) + StrLength(Buf) - 4, "000\n"))
+ {
+ Finished = 1;
+ StrBufCutAt(Buf, StrLength(Buf) - 4, NULL);
+ }
+ if (server_shutting_down)
break; // Should we break or return?
- if (buf[0] == '\0')
+ if (StrLength(Buf) == 0)
continue;
- XML_Parse(xp, buf, linelen, 0);
+ XML_Parse(xp, ChrPtr(Buf), StrLength(Buf), 0);
+ FlushStrBuf(Buf);
}
XML_Parse(xp, "", 0, 1);
XML_ParserFree(xp);
-
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&migr_chardata);
+ FreeStrBuf(&migr_MsgData);
rebuild_euid_index();
rebuild_usersbynumber();
CC->dont_term = 0;
if (!threading)
{
CtdlRegisterProtoHook(cmd_migr, "MIGR", "Across-the-wire migration");
- CtdlRegisterProtoHook(cmd_migr, "ARTV", "Across-the-wire migration (legacy syntax)");
}
- /* return our Subversion id for the Log */
- return "$Id$";
+ /* return our module name for the log */
+ return "migrate";
}