Removed some debug logging

This commit is contained in:
Michiel Broek 2002-10-02 18:22:24 +00:00
parent 09ade52535
commit dea60eb245
3 changed files with 9 additions and 30 deletions

View File

@ -35,6 +35,7 @@ v0.35.04 29-Sep-2002
outbound directory instead of the point outbound. outbound directory instead of the point outbound.
Files and echomail security flags implemented. Files and echomail security flags implemented.
Echomail rescan will also work with newsgroups. Echomail rescan will also work with newsgroups.
Removed some debug logging with files replace.
mbsetup: mbsetup:
Added setup for the nodes record for security flags. Added setup for the nodes record for security flags.
@ -44,6 +45,9 @@ v0.35.04 29-Sep-2002
Added setup for the message areas security flags. Added setup for the message areas security flags.
Menu 14, edit files database had the wrong selection prompt. Menu 14, edit files database had the wrong selection prompt.
mbindex:
Removed debug logging.
v0.35.03 06-Jul-2002 - 29-Sep-2002 v0.35.03 06-Jul-2002 - 29-Sep-2002

View File

@ -78,7 +78,6 @@ int Add_BBS()
if ((fdb = fopen(fdbname, "r+")) != NULL) { if ((fdb = fopen(fdbname, "r+")) != NULL) {
while (fread(&frec, sizeof(frec), 1, fdb) == 1) { while (fread(&frec, sizeof(frec), 1, fdb) == 1) {
if ((strcmp(frec.Name, temp1) == 0) && (strcmp(frec.LName, TIC.NewName) == 0)) { if ((strcmp(frec.Name, temp1) == 0) && (strcmp(frec.LName, TIC.NewName) == 0)) {
Syslog('f', "Found existing fdb record, will update this one");
sprintf(temp1, "%s/%s", TIC.Inbound, TIC.NewName); sprintf(temp1, "%s/%s", TIC.Inbound, TIC.NewName);
sprintf(temp2, "%s/%s", TIC.BBSpath, TIC.NewName); sprintf(temp2, "%s/%s", TIC.BBSpath, TIC.NewName);
mkdirs(temp2, 0755); mkdirs(temp2, 0755);
@ -107,7 +106,6 @@ int Add_BBS()
tic_imp++; tic_imp++;
if ((i = file_rm(temp1))) if ((i = file_rm(temp1)))
WriteError("file_rm(%s): %s", temp1, strerror(i)); WriteError("file_rm(%s): %s", temp1, strerror(i));
Syslog('f', "Update done");
return TRUE; return TRUE;
} }
} }

View File

@ -277,7 +277,6 @@ void tidy_nllist(nl_list **fap)
{ {
nl_list *tmp, *old; nl_list *tmp, *old;
Syslog('S', "tidy_nllist");
for (tmp = *fap; tmp; tmp = old) { for (tmp = *fap; tmp; tmp = old) {
old = tmp->next; old = tmp->next;
free(tmp); free(tmp);
@ -291,12 +290,9 @@ int in_nllist(struct _nlidx idx, nl_list **fap, int replace)
{ {
nl_list *tmp; nl_list *tmp;
Syslog('S', "Seeking nlidx match for %u:%u/%u.%u", idx.zone, idx.net, idx.node, idx.point);
for (tmp = *fap; tmp; tmp = tmp->next) for (tmp = *fap; tmp; tmp = tmp->next)
if ((tmp->idx.zone == idx.zone) && (tmp->idx.net == idx.net) && if ((tmp->idx.zone == idx.zone) && (tmp->idx.net == idx.net) &&
(tmp->idx.node == idx.node) && (tmp->idx.point == idx.point)) { (tmp->idx.node == idx.node) && (tmp->idx.point == idx.point)) {
Syslog('S', "Match found");
if (replace) { if (replace) {
tmp->idx = idx; tmp->idx = idx;
entries++; entries++;
@ -313,7 +309,6 @@ void fill_nllist(struct _nlidx idx, nl_list **fap)
{ {
nl_list *tmp; nl_list *tmp;
Syslog('S', "fill_nllist %u:%u/%u.%u", idx.zone, idx.net, idx.node, idx.point);
tmp = (nl_list *)malloc(sizeof(nl_list)); tmp = (nl_list *)malloc(sizeof(nl_list));
tmp->next = *fap; tmp->next = *fap;
tmp->idx = idx; tmp->idx = idx;
@ -326,7 +321,7 @@ void fill_nllist(struct _nlidx idx, nl_list **fap)
char *fullpath(char *fname) char *fullpath(char *fname)
{ {
static char path[128]; static char path[PATH_MAX];
sprintf(path, "%s/%s", CFG.nodelists, fname); sprintf(path, "%s/%s", CFG.nodelists, fname);
return path; return path;
@ -346,12 +341,10 @@ void sort_nllist(nl_list **fap)
n++; n++;
vector = (nl_list **)malloc(n * sizeof(nl_list *)); vector = (nl_list **)malloc(n * sizeof(nl_list *));
Syslog('s', "Sorting %d nodelist entries", n);
i = 0; i = 0;
for (ta = *fap; ta; ta = ta->next) { for (ta = *fap; ta; ta = ta->next) {
vector[i++] = ta; vector[i++] = ta;
Syslog('S', "Before %u:%u/%u.%u", ta->idx.zone, ta->idx.net, ta->idx.node, ta->idx.point);
} }
qsort(vector, n, sizeof(nl_list *), qsort(vector, n, sizeof(nl_list *),
@ -365,7 +358,6 @@ void sort_nllist(nl_list **fap)
ta->next = vector[i++]; ta->next = vector[i++];
else else
ta->next = NULL; ta->next = NULL;
Syslog('S', "After %u:%u/%u.%u", ta->idx.zone, ta->idx.net, ta->idx.node, ta->idx.point);
} }
free(vector); free(vector);
@ -441,7 +433,7 @@ int compile(char *nlname, unsigned short zo, unsigned short ne, unsigned short n
while (fgets(buf, sizeof(buf) -1, nl) && while (fgets(buf, sizeof(buf) -1, nl) &&
(*(buf + strlen(buf) -1) != '\n')) /*void*/; (*(buf + strlen(buf) -1) != '\n')) /*void*/;
if (strlen(buf) > 1) /* Suppress EOF character */ if (strlen(buf) > 1) /* Suppress EOF character */
Syslog('s', "Nodelist: too long line junked (%d)", lineno); Syslog('-', "Nodelist: too long line junked (%d)", lineno);
continue; continue;
} }
@ -479,8 +471,7 @@ int compile(char *nlname, unsigned short zo, unsigned short ne, unsigned short n
ndx.type = NL_POINT; ndx.type = NL_POINT;
bossvalid = FALSE; bossvalid = FALSE;
if ((tmpa=parsefnode(p)) == NULL) { if ((tmpa=parsefnode(p)) == NULL) {
WriteError("%s(%u): unparsable Boss addr \"%s\"", WriteError("%s(%u): unparsable Boss addr \"%s\"", nlname,lineno,p);
nlname,lineno,p);
continue; continue;
} }
boss = TRUE; boss = TRUE;
@ -490,15 +481,11 @@ int compile(char *nlname, unsigned short zo, unsigned short ne, unsigned short n
ndx.node = tmpa->node; ndx.node = tmpa->node;
ndx.point = 0; ndx.point = 0;
tidy_faddr(tmpa); tidy_faddr(tmpa);
Syslog('S', "Boss %u:%u/%u", ndx.zone, ndx.net, ndx.node);
ndx.type = NL_NONE; ndx.type = NL_NONE;
if (in_nllist(ndx, &nll, FALSE)) { if (in_nllist(ndx, &nll, FALSE)) {
Syslog('S', "Boss exists");
bossvalid = TRUE; bossvalid = TRUE;
} }
else
Syslog('S', "Boss not found");
continue; /* no further processing */ continue; /* no further processing */
} else { } else {
boss = FALSE; boss = FALSE;
@ -534,15 +521,12 @@ int compile(char *nlname, unsigned short zo, unsigned short ne, unsigned short n
for (q = buf; *q; q++) for (q = buf; *q; q++)
if (*q < ' ') if (*q < ' ')
*q='.'; *q='.';
WriteError("%s(%u): unidentified entry \"%s\"", WriteError("%s(%u): unidentified entry \"%s\"", nlname, lineno, buf);
nlname, lineno, buf);
continue; continue;
} }
Syslog('S',"Got \"%s\" as \"%s\" typ %d", buf, p, ndx.type);
if ((num=atoi(p)) == 0) { if ((num=atoi(p)) == 0) {
WriteError("%s(%u): bad numeric \"%s\"", WriteError("%s(%u): bad numeric \"%s\"", nlname,lineno,p);
nlname,lineno,p);
continue; continue;
} }
@ -651,12 +635,6 @@ int compile(char *nlname, unsigned short zo, unsigned short ne, unsigned short n
ndx.pflag |= NL_TCPIP; ndx.pflag |= NL_TCPIP;
} }
Syslog('S',"put: %u:%u/%u.%u reg %u upl %u/%u typ %u flg %02X as (%u,%lu)",
ndx.zone,ndx.net,ndx.node,
ndx.point,ndx.region,ndx.upnet,ndx.upnode,
ndx.type,ndx.pflag,ndx.fileno,ndx.offset);
/* /*
* If zone, net and node given, then this list is an * If zone, net and node given, then this list is an
* overlay so we will call in_list() to replace the * overlay so we will call in_list() to replace the
@ -667,7 +645,6 @@ int compile(char *nlname, unsigned short zo, unsigned short ne, unsigned short n
if (!(in_nllist(ndx, &nll, TRUE))) { if (!(in_nllist(ndx, &nll, TRUE))) {
if (ndx.point && bossvalid) { if (ndx.point && bossvalid) {
fill_nllist(ndx, &nll); fill_nllist(ndx, &nll);
Syslog('S', "Add point %u:%u/%u.%u", ndx.zone, ndx.net, ndx.node, ndx.point);
} }
if (!ndx.point) if (!ndx.point)
fill_nllist(ndx, &nll); fill_nllist(ndx, &nll);