bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mbtask to stop after a few days

Browse Source
This commit is contained in:
Michiel Broek 2003-01-25 14:20:12 +00:00
parent 415b49a3be
commit 3f1be5a881
3 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -15,6 +15,10 @@ v0.37.01 14-Jan-2003.
if you need to downgrade. if you need to downgrade.
Spanish templates and macros added to the examples. Spanish templates and macros added to the examples.
nodelist.a:
Added experimental support for IP nodes lookup using a default
domain method. This is not the final implementation yet!
common.a: common.a:
Remove a bug which very seldom crashed mbfido with charset Remove a bug which very seldom crashed mbfido with charset
translation. Do we really need charset conversion? translation. Do we really need charset conversion?
@ -22,6 +26,9 @@ v0.37.01 14-Jan-2003.
mbtask: mbtask:
Arcmail for non-CM nodes and Txx nodes is now sent during the Arcmail for non-CM nodes and Txx nodes is now sent during the
node's opening hours or ZMH. node's opening hours or ZMH.
Fixed a bug where one of the nodelists was node closed with
each outbound scan and was causing mbtask to stop functioning
after a few days.
mbfile: mbfile:
In the import function several bugfixes for reading files.bbs. In the import function several bugfixes for reading files.bbs.

30
lib/nodelist.c
View File

@ -456,7 +456,6 @@ int initnl(void)
v++; v++;
if ((*k == '\0') || (*k == '#')) { if ((*k == '\0') || (*k == '#')) {
// Syslog('n', "\"%s\" \"%s\" - ignore", MBSE_SS(k), MBSE_SS(v));
continue; continue;
} }
@ -660,7 +659,6 @@ node *getnlent(faddr *addr)
if ((highest - lowest) <= 1) if ((highest - lowest) <= 1)
break; break;
} }
fclose(fp); fclose(fp);
if (!Found) { if (!Found) {
@ -1013,11 +1011,11 @@ node *getnlent(faddr *addr)
for (tmpd = &nl_domsuffix; *tmpd; tmpd=&((*tmpd)->next)) { for (tmpd = &nl_domsuffix; *tmpd; tmpd=&((*tmpd)->next)) {
if ((*tmpd)->zone == nodebuf.addr.zone) { if ((*tmpd)->zone == nodebuf.addr.zone) {
if (*r++ == '\0') if (*r++ == '\0')
sprintf(tbuf, "f%d.n%d.z%d.%s", nodebuf.addr.node, nodebuf.addr.net, sprintf(tbuf, "f%d.n%d.z%d.%s.%s", nodebuf.addr.node, nodebuf.addr.net,
nodebuf.addr.zone, (*tmpd)->name); nodebuf.addr.zone, nodebuf.addr.domain, (*tmpd)->name);
else else
sprintf(tbuf, "f%d.n%d.z%d.%s%s", nodebuf.addr.node, nodebuf.addr.net, sprintf(tbuf, "f%d.n%d.z%d.%s.%s%s", nodebuf.addr.node, nodebuf.addr.net,
nodebuf.addr.zone, (*tmpd)->name, r); nodebuf.addr.zone, nodebuf.addr.domain, (*tmpd)->name, r);
Syslog('n', "Will try default domain \"%s\"", tbuf); Syslog('n', "Will try default domain \"%s\"", tbuf);
nodebuf.url = xstrcat(nodebuf.url, tbuf); nodebuf.url = xstrcat(nodebuf.url, tbuf);
break; break;
@ -1038,10 +1036,25 @@ node *getnlent(faddr *addr)
if (strlen(tbuf)) if (strlen(tbuf))
break; break;
Syslog('n', "Field8 is not usable"); Syslog('n', "Field8 is not usable");
memset(&tbuf, 0, sizeof(tbuf));
} else if (strcasecmp((*tmpa)->name, "defdomain") == 0) {
Syslog('n', "Trying default domain");
for (tmpd = &nl_domsuffix; *tmpd; tmpd=&((*tmpd)->next)) {
if ((*tmpd)->zone == nodebuf.addr.zone) {
sprintf(tbuf, "f%d.n%d.z%d.%s.%s", nodebuf.addr.node, nodebuf.addr.net,
nodebuf.addr.zone, nodebuf.addr.domain, (*tmpd)->name);
Syslog('n', "Will try default domain \"%s\"", tbuf);
nodebuf.url = xstrcat(nodebuf.url, tbuf);
break;
}
}
if (strlen(tbuf))
break;
Syslog('n', "No matching default domain found for zone %d", nodebuf.addr.zone);
memset(&tbuf, 0, sizeof(tbuf));
} }
} }
} }
fclose(fp);
if (strlen(tbuf) == 0) { if (strlen(tbuf) == 0) {
Syslog('n', "No FQDN found, cannot call"); Syslog('n', "No FQDN found, cannot call");
@ -1065,7 +1078,8 @@ node *getnlent(faddr *addr)
nodebuf.url = xstrcpy((char *)"pots://"); nodebuf.url = xstrcpy((char *)"pots://");
nodebuf.url = xstrcat(nodebuf.url, nodebuf.phone); nodebuf.url = xstrcat(nodebuf.url, nodebuf.phone);
} }
fclose(fp);
nodebuf.addr.name = nodebuf.sysop; nodebuf.addr.name = nodebuf.sysop;
nodebuf.addr.domain = xstrcpy(fdx.domain); nodebuf.addr.domain = xstrcpy(fdx.domain);
nodebuf.upnet = ndx.upnet; nodebuf.upnet = ndx.upnet;

16
lib/nodelist.conf
View File

@ -153,7 +153,7 @@ tcpip IBN 0x00000004 0x00000004
# IBN:* Proposed, use default domain # IBN:* Proposed, use default domain
# IBN:*:port Not yet proposed # IBN:*:port Not yet proposed
# eslf - Extended St. Louis Format fields (NOT YET AVAILABLE) # eslf - Extended St. Louis Format fields (NOT YET AVAILABLE)
# defdomain - Asume default domain (NOT YET AVAILABLE) # defdomain - Asume default domain (VERY EXPERIMENTAL)
# #
# In all cases, the nodes setup overrides everything. # In all cases, the nodes setup overrides everything.
# Order is important, defdomain must be the last if used. # Order is important, defdomain must be the last if used.
@ -161,13 +161,15 @@ tcpip IBN 0x00000004 0x00000004
search field3 search field3
search field6 search field6
search field8 search field8
search defdomain
# The default searchdomain, will be prefixed with f1.n2.z3. # The default searchdomain, will be prefixed with f1.n2.z3.fidonet.
# Node 3:2/1 will look like: f1.n2.z3.fidonet.net
# #
# Zone Suffix # Zone Suffix (without leading dot!)
domsuffix 1 fidonet.net domsuffix 1 net
domsuffix 2 fidonet.net domsuffix 2 net
domsuffix 3 fidonet.net domsuffix 3 net
domsuffix 92 bibnet.ym domsuffix 92 mbse.ym