diff --git a/utils/mnetftn/mnettoftn.c b/utils/mnetftn/mnettoftn.c index 2b0b639..52723d7 100644 --- a/utils/mnetftn/mnettoftn.c +++ b/utils/mnetftn/mnettoftn.c @@ -485,11 +485,8 @@ int import(char *filename) { for (i=strlen(body) -2; i > 0; i--) { - if (body[i] == '(') { - sprintf(&body[i], "(%s)\r", fido_addr); - break; - } if (body[i] == '\r') { - sprintf(buffer, "\r---\r * Origin: Origin Line Missing... (%s)", fido_addr); + if (body[i] == '\r') { + sprintf(buffer, "\r---\r * Origin: mnet->ftn (%s)", fido_addr); body = realloc(body, strlen(body) + strlen(buffer) + 1); strcat(body, buffer); } @@ -499,7 +496,7 @@ int import(char *filename) { JAM_ClearMsgHeader(&jmh); jmh.DateWritten = msg.timedate; jmh.Attribute |= JAM_MSG_TYPEECHO; - jmh.Attribute |= JAM_MSG_TYPELOCAL; + jmh.Attribute |= JAM_MSG_LOCAL; jsp = JAM_NewSubPacket(); @@ -535,15 +532,6 @@ int import(char *filename) { jsf.Buffer = buffer; JAM_PutSubfield(jsp, &jsf); - if (strlen(msg.reply)> 0) { - jsf.LoID = JAMSFLD_REPLYID; - jsf.HiID = 0; - jsf.DatLen = strlen(msg.reply); - jsf.Buffer = msg.reply; - JAM_PutSubfield(jsp, &jsf); - jmh.ReplyCRC = JAM_Crc32(msg.reply, strlen(msg.reply)); - } - jb = open_jam_base(areas[areaid]->basedir); if (!jb) { return 0;