Reduced aka match check for areas (dis)connect

This commit is contained in:
Michiel Broek 2002-03-02 16:10:54 +00:00
parent bcbed5d356
commit 3337479238
3 changed files with 7 additions and 4 deletions

View File

@ -4637,6 +4637,9 @@ v0.33.20 10-Feb-2002
Implemented the FileMgr and AreaMgr pause and resume commands. Implemented the FileMgr and AreaMgr pause and resume commands.
Changed logging when AreaMgr/FileMgr commands did fail. Changed logging when AreaMgr/FileMgr commands did fail.
Some checks improved and fixed some potential sigsegv crashes. Some checks improved and fixed some potential sigsegv crashes.
Reduced aka match level for (dis)connect areas to zone, net.
This should fix problems on systems with multiple aka's when
the first aka is not the aka in the areas.
mball: mball:
Will not crash anymore when it needs more then 10 minutes to Will not crash anymore when it needs more then 10 minutes to

View File

@ -668,7 +668,7 @@ void A_Disconnect(faddr *t, char *Area, FILE *tmp)
i = metric(b, fido2faddr(mgroup.UseAka)); i = metric(b, fido2faddr(mgroup.UseAka));
Syslog('m', "Aka match level is %d", i); Syslog('m', "Aka match level is %d", i);
if (i > METRIC_POINT) { if (i >= METRIC_NET) {
fprintf(tmp, "You may not disconnect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f)); fprintf(tmp, "You may not disconnect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
Syslog('+', " %s may not disconnect from group %s", ascfnode(t, 0x1f), mgroup.Name); Syslog('+', " %s may not disconnect from group %s", ascfnode(t, 0x1f), mgroup.Name);
return; return;
@ -748,7 +748,7 @@ void A_Connect(faddr *t, char *Area, FILE *tmp)
i = metric(b, fido2faddr(mgroup.UseAka)); i = metric(b, fido2faddr(mgroup.UseAka));
Syslog('m', "Aka match level is %d", i); Syslog('m', "Aka match level is %d", i);
if (i > METRIC_POINT) { if (i >= METRIC_NET) {
fprintf(tmp, "You may not connect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f)); fprintf(tmp, "You may not connect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
Syslog('+', " %s may not connect to group %s", ascfnode(t, 0x1f), mgroup.Name); Syslog('+', " %s may not connect to group %s", ascfnode(t, 0x1f), mgroup.Name);
return; return;

View File

@ -550,7 +550,7 @@ void F_Disconnect(faddr *t, char *Area, FILE *tmp)
i = metric(b, fido2faddr(fgroup.UseAka)); i = metric(b, fido2faddr(fgroup.UseAka));
Syslog('m', "Aka match level is %d", i); Syslog('m', "Aka match level is %d", i);
if (i > METRIC_POINT) { if (i >= METRIC_NET) {
fprintf(tmp, "You may not disconnect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f)); fprintf(tmp, "You may not disconnect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
Syslog('+', " %s may not disconnect from group %s", ascfnode(t, 0x1f), fgroup.Name); Syslog('+', " %s may not disconnect from group %s", ascfnode(t, 0x1f), fgroup.Name);
return; return;
@ -630,7 +630,7 @@ void F_Connect(faddr *t, char *Area, FILE *tmp)
i = metric(b, fido2faddr(fgroup.UseAka)); i = metric(b, fido2faddr(fgroup.UseAka));
Syslog('m', "Aka match level is %d", i); Syslog('m', "Aka match level is %d", i);
if (i > METRIC_POINT) { if (i >= METRIC_NET) {
fprintf(tmp, "You may not connect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f)); fprintf(tmp, "You may not connect area %s with nodenumber %s\n", Area, ascfnode(t, 0x1f));
Syslog('+', " Node %s may not connect to group %s", ascfnode(t, 0x1f), fgroup.Name); Syslog('+', " Node %s may not connect to group %s", ascfnode(t, 0x1f), fgroup.Name);
return; return;