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

Added more stuff to debug broken binkp connections

Browse Source
This commit is contained in:
Michiel Broek 2003-09-11 19:36:20 +00:00
parent 8f357661f9
commit 55ea16e838
3 changed files with 70 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -39,6 +39,8 @@ v0.37.7 09-Sep-2003
mbcico: mbcico:
Fixed MB state error from the previous version. Fixed MB state error from the previous version.
Added more code to debug the broken transfer problem.
Add attempt to send a resync command, please test.
mbtask: mbtask:
Added support for debug logfile. Dropped the debug switch for Added support for debug logfile. Dropped the debug switch for

2
html/setup/taskmgr.html
View File

@ -12,7 +12,7 @@
</HEAD> </HEAD>
<BODY> <BODY>
<BLOCKQUOTE> <BLOCKQUOTE>
<h5>Last update 24-Feb-2002</h5> <h5>Last update 09-Sep-2002</h5>
<P>&nbsp;<P> <P>&nbsp;<P>
<H1>MBSE BBS Setup - Task Manager.</H1> <H1>MBSE BBS Setup - Task Manager.</H1>

86
mbcico/binkp.c
View File

@ -108,13 +108,22 @@ typedef enum {InitTransfer, Switch, Receive, Transmit} TransferType;
typedef enum {Ok, Failure, Continue} TrType; typedef enum {Ok, Failure, Continue} TrType;
typedef enum {No, WeCan, WeWant, TheyWant, Active} OptionState; typedef enum {No, WeCan, WeWant, TheyWant, Active} OptionState;
static char *rxstate[] = { (char *)"RxWaitFile", (char *)"RxAccpetFile", (char *)"RxReceData",
(char *)"RxWriteData", (char *)"RxEndOfBatch", (char *)"RxDone" };
static char *txstate[] = { (char *)"TxGetNextFile", (char *)"TryRread", (char *)"ReadSent",
(char *)"WaitLastAck", (char *)"TxDone" };
//static char *tfstate[] = { (char *)"InitTransfer", (char *)"Switch", (char *)"Receive", (char *)"Transmit" };
//static char *trstate[] = { (char *)"Ok", (char *)"Failure", (char *)"Continue" };
static char *opstate[] = { (char *)"No", (char *)"WeCan", (char *)"WeWant", (char *)"TheyWant", (char *)"Active" };
static int RxState; /* Receiver state */ static int RxState; /* Receiver state */
static int TxState; /* Transmitter state */ static int TxState; /* Transmitter state */
//static int TfState; //static int TfState;
static time_t Timer; static time_t Timer;
static int MBflag = WeCan; /* MB option flag */ static int MBflag = No; /* MB option flag */
static int CRAMflag = FALSE; /* CRAM option flag */ static int CRAMflag = FALSE; /* CRAM option flag */
static int CRCflag = WeCan; /* CRC option flag */ static int CRCflag = No; /* CRC option flag */
static int Major = 1; /* Remote major protocol version */ static int Major = 1; /* Remote major protocol version */
static int Minor = 0; /* Remote minor protocol version */ static int Minor = 0; /* Remote minor protocol version */
static int Secure = FALSE; /* Secure session */ static int Secure = FALSE; /* Secure session */
@ -124,6 +133,13 @@ int batchnr = 0, crc_errors = 0;
unsigned char *MD_challenge = NULL; /* Received CRAM challenge data */ unsigned char *MD_challenge = NULL; /* Received CRAM challenge data */
int ext_rand = 0; int ext_rand = 0;
long rsize; /* Receiver filesize */
long roffs; /* Receiver offset */
char *rname; /* Receiver filename */
time_t rtime; /* Receiver filetime */
unsigned long rcrc; /* Receiver crc */
int binkp(int role) int binkp(int role)
{ {
@ -132,6 +148,12 @@ int binkp(int role)
file_list *tosend = NULL, *request = NULL, *respond = NULL, *tmpfl; file_list *tosend = NULL, *request = NULL, *respond = NULL, *tmpfl;
char *nonhold_mail; char *nonhold_mail;
MBflag = WeCan;
if (CFG.NoCRC32)
CRCflag = No;
else
CRCflag = WeCan;
most_debug = TRUE; most_debug = TRUE;
if (role == 1) { if (role == 1) {
if (orgbinkp()) { if (orgbinkp()) {
@ -229,13 +251,6 @@ int binkp(int role)
int resync(off_t off)
{
return 0;
}
/* /*
* Translate string to binkp escaped string, unsafe characters are escaped. * Translate string to binkp escaped string, unsafe characters are escaped.
*/ */
@ -388,6 +403,19 @@ void binkp_send_control(int id,...)
int resync(off_t off)
{
Syslog('b', "Binkp: resync(%d)", off);
if (CRCflag == Active) {
binkp_send_control(MM_GET, "%s %ld %ld %ld %lx", rname, &rsize, &rtime, &roffs, &rcrc);
} else {
binkp_send_control(MM_GET, "%s %ld %ld %ld", rname, &rsize, &rtime, &roffs);
}
return 0;
}
/* /*
* Receive control frame * Receive control frame
*/ */
@ -498,10 +526,12 @@ void b_nul(char *msg)
Syslog('b', "Remote requests MB, current state = %d", MBflag); Syslog('b', "Remote requests MB, current state = %d", MBflag);
if (MBflag == WeCan) { /* Answering session and do binkp/1.0 */ if (MBflag == WeCan) { /* Answering session and do binkp/1.0 */
MBflag = TheyWant; MBflag = TheyWant;
Syslog('b', "MB flag set to TheyWant"); Syslog('b', "MBflag WeCan => TheyWant");
} else if (MBflag == WeWant) { /* Originating session and do binkp/1.0 */ } else if (MBflag == WeWant) { /* Originating session and do binkp/1.0 */
MBflag = Active; MBflag = Active;
Syslog('b', "MB flag set to Active"); Syslog('b', "MBflag WeWant => Active");
} else {
Syslog('b', "MBflag is %s and received MB option", opstate[MBflag]);
} }
} }
if (strstr(msg, (char *)"CRAM-MD5-") != NULL) { /* No SHA-1 support */ if (strstr(msg, (char *)"CRAM-MD5-") != NULL) { /* No SHA-1 support */
@ -513,8 +543,16 @@ void b_nul(char *msg)
MD_challenge = MD_getChallenge(msg, NULL); MD_challenge = MD_getChallenge(msg, NULL);
} }
} }
if ((strstr(msg, (char *)"CRC") != NULL) && (CRCflag == WeCan)) { if (strstr(msg, (char *)"CRC") != NULL) {
CRCflag = TheyWant; if (CRCflag == WeCan) {
CRCflag = TheyWant;
Syslog('b', "CRCflag WeCan => TheyWant");
} else if (CRCflag == WeWant) {
CRCflag = Active;
Syslog('b', "CRCflag WeWant => Active");
} else {
Syslog('b', "CRCflag is %s and received CRC option", opstate[CRCflag]);
}
} }
} else } else
Syslog('+', "Binkp: M_NUL \"%s\"", msg); Syslog('+', "Binkp: M_NUL \"%s\"", msg);
@ -562,13 +600,21 @@ SM_STATE(WaitConn)
Loaded = FALSE; Loaded = FALSE;
Syslog('+', "Binkp: node %s", ascfnode(remote->addr, 0x1f)); Syslog('+', "Binkp: node %s", ascfnode(remote->addr, 0x1f));
IsDoing("Connect binkp %s", ascfnode(remote->addr, 0xf)); IsDoing("Connect binkp %s", ascfnode(remote->addr, 0xf));
/*
* Build options we want
*/
p = xstrcpy((char *)"OPT"); p = xstrcpy((char *)"OPT");
if (MBflag == WeCan) { if (MBflag == WeCan) {
p = xstrcat(p, (char *)" MB"); p = xstrcat(p, (char *)" MB");
MBflag = WeWant; MBflag = WeWant;
Syslog('b', "MBflag WeCan => WeWant");
} }
if ((noderecord(remote->addr)) && nodes.CRC32 && !CFG.NoCRC32) if ((noderecord(remote->addr)) && nodes.CRC32 && (CRCflag == WeCan)) {
p = xstrcat(p, (char *)" CRC"); p = xstrcat(p, (char *)" CRC");
CRCflag = WeWant;
Syslog('b', "CRCflag WeCan => WeWant");
}
if (strcmp(p, (char *)"OPT")) if (strcmp(p, (char *)"OPT"))
binkp_send_control(MM_NUL, p); binkp_send_control(MM_NUL, p);
free(p); free(p);
@ -1085,12 +1131,12 @@ int binkp_batch(file_list *to_send, int role)
int rc = 0, NotDone, rxlen = 0, txlen = 0, rxerror = FALSE; int rc = 0, NotDone, rxlen = 0, txlen = 0, rxerror = FALSE;
static char *txbuf, *rxbuf; static char *txbuf, *rxbuf;
FILE *txfp = NULL, *rxfp = NULL; FILE *txfp = NULL, *rxfp = NULL;
long txpos = 0, rxpos = 0, stxpos = 0, written, rsize, roffs, lsize, gsize, goffset; long txpos = 0, rxpos = 0, stxpos = 0, written, lsize, gsize, goffset;
int sverr, cmd = FALSE, GotFrame = FALSE, blklen = 0, c, Found = FALSE; int sverr, cmd = FALSE, GotFrame = FALSE, blklen = 0, c, Found = FALSE;
unsigned short header = 0; unsigned short header = 0;
char *rname, *lname, *gname; char *lname, *gname;
time_t rtime, ltime, gtime; time_t ltime, gtime;
unsigned long rcrc = 0, tcrc = 0, rxcrc = 0; unsigned long tcrc = 0, rxcrc = 0;
off_t rxbytes; off_t rxbytes;
binkp_list *bll = NULL, *tmp, *tmpg, *cursend = NULL; binkp_list *bll = NULL, *tmp, *tmpg, *cursend = NULL;
file_list *tsl; file_list *tsl;
@ -1103,6 +1149,7 @@ int binkp_batch(file_list *to_send, int role)
txtvstart.tv_sec = txtvstart.tv_usec = 0; txtvstart.tv_sec = txtvstart.tv_usec = 0;
txtvend.tv_sec = txtvend.tv_usec = 0; txtvend.tv_sec = txtvend.tv_usec = 0;
tz.tz_minuteswest = tz.tz_dsttime = 0; tz.tz_minuteswest = tz.tz_dsttime = 0;
rcrc = 0;
batchnr++; batchnr++;
Syslog('+', "Binkp: starting batch %d", batchnr); Syslog('+', "Binkp: starting batch %d", batchnr);
@ -1137,7 +1184,7 @@ int binkp_batch(file_list *to_send, int role)
Nopper(); Nopper();
if (binkp_expired()) { if (binkp_expired()) {
Syslog('!', "Binkp: Transfer timeout"); Syslog('!', "Binkp: Transfer timeout");
Syslog('b', "Binkp: TxState=%d, RxState=%d, rxlen=%d", TxState, RxState, rxlen); Syslog('b', "Binkp: TxState=%s, RxState=%s, rxlen=%d", txstate[TxState], rxstate[RxState], rxlen);
RxState = RxDone; RxState = RxDone;
TxState = TxDone; TxState = TxDone;
binkp_send_control(MM_ERR, "Transfer timeout"); binkp_send_control(MM_ERR, "Transfer timeout");
@ -1520,6 +1567,7 @@ int binkp_batch(file_list *to_send, int role)
binkp_send_control(MM_SKIP, "%s %ld %ld", rname, rsize, rtime); binkp_send_control(MM_SKIP, "%s %ld %ld", rname, rsize, rtime);
RxState = RxWaitFile; RxState = RxWaitFile;
} else { } else {
Syslog('b', "rsize=%d, rxbytes=%d, roffs=%d", rsize, rxbytes, roffs);
RxState = RxReceData; RxState = RxReceData;
} }
break; break;