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

More AreaMgr/FileMgr fixes

Browse Source
This commit is contained in:
Michiel Broek
2002-03-02 19:50:13 +00:00
parent 3337479238
commit 8d1969771a
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mbfido/areamgr.c
View File

@@ -665,7 +665,7 @@ void A_Disconnect(faddr *t, char *Area, FILE *tmp)
}
b = bestaka_s(t);
i = metric(b, fido2faddr(mgroup.UseAka));
i = metric(b, fido2faddr(msgs.Aka));
Syslog('m', "Aka match level is %d", i);
if (i >= METRIC_NET) {
@@ -745,7 +745,7 @@ void A_Connect(faddr *t, char *Area, FILE *tmp)
}
b = bestaka_s(t);
i = metric(b, fido2faddr(mgroup.UseAka));
i = metric(b, fido2faddr(msgs.Aka));
Syslog('m', "Aka match level is %d", i);
if (i >= METRIC_NET) {
@@ -772,7 +772,7 @@ void A_Connect(faddr *t, char *Area, FILE *tmp)
*/
a_list = TRUE;
Syslog('+', "Connected echo area %s", Area);
fprintf(tmp, "Connected to area %s\n", Area);
fprintf(tmp, "Connected to area %s using aka %s\n", Area, aka2str(msgs.Aka));
return;
}
@@ -805,7 +805,9 @@ void A_All(faddr *t, int Connect, FILE *tmp, char *Grp)
}
f = bestaka_s(t);
Syslog('m', "Bestaka for %s is %s", ascfnode(t, 0x1f), ascfnode(f, 0x1f));
temp = xstrcpy(ascfnode(t, 0x1f));
Syslog('m', "Bestaka for %s is %s", temp, ascfnode(f, 0x1f));
free(temp);
temp = calloc(PATH_MAX, sizeof(char));
sprintf(temp, "%s/etc/mareas.data", getenv("MBSE_ROOT"));
@@ -840,8 +842,9 @@ void A_All(faddr *t, int Connect, FILE *tmp, char *Grp)
fseek(mp, msgshdr.hdrsize, SEEK_SET);
while (fread(&msgs, msgshdr.recsize, 1, mp) == 1) {
if ((!strcmp(Group, msgs.Group)) && (msgs.Active) && (!msgs.Mandatory) &&
(metric(fido2faddr(mgroup.UseAka), f) == METRIC_EQUAL)) {
if ((!strcmp(Group, msgs.Group)) && (msgs.Active) && (!msgs.Mandatory) && strlen(msgs.Tag) &&
((msgs.Type == ECHOMAIL) || (msgs.Type == NEWS) || (msgs.Type == LIST)) &&
(metric(fido2faddr(msgs.Aka), f) < METRIC_NET)) {
if (Connect) {
Link = FALSE;
@@ -863,7 +866,7 @@ void A_All(faddr *t, int Connect, FILE *tmp, char *Grp)
fseek(mp, - sizeof(Sys), SEEK_CUR);
fwrite(&Sys, sizeof(Sys), 1, mp);
Syslog('+', "AreaMgr: Connected %s", msgs.Tag);
fprintf(tmp, "Connected area %s\n", msgs.Tag);
fprintf(tmp, "Connected area %s using aka %s\n", msgs.Tag, aka2str(msgs.Aka));
a_list = TRUE;
break;
}

11
mbfido/filemgr.c
View File

@@ -547,7 +547,7 @@ void F_Disconnect(faddr *t, char *Area, FILE *tmp)
}
b = bestaka_s(t);
i = metric(b, fido2faddr(fgroup.UseAka));
i = metric(b, fido2faddr(tic.Aka));
Syslog('m', "Aka match level is %d", i);
if (i >= METRIC_NET) {
@@ -627,7 +627,7 @@ void F_Connect(faddr *t, char *Area, FILE *tmp)
}
b = bestaka_s(t);
i = metric(b, fido2faddr(fgroup.UseAka));
i = metric(b, fido2faddr(tic.Aka));
Syslog('m', "Aka match level is %d", i);
if (i >= METRIC_NET) {
@@ -653,7 +653,7 @@ void F_Connect(faddr *t, char *Area, FILE *tmp)
*/
f_list = TRUE;
Syslog('+', "Connected to file area %s", Area);
fprintf(tmp, "Connected to area %s\n", Area);
fprintf(tmp, "Connected to area %s using aka %s\n", Area, aka2str(tic.Aka));
return;
}
@@ -719,7 +719,8 @@ void F_All(faddr *t, int Connect, FILE *tmp, char *Grp)
fseek(fp, tichdr.hdrsize, SEEK_SET);
while (fread(&tic, tichdr.recsize, 1, fp) == 1) {
if ((!strcmp(Group, tic.Group)) && tic.Active && (metric(fido2faddr(fgroup.UseAka), f) == METRIC_EQUAL)) {
if ((!strcmp(Group, tic.Group)) && tic.Active && strlen(tic.Name) &&
(metric(fido2faddr(tic.Aka), f) < METRIC_NET)) {
if (Connect) {
Link = FALSE;
@@ -740,7 +741,7 @@ void F_All(faddr *t, int Connect, FILE *tmp, char *Grp)
fseek(fp, - sizeof(Sys), SEEK_CUR);
fwrite(&Sys, sizeof(Sys), 1, fp);
Syslog('+', "FileMgr: Connected %s", tic.Name);
fprintf(tmp, "Connected area %s\n", tic.Name);
fprintf(tmp, "Connected area %s using aka %s\n", tic.Name, aka2str(tic.Aka));
f_list = TRUE;
break;
}