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

Merge branch 'sfhg/master' from MBSE BBS SourceForge Hg repo into 'master'.

Browse Source
This commit is contained in:
Robert James Clay
2015-05-18 13:00:22 -04:00
parent 11e215fdc4 72d6daa978
commit 8e2a71f399
31 changed files with 912 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mbcico/Makefile
View File

@@ -11,7 +11,7 @@ SRCS = zmmisc.c zmrle.c zmrecv.c zmsend.c binkp.c md5b.c \
recvbark.c respfreq.c sendbark.c tcp.c tcpproto.c wazoo.c \
filetime.c ftsc.c atoul.c portsel.c telnet.c bopenfile.c \
ttyio.c lutil.c scanout.c emsi.c ulock.c dirlock.c \
callstat.c session.c call.c mbcico.c \
callstat.c session.c call.c htoul.c mbcico.c \
outstat.c nlinfo.c mbout.c
HDRS = zmodem.h binkp.h config.h statetbl.h md5b.h \
xmsend.h xmrecv.h m7recv.h m7send.h hydra.h inbound.h \
@@ -20,7 +20,7 @@ HDRS = zmodem.h binkp.h config.h statetbl.h md5b.h \
recvbark.h respfreq.h sendbark.h tcp.h tcpproto.h wazoo.h \
filetime.h ftsc.h atoul.h portsel.h telnet.h bopenfile.h \
ttyio.h lutil.h scanout.h emsi.h ulock.h dirlock.h \
callstat.h session.h call.h mbcico.h \
callstat.h session.h call.h htoul.h mbcico.h \
outstat.h nlinfo.h
MBCICO_OBJS = zmmisc.o zmrle.o zmrecv.o zmsend.o binkp.o md5b.o \
xmsend.o xmrecv.o m7recv.o m7send.o hydra.o inbound.o \
@@ -29,7 +29,7 @@ MBCICO_OBJS = zmmisc.o zmrle.o zmrecv.o zmsend.o binkp.o md5b.o \
recvbark.o respfreq.o sendbark.o tcp.o tcpproto.o wazoo.o \
filetime.o ftsc.o atoul.o portsel.o telnet.o bopenfile.o \
ttyio.o lutil.o scanout.o emsi.o ulock.o dirlock.o \
callstat.o session.o call.o mbcico.o
callstat.o session.o call.o htoul.o mbcico.o
MBOUT_OBJS = outstat.o nlinfo.o mbout.o scanout.o callstat.o
SLIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libnodelist.a
OTHER = Makefile README
@@ -130,6 +130,7 @@ dirlock.o: ../config.h ../lib/mbselib.h dirlock.h
callstat.o: ../config.h ../lib/mbselib.h callstat.h
session.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ttyio.h statetbl.h emsi.h ftsc.h session.h yoohoo.h mbcico.h binkp.h callstat.h inbound.h opentcp.h telnet.h
call.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/nodelist.h ../lib/mbsedb.h session.h callstat.h call.h config.h dial.h lutil.h portsel.h openport.h opentcp.h rdoptions.h inbound.h
htoul.o: ../config.h ../lib/mbselib.h htoul.h
mbcico.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ../lib/users.h ../lib/mbsedb.h config.h answer.h call.h lutil.h mbcico.h session.h binkp.h
outstat.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h ../lib/users.h ../lib/mbsedb.h scanout.h callstat.h outstat.h
nlinfo.o: ../config.h ../lib/mbselib.h ../lib/nodelist.h nlinfo.h

148
mbcico/binkp.c
View File

