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

Fixes for mbnntp

Browse Source
This commit is contained in:
Michiel Broek 2004-04-15 19:38:12 +00:00
parent 4aacf882e6
commit 884cb156ad
7 changed files with 220 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,9 @@ v0.51.4 11-Apr-2004
Start mbsetup and leave. This wil update the message area
records.
libmsgbase.a:
With JAM_Readheader the Msg.Replyid field wasn't filled.
mbcico:
All heavy debug logmessages are now in defines and are only
enabled with ./configure --enable-newbinkp

2
TODO
View File

@ -30,7 +30,7 @@ libdiesel.a:
processed, instead the previous macro value will be returned.
libmsgbase.a:
N: Msg.Replyid is not filled. CRC fields are not filled.
N: CRC fields are not filled.
mbsebbs:
X: Better word wrapping or paragraph justification in editor.

7
lib/jammsg.c
View File

@ -889,7 +889,7 @@ int JAM_ReadHeader (unsigned long ulMsg)
// --------------------------------------------------------------------
// The message request is not the last retrived or the file pointers
// are not positioned where they should be, so now we attempt to
// retrive the message header scanning the database from the beginning.
// retrieve the message header scanning the database from the beginning.
// --------------------------------------------------------------------
Msg.Id = 0L;
lseek (fdJdx, 0L, SEEK_SET);
@ -1021,6 +1021,11 @@ int JAM_ReadHeader (unsigned long ulMsg)
Msg.Msgid[(int)jamSubField->DatLen] = '\0';
break;
case JAMSFLD_REPLYID:
memcpy (Msg.Replyid, pPos, (int)jamSubField->DatLen);
Msg.Replyid[(int)jamSubField->DatLen] = '\0';
break;
default:
break;
}

1
mbfido/scannews.c
View File

