Merge Hg remote-tracking branch 'sfhg/master' into 'master'
This commit is contained in:
@@ -422,7 +422,7 @@ int UplinkRequest(faddr *t, faddr *From, int FileMgr, char *cmd)
|
||||
fprintf(qp, "Please note, this is an automatic created message\r");
|
||||
|
||||
tm = gmtime(&Now);
|
||||
fprintf(qp, "\001Via %s @%d%02d%02d.%02d%02d%02d.02.UTC %s\r",
|
||||
fprintf(qp, "\001Via %s @%d%02d%02d.%02d%02d%02d.UTC mbfido %s\r",
|
||||
ascfnode(bestaka_s(t), 0x1f), tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec, VERSION);
|
||||
|
||||
|
@@ -104,14 +104,14 @@ int Ping(faddr *f, faddr *t, FILE *fp, int intransit)
|
||||
fprintf(np, "\001PID: MBSE-FIDO %s (%s-%s)\r", VERSION, OsName(), OsCPU());
|
||||
fprintf(np, "\001TZUTC: %s\r", gmtoffset(Now));
|
||||
|
||||
fprintf(np, " Dear %s\r\r", MBSE_SS(f->name));
|
||||
fprintf(np, " Dear %s,\r\r", MBSE_SS(f->name));
|
||||
if (intransit) {
|
||||
fprintf(np, "You did send a PING to %s\r", ascfnode(t, 0x1f));
|
||||
fprintf(np, "This is a TRACE response from \"%s\" aka %s\r", CFG.bbs_name, ascfnode(from, 0x1f));
|
||||
fprintf(np, "The time of arrival is %s\r", rfcdate(Now));
|
||||
fprintf(np, "You sent a PING request to %s.\r", ascfnode(t, 0x1f));
|
||||
fprintf(np, "This is a TRACE response from \"%s\" (AKA %s).\r", CFG.bbs_name, ascfnode(from, 0x1f));
|
||||
fprintf(np, "The time of arrival is %s.\r", rfcdate(Now));
|
||||
} else
|
||||
fprintf(np, "Your Ping arrived here at %s\r", rfcdate(Now));
|
||||
fprintf(np, "Here are all the detected Via lines of the message from you:\r\r");
|
||||
fprintf(np, "Your PING request arrived here at %s.\r", rfcdate(Now));
|
||||
fprintf(np, "Here are all the detected VIA lines from your message:\r\r");
|
||||
fprintf(np, "======================================================================\r");
|
||||
|
||||
rewind(fp);
|
||||
@@ -123,10 +123,10 @@ int Ping(faddr *f, faddr *t, FILE *fp, int intransit)
|
||||
}
|
||||
fprintf(np, "======================================================================\r");
|
||||
|
||||
fprintf(np, "\rWith regards, %s\r\r", CFG.sysop_name);
|
||||
fprintf(np, "\rAll the best,\r%s\r\r", CFG.sysop_name);
|
||||
fprintf(np, "%s\r", TearLine());
|
||||
Now = time(NULL) - (gmt_offset((time_t)0) * 60);
|
||||
rc = postnetmail(np, from, f, NULL, (char *)"Re: Ping", Now, 0x0000, FALSE, from->zone, f->zone);
|
||||
rc = postnetmail(np, from, f, NULL, (char *)"Re: Your PING Request", Now, 0x0000, FALSE, from->zone, f->zone);
|
||||
tidy_faddr(from);
|
||||
|
||||
fclose(np);
|
||||
|
@@ -438,7 +438,7 @@ int postnetmail(FILE *fp, faddr *f, faddr *t, char *orig, char *subject, time_t
|
||||
now = time(NULL);
|
||||
tm = gmtime(&now);
|
||||
ta = bestaka_s(t);
|
||||
fprintf(net, "\001Via %s @%d%02d%02d.%02d%02d%02d.00.UTC mbfido %s\r",
|
||||
fprintf(net, "\001Via %s @%d%02d%02d.%02d%02d%02d.UTC mbfido %s\r",
|
||||
ascfnode(ta, 0x1f), tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec, VERSION);
|
||||
tidy_faddr(ta);
|
||||
|
@@ -1048,7 +1048,7 @@ void ExportNet(unsigned int MsgNum, int UUCPgate)
|
||||
|
||||
now = time(NULL);
|
||||
tm = gmtime(&now);
|
||||
fprintf(qp, "\001Via %s @%d%02d%02d.%02d%02d%02d.01.UTC MBSE BBS %s\r",
|
||||
fprintf(qp, "\001Via %s @%d%02d%02d.%02d%02d%02d.UTC MBSE BBS %s\r",
|
||||
aka2str(msgs.Aka), tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec, VERSION);
|
||||
|
||||
|
Reference in New Issue
Block a user