From a78ed544a2dfc735ec05e1eb9372ed94f2c3bf1d Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Mon, 15 Aug 2005 17:44:10 +0000 Subject: [PATCH] Change seenby lists pointer type --- ChangeLog | 1 + mbfido/ptic.c | 22 ++++++++++------------ mbfido/ptic.h | 2 +- mbfido/tic.c | 6 ++++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7c50f36..46e71d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ v0.71.4 12-Aug-2005 Reinstalled charset translation on the gateway. Changed the way how FTN kludges are translated to RFC headers. Dropped support for newsgroup distribution. + In tic processing changed pointer type for seenby lists. mbsebbs: Fixed headerlines for posting news. diff --git a/mbfido/ptic.c b/mbfido/ptic.c index 102d5edf..6a3edfe1 100644 --- a/mbfido/ptic.c +++ b/mbfido/ptic.c @@ -4,7 +4,7 @@ * Purpose ...............: Process 1 .tic file * ***************************************************************************** - * Copyright (C) 1997-2004 + * Copyright (C) 1997-2005 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -65,7 +65,7 @@ extern int check_dupe; * 1 - Some error * 2 - Orphaned tic */ -int ProcessTic(fa_list *sbl) +int ProcessTic(fa_list **sbl) { time_t Now, Fdate; int Age, First, Listed = FALSE, DownLinks = 0, MustRearc = FALSE; @@ -304,11 +304,11 @@ int ProcessTic(fa_list *sbl) DownLinks++; p_from = fido2faddr(Link.aka); if (TIC.TicIn.Hatch) { - fill_qualify(&qal, Link.aka, FALSE, in_list(p_from, &sbl, TRUE)); + fill_qualify(&qal, Link.aka, FALSE, in_list(p_from, sbl, TRUE)); } else { 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.point == Link.aka.point)), in_list(p_from, &sbl, TRUE)); + (TIC.Aka.point == Link.aka.point)), in_list(p_from, sbl, TRUE)); } tidy_faddr(p_from); } @@ -702,9 +702,9 @@ int ProcessTic(fa_list *sbl) for (i = 0; i < 40; i++) { if (CFG.akavalid[i] && (tic.Aka.zone == CFG.aka[i].zone)) { p_from = fido2faddr(CFG.aka[i]); - if (! in_list(p_from, &sbl, TRUE)) { + if (! in_list(p_from, sbl, TRUE)) { 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); } @@ -716,27 +716,25 @@ int ProcessTic(fa_list *sbl) for (tmpq = qal; tmpq; tmpq = tmpq->next) { if (tmpq->send) { sprintf(sbe, "%u:%u/%u", tmpq->aka.zone, tmpq->aka.net, tmpq->aka.node); - fill_list(&sbl, sbe, NULL); + fill_list(sbl, sbe, NULL); } else { Syslog('f', "Skip SB %u:%u/%u", tmpq->aka.zone, tmpq->aka.net, tmpq->aka.node); } } - uniq_list(&sbl); - sort_list(&sbl); + uniq_list(sbl); + sort_list(sbl); /* * Now forward this file to the qualified downlinks. */ for (tmpq = qal; tmpq; tmpq = tmpq->next) { if (tmpq->send) { - ForwardFile(tmpq->aka, sbl); + ForwardFile(tmpq->aka, *sbl); tic_out++; } } } - Syslog('f', "ProcessTic: post processing start"); - Magic_ExecCommand(); Magic_CopyFile(); Magic_UnpackFile(); diff --git a/mbfido/ptic.h b/mbfido/ptic.h index 92af677d..45eb005d 100644 --- a/mbfido/ptic.h +++ b/mbfido/ptic.h @@ -1,7 +1,7 @@ #ifndef _PTIC_H #define _PTIC_H -int ProcessTic(fa_list *); +int ProcessTic(fa_list **); #endif diff --git a/mbfido/tic.c b/mbfido/tic.c index 68116d58..669e55e8 100644 --- a/mbfido/tic.c +++ b/mbfido/tic.c @@ -4,7 +4,7 @@ * Purpose ...............: Process .tic files * ***************************************************************************** - * Copyright (C) 1997-2004 + * Copyright (C) 1997-2005 * * Michiel Broek FIDO: 2:280/2802 * Beekmansbos 10 @@ -483,8 +483,10 @@ int LoadTic(char *inb, char *tfn) free(Buf); tic_in++; - rc = ProcessTic(sbl); + rc = ProcessTic(&sbl); + Syslog('f', "back from ProcessTic"); tidy_falist(&sbl); + Syslog('f', "tidy_falist(&sbl) done"); return rc; }