@ -408,6 +408,7 @@ int get_xover(char *grpname, long startnr, long endnr, List **art)
if ((strlen(resp) == 1) && (strcmp(resp, ".") == 0)) {
done = TRUE;
} else {
Syslogp('n', printable(resp, 0));
Marker();
Nopper();
pov = xoverview;

56
mbnntp/commands.c
View File

@ -44,6 +44,9 @@ char currentgroup[81]; /* Current newsgroup */
extern unsigned long sentbytes;
void send_xlat(char *);
char *make_msgid(char *);
/*
* Safe sending to the client with charset translation.
@ -78,11 +81,16 @@ void send_xlat(char *inp)
char *make_msgid(unsigned long nr, unsigned long crc)
/*
* Build a faked RFC msgid, use the CRC32 of the FTN msgid,
* the current group and the configured system's fqdn. This
* gives a unique string specific for the message.
*/
char *make_msgid(char *msgid)
{
static char buf[100];
sprintf(buf, "<%lu$%8lx@%s>", nr, crc, CFG.sysdomain);
sprintf(buf, "<%8lx$%s@%s>", StringCRC32(msgid), currentgroup, CFG.sysdomain);
return buf;
}
@ -96,9 +104,9 @@ char *make_msgid(unsigned long nr, unsigned long crc)
*/
void command_abhs(char *buf)
{
char *p, *cmd, *opt, dig[128];
char *p, *cmd, *opt;
unsigned long art = 0L;
int i;
int found;
Syslog('+', "%s", buf);
cmd = strtok(buf, " \0");
@ -117,17 +125,24 @@ void command_abhs(char *buf)
}
if (opt[0] == '<') {
Syslog('n', "\"%s\"", printable(opt, 0));
strcpy(dig, opt+1);
Syslog('n', "\"%s\"", printable(dig, 0));
for (i = 0; i < strlen(dig); i++) {
if (dig[i] == '$') {
dig[i] = '\0';
/*
* We have to read all headers in the area to retrieve the message using the msgid.
*/
found = FALSE;
Syslog('n', "Search from %lu to %lu for %s", MsgBase.Lowest, MsgBase.Highest, opt);
for (art = MsgBase.Lowest; art <= MsgBase.Highest; art++) {
if (Msg_ReadHeader(art)) {
if (strcmp(opt, make_msgid(Msg.Msgid)) == 0) {
Syslog('n', "Found message %lu", art);
found = TRUE;
break;
}
}
Syslog('n', "\"%s\"", printable(dig, 0));
art = atoi(dig);
}
if (! found) {
send_nntp("430 No such article found");
return;
}
} else {
art = atoi(opt);
}
@ -145,7 +160,7 @@ void command_abhs(char *buf)
}
if (strcasecmp(cmd, "STAT") == 0) {
send_nntp("223 %lu %s Article retrieved", art, make_msgid(art, StringCRC32(Msg.Msgid)));
send_nntp("223 %lu %s Article retrieved", art, make_msgid(Msg.Msgid));
return;
}
@ -157,11 +172,11 @@ void command_abhs(char *buf)
if (Msg_Read(art, 75)) {
if (strcasecmp(cmd, "ARTICLE") == 0)
send_nntp("220 %ld %s Article retrieved - Head and body follow", art, make_msgid(art, StringCRC32(Msg.Msgid)));
send_nntp("220 %ld %s Article retrieved - Head and body follow", art, make_msgid(Msg.Msgid));
if (strcasecmp(cmd, "HEAD") == 0)
send_nntp("221 %ld %s Article retrieved - Head follows", art, make_msgid(art, StringCRC32(Msg.Msgid)));
send_nntp("221 %ld %s Article retrieved - Head follows", art, make_msgid(Msg.Msgid));
if (strcasecmp(cmd, "BODY") == 0)
send_nntp("222 %ld %s Article retrieved - Body follows", art, make_msgid(art, StringCRC32(Msg.Msgid)));
send_nntp("222 %ld %s Article retrieved - Body follows", art, make_msgid(Msg.Msgid));
if ((strcasecmp(cmd, "ARTICLE") == 0) || (strcasecmp(cmd, "HEAD") == 0)) {
@ -170,9 +185,9 @@ void command_abhs(char *buf)
send_nntp("Newsgroups: %s", currentgroup);
send_nntp("Subject: %s", Msg.Subject);
send_nntp("Date: %s", rfcdate(Msg.Written));
send_nntp("Message-ID: %s", make_msgid(art, StringCRC32(Msg.Msgid)));
send_nntp("Message-ID: %s", make_msgid(Msg.Msgid));
if (strlen(Msg.Replyid))
send_nntp("References: %s", make_msgid(Msg.Reply, StringCRC32(Msg.Replyid)));
send_nntp("References: %s", make_msgid(Msg.Replyid));
send_nntp("X-JAM-From: %s <%s>", Msg.From, Msg.FromAddress);
if (strlen(Msg.To))
send_nntp("X-JAM-To: %s", Msg.To);
@ -248,7 +263,6 @@ void command_group(char *cmd)
while (fread(&msgs, msgshdr.recsize, 1, fp) == 1) {
if (msgs.Active && ((msgs.Type == ECHOMAIL) || (msgs.Type == NEWS)) && strlen(msgs.Newsgroup) &&
(strcasecmp(opt, msgs.Newsgroup) == 0) && Access(usrconfig.Security, msgs.RDSec)) {
Syslog('n', "Found the group");
if (Msg_Open(msgs.Base)) {
Msg_Number();
Msg_Highest();
@ -417,10 +431,10 @@ void command_xover(char *cmd)
} while ((p = (char *)MsgText_Next()) != NULL);
}
}
sprintf(msgid, "%s", make_msgid(i, StringCRC32(Msg.Msgid)));
sprintf(msgid, "%s", make_msgid(Msg.Msgid));
reply[0] = 0;
if (strlen(Msg.Replyid))
sprintf(reply, "%s", make_msgid(Msg.Reply, StringCRC32(Msg.Replyid)));
sprintf(reply, "%s", make_msgid(Msg.Replyid));
send_nntp("%lu\t%s\t%s <%s>\t%s\t%s\t%s\t%d\t%d", i, Msg.Subject, Msg.From, Msg.FromAddress,
rfcdate(Msg.Written), msgid, reply, bytecount, linecount);
}

52
mbnntp/openport.c
View File

@ -36,6 +36,9 @@
int hanged_up = 0;
void linedrop(int);
void sigpipe(int);
void linedrop(int sig)
@ -63,10 +66,6 @@ int rawport(void)
signal(SIGHUP, linedrop);
Syslog('t', "SIGPIPE => sigpipe()");
signal(SIGPIPE, sigpipe);
if (isatty(0))
return tty_raw(0);
else
return 0;
}
@ -78,51 +77,6 @@ int cookedport(void)
signal(SIGHUP, SIG_IGN);
Syslog('t', "SIGPIPE => SIG_IGN");
signal(SIGPIPE, SIG_IGN);
if (isatty(0))
return tty_cooked();
else
return 0;
}
static struct termios savetios;
static struct termios tios;
int tty_raw(int speed)
{
int rc;
Syslog('t', "Set tty raw");
if ((rc = tcgetattr(0,&savetios))) {
WriteError("$tcgetattr(0,save) return %d",rc);
return rc;
}
tios = savetios;
tios.c_iflag = 0;
tios.c_oflag = 0;
tios.c_cflag &= ~(CSTOPB | PARENB | PARODD);
tios.c_cflag |= CS8 | CREAD | HUPCL | CLOCAL;
tios.c_lflag = 0;
tios.c_cc[VMIN] = 1;
tios.c_cc[VTIME] = 0;
if ((rc = tcsetattr(0,TCSADRAIN,&tios)))
WriteError("$tcsetattr(0,TCSADRAIN,raw) return %d",rc);
return rc;
}
int tty_cooked(void)
{
int rc;
if ((rc = tcsetattr(0,TCSAFLUSH,&savetios)))
Syslog('t', "$tcsetattr(0,TCSAFLUSH,save) return %d",rc);
return rc;
}

4
mbnntp/openport.h
View File

@ -3,12 +3,8 @@
/* $Id$ */
void linedrop(int);
void sigpipe(int);
int rawport(void);
int cookedport(void);
int tty_raw(int);
int tty_cooked(void);
#endif