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

TIC processing now uses qualified system lists

Browse Source
This commit is contained in:
Michiel Broek 2002-11-21 22:15:01 +00:00
parent 3c0829bfbe
commit a197b4f45a
2 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -12,8 +12,9 @@ v0.35.06
Several user input functions don't allow comma's anymore. Several user input functions don't allow comma's anymore.
mbfido: mbfido:
For debug and test added extra logging for tic processing. TIC file forwarding now uses a list of qualified systems to
This will be for better SEEN-BY lists creation. forward to, and with this information builds more reliable
seen-by lines.
v0.35.05 19-Oct-2002 - 13-Nov-2002. v0.35.05 19-Oct-2002 - 13-Nov-2002.

89
mbfido/ptic.c
View File

@ -86,6 +86,7 @@ int ProcessTic(fa_list *sbl)
int BBS_Imp = FALSE, DidBanner = FALSE; int BBS_Imp = FALSE, DidBanner = FALSE;
faddr *p_from; faddr *p_from;
qualify *qal = NULL, *tmpq; qualify *qal = NULL, *tmpq;
fa_list *tmp;
Now = time(NULL); Now = time(NULL);
@ -300,6 +301,9 @@ int ProcessTic(fa_list *sbl)
} }
} }
for (tmp = sbl; tmp; tmp = tmp->next)
Syslog('f', "initial SB list %s", ascfnode(tmp->addr, 0x0f));
/* /*
* Count the actual downlinks for this area and build the list of * Count the actual downlinks for this area and build the list of
* systems qualified to receive this file. * systems qualified to receive this file.
@ -311,11 +315,11 @@ int ProcessTic(fa_list *sbl)
DownLinks++; DownLinks++;
p_from = fido2faddr(Link.aka); p_from = fido2faddr(Link.aka);
if (TIC.TicIn.Hatch) { if (TIC.TicIn.Hatch) {
fill_qualify(&qal, Link.aka, FALSE, in_list(p_from, &sbl, FALSE)); fill_qualify(&qal, Link.aka, FALSE, in_list(p_from, &sbl, TRUE));
} else { } else {
fill_qualify(&qal, Link.aka, ((TIC.Aka.zone == Link.aka.zone) && fill_qualify(&qal, Link.aka, ((TIC.Aka.zone == Link.aka.zone) &&
(TIC.Aka.net == Link.aka.net) && (TIC.Aka.node == Link.aka.node) && (TIC.Aka.net == Link.aka.net) && (TIC.Aka.node == Link.aka.node) &&
(TIC.Aka.point == Link.aka.point)), in_list(p_from, &sbl, FALSE)); (TIC.Aka.point == Link.aka.point)), in_list(p_from, &sbl, TRUE));
} }
tidy_faddr(p_from); tidy_faddr(p_from);
} }
@ -749,71 +753,62 @@ int ProcessTic(fa_list *sbl)
First = TRUE; First = TRUE;
/* /*
* Add all our system aka's to the seenby lines in the same zone * Add all our system aka's to the seenby lines in the same zone,
* omit aka's already in the seenby list.
*/ */
for (i = 0; i < 40; i++) { for (i = 0; i < 40; i++) {
if (TIC.TicIn.Hatch) { if (CFG.akavalid[i] && (tic.Aka.zone == CFG.aka[i].zone)) {
/* p_from = fido2faddr(CFG.aka[i]);
* Hatched file, add all aka's if (! in_list(p_from, &sbl, TRUE)) {
*/
if (CFG.akavalid[i] && (tic.Aka.zone == CFG.aka[i].zone)) {
sprintf(sbe, "%u:%u/%u", CFG.aka[i].zone, CFG.aka[i].net, CFG.aka[i].node);
fill_list(&sbl, sbe, NULL);
}
} else {
/*
* Incoming file, don't add the aka already in the ticfile of our system.
*/
if (CFG.akavalid[i] && (tic.Aka.zone == CFG.aka[i].zone) &&
!((tic.Aka.net == CFG.aka[i].net) && (tic.Aka.node == CFG.aka[i].node))) {
sprintf(sbe, "%u:%u/%u", CFG.aka[i].zone, CFG.aka[i].net, CFG.aka[i].node); sprintf(sbe, "%u:%u/%u", CFG.aka[i].zone, CFG.aka[i].net, CFG.aka[i].node);
fill_list(&sbl, sbe, NULL); fill_list(&sbl, sbe, NULL);
} }
tidy_faddr(p_from);
} }
} }
/*
* Add downlinks to seenby lines
*/
while (GetTicSystem(&Link, First)) {
First = FALSE;
if ((Link.aka.zone) && (Link.sendto) && (!Link.pause) && (!Link.aka.point)) {
if (!((TIC.Aka.zone == Link.aka.zone) && (TIC.Aka.net == Link.aka.net) &&
(TIC.Aka.node == Link.aka.node) && (TIC.Aka.point == Link.aka.point))) {
sprintf(sbe, "%u:%u/%u", Link.aka.zone, Link.aka.net, Link.aka.node);
fill_list(&sbl, sbe, NULL);
Syslog('f', "Old style add SB %s", sbe);
}
}
}
uniq_list(&sbl);
sort_list(&sbl);
/* /*
* Debugging, new style SB adding * Debugging, new style SB adding
*/ */
for (tmpq = qal; tmpq; tmpq = tmpq->next) { for (tmpq = qal; tmpq; tmpq = tmpq->next) {
if (tmpq->send) { if (tmpq->send) {
Syslog('f', "New style add SB %u:%u/%u", tmpq->aka.zone, tmpq->aka.net, tmpq->aka.node); Syslog('f', "Add SB %u:%u/%u", tmpq->aka.zone, tmpq->aka.net, tmpq->aka.node);
sprintf(sbe, "%u:%u/%u", tmpq->aka.zone, tmpq->aka.net, tmpq->aka.node);
fill_list(&sbl, sbe, NULL);
} else { } else {
Syslog('f', "New style skip SB %u:%u/%u", tmpq->aka.zone, tmpq->aka.net, tmpq->aka.node); Syslog('f', "Skip SB %u:%u/%u", tmpq->aka.zone, tmpq->aka.net, tmpq->aka.node);
}
}
uniq_list(&sbl);
sort_list(&sbl);
for (tmp = sbl; tmp; tmp = tmp->next)
Syslog('f', "final SB list %s", ascfnode(tmp->addr, 0x0f));
/*
* Now forward this file to the qualified downlinks.
*/
for (tmpq = qal; tmpq; tmpq = tmpq->next) {
if (tmpq->send) {
ForwardFile(tmpq->aka, sbl);
tic_out++;
} }
} }
/* /*
* Now start forwarding files * Now start forwarding files
*/ */
First = TRUE; // First = TRUE;
while (GetTicSystem(&Link, First)) { // while (GetTicSystem(&Link, First)) {
First = FALSE; // First = FALSE;
if ((Link.aka.zone) && (Link.sendto) && (!Link.pause)) { // if ((Link.aka.zone) && (Link.sendto) && (!Link.pause)) {
if (!((TIC.Aka.zone == Link.aka.zone) && (TIC.Aka.net == Link.aka.net) && // if (!((TIC.Aka.zone == Link.aka.zone) && (TIC.Aka.net == Link.aka.net) &&
(TIC.Aka.node == Link.aka.node) && (TIC.Aka.point == Link.aka.point))) { // (TIC.Aka.node == Link.aka.node) && (TIC.Aka.point == Link.aka.point))) {
tic_out++; // tic_out++;
ForwardFile(Link.aka, sbl); // ForwardFile(Link.aka, sbl);
} // }
} // }
} // }
} }
Magic_ExecCommand(); Magic_ExecCommand();