@@ -161,6 +161,8 @@ struct binkprec {
int rxcompressed; /* Receiver compressed bytes */
char *ropts; /* Receiver M_FILE optional args */
int rmode; /* Receiver compression mode */
int rcrc32; /* Receiver file crc32 */
int rcrcerr; /* Receiver CRC error count */
struct timezone tz; /* Timezone */
@@ -197,12 +199,15 @@ struct binkprec {
int BZ2we; /* BZ2 compression flag */
int BZ2they;
#endif
int NRwe; /* NR mode */
int NRthey;
int NDwe; /* ND mode */
int NDthey;
int NDAwe; /* NDA mode */
int NDAthey;
int CRCwe; /* CRC mode */
int CRCthey;
};
@@ -236,7 +241,7 @@ char *binkp2unix(char *); /* Unix -> Binkp escape */
void fill_binkp_list(binkp_list **, file_list *, off_t); /* Build pending files */
int binkp_pendingfiles(void); /* Count pending files */
void binkp_clear_filelist(int); /* Clear current filelist */
unsigned int htoul(char *); /* Convert ASCII hex to uns int */
static int orgbinkp(void); /* Originate session state */
static int ansbinkp(void); /* Answer session state */
static int file_transfer(void); /* File transfer state */
@@ -264,6 +269,7 @@ int binkp(int role)
bp.txbuf = calloc(MAX_BLKSIZE + 3, sizeof(unsigned char));
bp.rname = calloc(512, sizeof(char));
bp.ropts = calloc(512, sizeof(char));
bp.rcrcerr = 0;
bp.rxfp = NULL;
bp.local_EOB = FALSE;
bp.remote_EOB = FALSE;
@@ -300,6 +306,10 @@ int binkp(int role)
bp.NRwe = Can;
else
bp.NRwe = Want;
if (localoptions & NOCRC)
bp.CRCthey = bp.CRCwe = No;
else
bp.CRCthey = bp.CRCwe = Can;
bp.NRthey = Can;
bp.NDwe = No;
bp.NDthey = No;
@@ -321,7 +331,7 @@ int binkp(int role)
goto binkpend;
}
if (((Loaded && nodes.NoBinkp11) || bp.buggyIrex) && (bp.Major == 1) && (bp.Minor != 0)) {
if ((bp.buggyIrex) && (bp.Major == 1) && (bp.Minor != 0)) {
Syslog('+', "Binkp: forcing downgrade to binkp/1.0 protocol");
bp.Major = 1;
bp.Minor = 0;
@@ -705,6 +715,14 @@ SM_STATE(WaitConn)
}
}
if (!CFG.NoCRC32) {
char s[8]; /* Send OPT CRC if it's not disabled. */
strcpy(s, "OPT CRC");
if ((rc = binkp_send_command(MM_NUL, "%s", s))) {
SM_ERROR;
}
}
if ((rc = binkp_banner(FALSE))) {
SM_ERROR;
}
@@ -935,6 +953,10 @@ SM_STATE(Opts)
Syslog('b', "Binkp: no PLZ compression for this node");
}
#endif
if (localoptions & NOCRC) {
bp.CRCwe = bp.CRCthey = No;
Syslog('b', "Binkp: no CRC mode for this node");
}
binkp_send_comp_opts(FALSE);
binkp_set_comp_state();
@@ -1061,6 +1083,7 @@ TrType binkp_receiver(void)
off_t rxbytes;
int bcmd, rc = 0;
int rc1 = 0, nget = bp.blklen, zavail, nput;
int rc2 = 0;
char zbuf[ZBLKSIZE];
char *buf = bp.rxbuf;
@@ -1148,6 +1171,13 @@ TrType binkp_receiver(void)
bp.rmode = CompGZ;
else if (strcmp((char *)"BZ2", bp.ropts) == 0)
bp.rmode = CompBZ2;
if (bp.CRCthey == Active) {
bp.rcrc32 = htoul(bp.ropts);
if (bp.rcrc32 == 0xffffffff) {
Syslog('b', "Binkp: No CRC in M_FILE - disabling CRC check");
bp.CRCthey = bp.CRCwe = No;
}
}
} else {
/*
* Corrupted command, in case this was serious, send the M_GOT back so it's
@@ -1219,7 +1249,7 @@ TrType binkp_receiver(void)
if ((bp.rsize / (sfs.f_bsize + 1)) >= sfs.f_bfree) {
Syslog('!', "Binkp: only %u blocks free (need %u) in %s for this file", sfs.f_bfree,
(unsigned int)(bp.rsize / (sfs.f_bsize + 1)), tempinbound);
bclosefile(FALSE);
bclosefile(FALSE, FALSE, 0);
bp.rxfp = NULL; /* Force SKIP command */
}
}
@@ -1229,8 +1259,8 @@ TrType binkp_receiver(void)
* We already got this file, send GOT so it will
* be deleted at the remote.
*/
Syslog('+', "Binkp: already got %s, sending GOT", bp.rname);
rc = binkp_send_command(MM_GOT, "%s %ld %ld", bp.rname, bp.rsize, bp.rtime);
Syslog('+', "Binkp: already got %s, sending GOT", bp.rname);
rc = binkp_send_command(MM_GOT, "%s %ld %ld", bp.rname, bp.rsize, bp.rtime);
bp.RxState = RxWaitF;
bp.rxfp = NULL;
if (rc)
@@ -1290,7 +1320,7 @@ TrType binkp_receiver(void)
return Ok;
} else if (bcmd == MM_FILE) {
Syslog('+', "Binkp: partial received file, saving");
bclosefile(FALSE);
bclosefile(FALSE, FALSE, 0);
bp.rxfp = NULL;
bp.RxState = RxAccF;
return Continue;
@@ -1378,22 +1408,42 @@ TrType binkp_receiver(void)
bp.rxpos += written;
if (bp.rxpos == bp.rsize) {
rc = binkp_send_command(MM_GOT, "%s %ld %ld", bp.rname, bp.rsize, bp.rtime);
bclosefile(TRUE);
rc2 = bclosefile(TRUE, (bp.CRCwe == Active), bp.rcrc32);
if (rc2) {
if (rc2 == 2) {
bp.rcrcerr++;
if (bp.rcrcerr == 1) {
/* First CRC error */
rc = binkp_send_command(MM_SKIP, "%s %ld %ld", bp.rname, bp.rsize, bp.rtime);
bp.RxState = RxWaitF;
if (rc)
return Failure;
else
return Ok;
} else {
rc = binkp_send_command(MM_ERR, "Too many CRC errors - session aborted.");
bp.RxState = RxDone;
bp.rxfp = NULL;
bp.rc = MBERR_FTRANSFER;
return Failure;
}
}
}
rc = binkp_send_command(MM_GOT, "%s %ld %ld", bp.rname, bp.rsize, bp.rtime);
bp.rxpos = bp.rxpos - bp.rxbytes;
gettimeofday(&rxtvend, &bp.tz);
#if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H)
if (bp.rxcompressed)
Syslog('+', "Binkp: %s", compress_stat(bp.rxpos, bp.rxcompressed));
Syslog('+', "Binkp: %s", compress_stat(bp.rxpos, bp.rxcompressed));
#endif
Syslog('+', "Binkp: OK %s", transfertime(rxtvstart, rxtvend, bp.rxpos, FALSE));
rcvdbytes += bp.rxpos;
bp.RxState = RxWaitF;
if (rc)
return Failure;
Syslog('+', "Binkp: OK %s", transfertime(rxtvstart, rxtvend, bp.rxpos, FALSE));
rcvdbytes += bp.rxpos;
bp.RxState = RxWaitF;
if (rc)
return Failure;
else
return Ok;
}
return Ok;
}
bp.RxState = RxReceD;
return Ok;
} else if (bp.RxState == RxEOB) {
@@ -1536,20 +1586,23 @@ TrType binkp_transmitter(void)
bp.tmode = CompNone;
extra = (char *)"";
if ((tmp->compress == CompGZ) || (tmp->compress == CompBZ2)) {
bp.tmode = tmp->compress;
Syslog('b', "Binkp: compress_init start");
if ((rc1 = compress_init(bp.tmode))) {
Syslog('+', "Binkp: compress_init failed (rc=%d)", rc1);
tmp->compress = CompNone;
bp.tmode = CompNone;
if ((bp.CRCwe == Active)) {
Syslog('b', "Binkp: CRC mode active - GZ/BZ2 compression disabled");
} else {
if ((tmp->compress == CompGZ) || (tmp->compress == CompBZ2)) {
bp.tmode = tmp->compress;
Syslog('b', "Binkp: compress_init start");
if ((rc1 = compress_init(bp.tmode))) {
Syslog('+', "Binkp: compress_init failed (rc=%d)", rc1);
tmp->compress = CompNone;
bp.tmode = CompNone;
} else {
if (bp.tmode == CompBZ2)
extra = (char *)" BZ2";
else if (bp.tmode == CompGZ)
extra = (char *)" GZ";
else if (bp.tmode == CompGZ)
extra = (char *)" GZ";
Syslog('b', "Binkp: compress_init ok, extra=%s", extra);
}
}
}
@@ -1559,8 +1612,13 @@ TrType binkp_transmitter(void)
Syslog('+', "Binkp: send \"%s\" as \"%s\"", MBSE_SS(tmp->local), MBSE_SS(tmp->remote));
Syslog('+', "Binkp: size %u bytes, dated %s, comp %s",
(unsigned int)tmp->size, date(tmp->date), cpstate[bp.tmode]);
rc = binkp_send_command(MM_FILE, "%s %u %d %d%s", MBSE_SS(tmp->remote),
if ((bp.CRCwe == Active)) {
Syslog('b', "Binkp: CRC active - file %s CRC %x", MBSE_SS(tmp->local), (int)tmp->crc32);
rc = binkp_send_command(MM_FILE, "%s %u %d %d %x", MBSE_SS(tmp->remote), (unsigned int)tmp->size, (int)tmp->date, (unsigned int)tmp->offset, (int)tmp->crc32);
} else {
rc = binkp_send_command(MM_FILE, "%s %u %d %d%s", MBSE_SS(tmp->remote),
(unsigned int)tmp->size, (int)tmp->date, (unsigned int)tmp->offset, extra);
}
if (rc) {
bp.TxState = TxDone;
return Failure;
@@ -2013,16 +2071,13 @@ int binkp_banner(int originate)
return rc;
}
/*
* Send compression options
*/
int binkp_send_comp_opts(int originate)
{
int rc = 0, nr = FALSE;
#if defined(HAVE_ZLIB_H) || defined(HAVE_BZLIB_H)
int rc = 0, nr = FALSE, crc = FALSE;
int plz = FALSE, gz = FALSE, bz2 = FALSE;
char *p = NULL;
@@ -2046,6 +2101,11 @@ int binkp_send_comp_opts(int originate)
}
#endif
if ((bp.CRCwe == Can) || (bp.CRCthey == Can) || (bp.CRCthey == Want)) {
crc = TRUE;
bp.CRCwe = Want;
}
Syslog('b', "Binkp: binkp_send_comp_opts(%s) NRwe=%s NRthey=%s",
originate ?"TRUE":"FALSE", opstate[bp.NRwe], opstate[bp.NRthey]);
if (originate) {
@@ -2061,7 +2121,7 @@ int binkp_send_comp_opts(int originate)
}
}
if (plz || gz || bz2 || nr) {
if (plz || gz || bz2 || nr || crc) {
p = xstrcpy((char *)"OPT");
if (bz2 || gz) {
bp.EXTCMDwe = Want;
@@ -2075,10 +2135,11 @@ int binkp_send_comp_opts(int originate)
p = xstrcat(p, (char *)" PLZ");
if (nr)
p = xstrcat(p, (char *)" NR");
if (crc)
p = xstrcat(p, (char *)" CRC");
rc = binkp_send_command(MM_NUL,"%s", p);
free(p);
}
#endif
return rc;
}
@@ -2123,6 +2184,11 @@ void binkp_set_comp_state(void)
bp.NRwe = bp.NRthey = Active;
Syslog('+', "Binkp: NR mode active");
}
Syslog('b', "Binkp: CRC they=%s we=%s", opstate[bp.CRCthey], opstate[bp.CRCwe]);
if ((bp.CRCthey == Want) && (bp.CRCwe == Want)) {
bp.CRCwe = bp.CRCthey = Active;
Syslog ('+', "Binkp: CRC mode active");
}
}
@@ -2203,13 +2269,13 @@ void parse_m_nul(char *msg)
bp.Minor = atoi(q + 1);
}
/*
* Irex 2.24 upto 2.29 claims binkp/1.1 while it is binkp/1.0
* Irex 2.24 upto 2.67 claims binkp/1.1 while it is binkp/1.0
* Set a flag so we can activate a workaround. This only works
* for incoming sessions.
*/
if ((p = strstr(msg+4, "Internet Rex 2."))) {
q = strtok(p + 15, (char *)" \0");
if ((atoi(q) >= 24) && (atoi(q) <= 29)) {
if ((atoi(q) >= 24) && (atoi(q) <= 67)) {
Syslog('b', " : Irex bug detected, workaround activated");
bp.buggyIrex = TRUE;
}
@@ -2280,7 +2346,14 @@ void parse_m_nul(char *msg)
} else if (strcmp(q, (char *)"ND") == 0) {
Syslog('b', "Binkp: remote wants ND mode, NOT SUPPORTED HERE YET");
bp.NDthey = Want;
}
} else if (strcmp(q, (char *)"CRC") == 0) {
Syslog('b', "Binkp: remote requests CRC mode");
if (bp.CRCthey == Can) {
bp.CRCthey = Want;
binkp_set_comp_state();
}
}
}
} else {
@@ -2761,6 +2834,7 @@ void fill_binkp_list(binkp_list **bkll, file_list *fal, off_t offs)
(*tmpl)->size = tstat.st_size;
(*tmpl)->date = tstat.st_mtime;
(*tmpl)->compress = CompNone;
(*tmpl)->crc32 = file_crc(fal->local, FALSE);
/*
* Search compression method, but only if GZ or BZ2 compression is active.

1
mbcico/binkp.h
View File

@@ -81,6 +81,7 @@ typedef struct _binkp_list {
time_t date; /* File date & time */
off_t offset; /* Start offset */
int compress; /* Compression state */
int crc32; /* File CRC32 checksum */
} binkp_list;

