A38 netmail routing fix

This commit is contained in:
mysticbbs 2013-09-18 02:16:08 -04:00
parent be1255c010
commit 49d37fb5f7
2 changed files with 21 additions and 11 deletions

View File

@ -210,7 +210,11 @@ Var
FillChar (PH, SizeOf(PH), 0); FillChar (PH, SizeOf(PH), 0);
PH.OrigZone := MsgBase^.GetOrigAddr.Zone;
PH.OrigNet := MsgBase^.GetOrigAddr.Net;
PH.OrigNode := MsgBase^.GetOrigAddr.Node; PH.OrigNode := MsgBase^.GetOrigAddr.Node;
PH.DestZone := EchoNode.Address.Zone;
PH.DestNet := EchoNode.Address.Net;
PH.DestNode := EchoNode.Address.Node; PH.DestNode := EchoNode.Address.Node;
PH.Year := DT.Year; PH.Year := DT.Year;
PH.Month := DT.Month; PH.Month := DT.Month;
@ -219,11 +223,7 @@ Var
PH.Minute := DT.Min; PH.Minute := DT.Min;
PH.Second := DT.Sec; PH.Second := DT.Sec;
PH.PKTType := 2; PH.PKTType := 2;
PH.OrigNet := MsgBase^.GetOrigAddr.Net;
PH.DestNet := EchoNode.Address.Net;
PH.ProdCode := 254; // RESEARCH THIS PH.ProdCode := 254; // RESEARCH THIS
PH.OrigZone := MsgBase^.GetOrigAddr.Zone;
PH.DestZone := EchoNode.Address.Zone;
//Password : Array[1..8] of Char; // RESEARCH THIS //Password : Array[1..8] of Char; // RESEARCH THIS
BlockWrite (F, PH, SizeOf(PH)); BlockWrite (F, PH, SizeOf(PH));
@ -232,11 +232,17 @@ Var
FillChar (MH, SizeOf(MH), 0); FillChar (MH, SizeOf(MH), 0);
MH.MsgType := 2; MH.MsgType := 2;
MH.OrigNode := MsgBase^.GetOrigAddr.Node;
MH.DestNode := EchoNode.Address.Node;
MH.OrigNet := MsgBase^.GetOrigAddr.Net;
MH.DestNet := EchoNode.Address.Net;
If MBase.NetType = 3 Then Begin
MH.DestNode := MsgBase^.GetDestAddr.Node;
MH.DestNet := MsgBase^.GetDestAddr.Net;
End Else Begin
MH.DestNode := EchoNode.Address.Node;
MH.DestNet := EchoNode.Address.Net;
End;
MH.OrigNode := MsgBase^.GetOrigAddr.Node;
MH.OrigNet := MsgBase^.GetOrigAddr.Net;
TempStr1 := FormatDate(DT, 'DD NNN YY HH:II:SS') + #0; TempStr1 := FormatDate(DT, 'DD NNN YY HH:II:SS') + #0;
Move (TempStr1[1], MH.DateTime[0], 20); Move (TempStr1[1], MH.DateTime[0], 20);
@ -256,7 +262,7 @@ Var
WriteStr ('AREA:' + MBase.EchoTag, #13); WriteStr ('AREA:' + MBase.EchoTag, #13);
If MBase.NetType = 3 Then If MBase.NetType = 3 Then
WriteStr (#1 + 'INTL ' + strAddr2Str(EchoNode.Address) + ' ' + strAddr2Str(MsgBase^.GetOrigAddr), #13); WriteStr (#1 + 'INTL ' + strAddr2Str(MsgBase^.GetDestAddr) + ' ' + strAddr2Str(MsgBase^.GetOrigAddr), #13);
WriteStr (#1 + 'TID: ' + mysSoftwareID + ' ' + mysVersion, #13); WriteStr (#1 + 'TID: ' + mysSoftwareID + ' ' + mysVersion, #13);

View File

@ -3783,4 +3783,8 @@
including possible data port issues and when the HUB does not have a QWK including possible data port issues and when the HUB does not have a QWK
packet with new messages for you. packet with new messages for you.
! Fixed a bug where Mystic would incorrectly address routed Netmail in both
the header and INTL kludge. This could cause tossers to not correctly
reroute netmail to the correct destination.
<ALPHA 38 RELEASED> <ALPHA 38 RELEASED>