20
mbcico/bopenfile.c
View File

@@ -127,16 +127,17 @@ FILE *bopenfile(char *fname, time_t remtime, off_t remsize, off_t *resofs)
* file so that in a next session we know we must append to that file instead of
* trying to get the file again.
*/
int bclosefile(int success)
int bclosefile(int success, int CRCflag, int crc)
{
int rc = 0;
int tmpcrc;
struct utimbuf ut;
char *temp;
Syslog('b', "Binkp: closefile(), for file \"%s\"", MBSE_SS(infpath));
if ((infp == NULL) || (infpath == NULL)) {
Syslog('+', "Binkp: closefile(), nothing to close");
Syslog('+', "Binkp: bclosefile(), nothing to close");
return 1;
}
@@ -169,9 +170,24 @@ int bclosefile(int success)
else
Syslog('b', "Binkp: unlinked %s", temp);
/* If CRC mode is active, check the CRC of the received file. */
if (CRCflag) {
tmpcrc = file_crc(infpath, FALSE);
if (tmpcrc != crc) { /* CRC check failed. */
Syslog('!', "Binkp: CRC error %s Expected %x Got %x", infpath, crc, tmpcrc);
unlink(infpath); /* Remove file with incorrect CRC. */
isfreq = FALSE;
free(infpath);
infpath = NULL;
return 2;
}
}
/*
* Move file from extra tmp to normal tempinbound.
*/
snprintf(temp, PATH_MAX, "%s/%s", tempinbound, basename(infpath));
if (rc == 0) {

2
mbcico/bopenfile.h
View File

@@ -4,6 +4,6 @@
#define _BOPENFILE_H
FILE *bopenfile(char *, time_t, off_t, off_t *);
int bclosefile(int);
int bclosefile(int, int, int);
#endif

1
mbcico/filelist.c
View File

@@ -180,6 +180,7 @@ static void check_flo(file_list **lst, char *nm)
case '#': p=buf+1; disposition=TFS; break;
case '-':
case '^': p=buf+1; disposition=KFS; break;
case ' ':
case '@': p=buf+1; disposition=LEAVE; break;
case 0: continue;
default: p=buf; disposition=LEAVE; break;

44
mbcico/htoul.c Normal file
View File

@@ -0,0 +1,44 @@
/*****************************************************************************
*
* $Id: htoul.c,v 1.6 2005/10/11 20:49:46 mbse Exp $
* Purpose ...............: Fidonet mailer
*
*****************************************************************************
* Copyright (C) 1997-2005
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
* 1971 BV IJmuiden
* the Netherlands
*
* This file is part of MBSE BBS.
*
* This BBS is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
* later version.
*
* MBSE BBS is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with MBSE BBS; see the file COPYING. If not, write to the Free
* Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*****************************************************************************/
#include "../config.h"
#include "../lib/mbselib.h"
#include "htoul.h"
unsigned int htoul(char *str)
{
unsigned int x;
if (sscanf(str,"%x",&x) == 1)
return x;
else return 0xffffffff;
}

9
mbcico/htoul.h Normal file
View File

@@ -0,0 +1,9 @@
#ifndef _HTOUL_H
#define _HTOUL_H
/* $Id: htoul.h,v 1.2 2005/10/11 20:49:46 mbse Exp $ */
unsigned int htoul(char *);
#endif

5
mbcico/rdoptions.c
View File

@@ -53,6 +53,7 @@ static struct _ktab {
{(char *)"PLZ", NOPLZ},
{(char *)"GZ/BZ2", NOGZBZ2},
{(char *)"NR", NONR},
{(char *)"CRC", NOCRC},
{NULL, 0}
};
@@ -93,6 +94,8 @@ void rdoptions(int Loaded)
localoptions |= NOZEDZAP;
if (CFG.NoHydra)
localoptions |= NOHYDRA;
if (CFG.NoCRC32)
localoptions |= NOCRC;
localoptions |= NONR;
#ifndef HAVE_ZLIB_H
@@ -131,6 +134,8 @@ void rdoptions(int Loaded)
localoptions |= NOGZBZ2;
if (nodes.DoNR)
localoptions &= ~NONR;
if (nodes.DoCRC)
localoptions &= ~NOCRC;
logoptions();
}

1
mbcico/session.h
View File

@@ -67,6 +67,7 @@ extern int localoptions;
#define NOPLZ 0x0400
#define NOGZBZ2 0x0800
#define NONR 0x1000
#define NOCRC 0x2000
struct _history history; /* History record for sessions */