Skip to content

Commit

Permalink
Commit long-packet fix from FDC
Browse files Browse the repository at this point in the history 
This fixes #93 plus potentially issues transferring files to/from TeraTerm
  • Loading branch information
@davidrg
davidrg committed Sep 15, 2022
1 parent 747012e commit 51ffe26
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 20 deletions.
58 changes: 43 additions & 15 deletions kermit/k95/ckcfn2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Trustees of Columbia University in the City of New York.
All rights reserved. See the C-Kermit COPYING.TXT file or the
copyright text in the ckcmai.c module for disclaimer and permissions.
Last update: 8 May 2022
Last update: 14 September 2022
*/
/*
Note -- if you change this file, please amend the version number and date at
Expand Down Expand Up @@ -1279,6 +1279,7 @@ spack(pkttyp,n,len,d) char pkttyp; int n, len; CHAR *d;
#endif /* CK_ANSIC */
/* spack */ {
register int i;
extern int lpcapu; /* Long packet capability negotiated */
int ix, j, k, x, lp, longpkt, copy, loglen;

#ifdef GFTIMER
Expand All @@ -1292,26 +1293,44 @@ spack(pkttyp,n,len,d) char pkttyp; int n, len; CHAR *d;

#ifdef DEBUG
if (deblog) { /* Save lots of function calls! */
debug(F101,"spack n","",n);
debug(F101,"SPACK n","",n);
#ifdef COMMENT
if (pkttyp != 'D') { /* Data packets would be too long */
debug(F111,"spack data",data,data);
debug(F111,"spack d",d,d);
debug(F111,"SPACK data",data,data);
debug(F111,"SPACK d",d,d);
}
#endif /* COMMENT */
debug(F101,"spack len","",len);
debug(F101,"spack copy","",copy);
debug(F101,"SPACK data len","",len);
debug(F101,"SPACK copy","",copy);
}
#endif /* DEBUG */
/*
Decide whether to send as a long packet.
Fixed to check negotiation result before doing this.
Otherwise there's a border case where the sent packet is one byte
too long because of extra control fields in a long packet.
- fdc 13 September 2022
*/
debug(F101,"SPACK LP decision lpcapu","",lpcapu);
debug(F101,"SPACK LP decision len","",len);
debug(F101,"SPACK LP decision bctl","",bctl);
debug(F101,"SPACK LP decision len+bctl","",len+bctl);

longpkt = 0;
if (lpcapu > 0) { /* Only if long packet capability has been negotiated */
longpkt = (len + bctl + 2) > 96;
/* Len + Seq + Type + Data + Blockcheck */
/* 1 1 2 n 1-3 */
}
debug(F101,"SPACK LP decision longpkt","",longpkt);

longpkt = (len + bctl + 2) > 94; /* Decide whether it's a long packet */
mydata = data - 7 + (longpkt ? 0 : 3); /* Starting position of header */
k = sseqtbl[n]; /* Packet structure info for pkt n */
#ifdef COMMENT
#ifdef DEBUG
if (deblog) { /* Save 2 more function calls... */
debug(F101,"spack mydata","",mydata);
debug(F101,"spack sseqtbl[n]","",k);
debug(F101,"SPACK mydata","",mydata);
debug(F101,"SPACK sseqtbl[n]","",k);
if (k < 0) {
#ifdef STREAMING
if (!streaming)
Expand All @@ -1337,11 +1356,16 @@ spack(pkttyp,n,len,d) char pkttyp; int n, len; CHAR *d;
mydata[i++] = tochar(n); /* SEQ field */
mydata[i++] = pkttyp; /* TYPE field */
j = len + bctl; /* Length of data + block check */
debug(F101,"SPACK len","",len);
debug(F101,"SPACK bctl","",bctl);
debug(F101,"SPACK j","",j);
debug(F101,"SPACK longpkt","",longpkt);
if (longpkt) { /* Long packet? */
int x; /* Yes, work around SCO Xenix/286 */
#ifdef CKTUNING
unsigned int chk;
#endif /* CKTUNING */
debug(F100,"SPACK doing long packet","",0);
x = j / 95; /* compiler bug... */
mydata[lp] = tochar(0); /* Set LEN to zero */
mydata[i++] = tochar(x); /* Extended length, high byte */
Expand All @@ -1358,7 +1382,11 @@ spack(pkttyp,n,len,d) char pkttyp; int n, len; CHAR *d;
mydata[i] = '\0'; /* Terminate for header checksum */
mydata[i++] = tochar(chk1(mydata+lp,5));
#endif /* CKTUNING */
} else mydata[lp] = tochar(j+2); /* Normal LEN */
} else { /* Short packets */
mydata[lp] = tochar(j+2); /* LEN includes Seq and Type */
debug(F101,"SPACK j+2","",j+2);
debug(F101,"SPACK j+2 encoded","",tochar(j+2));
}
/*
When sending a file, the data is already in the right place. If it weren't,
it might make sense to optimize this section by using memcpy or bcopy
Expand Down Expand Up @@ -1506,8 +1534,8 @@ spack(pkttyp,n,len,d) char pkttyp; int n, len; CHAR *d;
#ifdef STREAMING
if (!dontsend) {
#endif /* STREAMING */
debug(F101,"spack spktl","",spktl);
debug(F101,"spack ttol returns","",x);
debug(F101,"SPACK spktl","",spktl);
debug(F101,"SPACK ttol returns","",x);
if (x < 0) { /* Failed. */
if (local && x < -1) {
xxscreen(SCR_ST,ST_ERR,0L,"FAILED: Connection lost");
Expand All @@ -1525,7 +1553,7 @@ spack(pkttyp,n,len,d) char pkttyp; int n, len; CHAR *d;
#ifdef GFTIMER
if (deblog) { /* Log elapsed time for write() */
t2 = gftimer();
debug(F101,"spack ttol msec","",(long)((t2-t1)*1000.0));
debug(F101,"SPACK ttol msec","",(long)((t2-t1)*1000.0));
}
#endif /* GFTIMER */
#endif /* DEBUG */
Expand All @@ -1542,7 +1570,7 @@ spack(pkttyp,n,len,d) char pkttyp; int n, len; CHAR *d;
#ifdef DEBUG
if (deblog) { /* Save two function calls! */
dumpsbuf(); /* Dump send buffers to debug log */
debug(F111,"spack calling screen, mydata=",mydata,n);
debug(F111,"SPACK calling screen, mydata=",mydata,n);
}
#endif /* DEBUG */
}
Expand Down Expand Up @@ -1576,7 +1604,7 @@ chk1(pkt,len) register CHAR *pkt; register int len; {
chk = chk2(pkt,len);
#endif /* CKTUNING */
chk = (((chk & 0300) >> 6) + chk) & 077;
debug(F101,"chk1","",chk);
debug(F111,"chk1","1-byte block check encoded code",chk);
return((int) chk);
}

Expand Down
23 changes: 18 additions & 5 deletions kermit/k95/ckcfns.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
char *fnsv = "C-Kermit functions, 9.0.238, 21 December 2021";
char *fnsv = "C-Kermit functions, 9.0.240, 14 September 2022";

char *nm[] = { "Disabled", "Local only", "Remote only", "Enabled" };

Expand All @@ -15,7 +15,7 @@ char *nm[] = { "Disabled", "Local only", "Remote only", "Enabled" };
Trustees of Columbia University in the City of New York.
All rights reserved. See the C-Kermit COPYING.TXT file or the
copyright text in the ckcmai.c module for disclaimer and permissions.
Last update: Thu May 5 15:22:36 2022
Last update: Wed Sep 14 11:16:15 2022
*/
/*
System-dependent primitives defined in:
Expand Down Expand Up @@ -4755,7 +4755,16 @@ sdata() {
debug(F101,"sdata parity","",parity);
}
#endif /* DEBUG */
/*
This avoids some edge cases where a longer block check
or other factors might push the packet over the edge,
causing (for example) the LEN field of a short packet
to be out of range. - fdc, 14 September 2022
*/
if (spsiz <= 94 && spsiz > 90) spsiz = 90;

#ifdef CKTUNING

if (binary && !parity && !memstr && !funcstr)
len = bgetpkt(spsiz);
else
Expand Down Expand Up @@ -4927,7 +4936,7 @@ seot() {
int q8flag = 0;

CHAR dada[32]; /* Use this instead of data[]. */
/* To avoid some kind of wierd */
/* To avoid some kind of weird */
/* addressing foulup in spack()... */
/* (which might be fixed now...) */

Expand Down Expand Up @@ -5104,6 +5113,10 @@ rpar() {
return(dada); /* Return pointer to string. */
}

/*
S P A R -- Set my sending parameters from the data field of the other
Kermit's S or I packet, or its ACK to my S or I packet.
*/
int
spar(s) CHAR *s; { /* Set parameters */
int x, y, lpsiz, biggest;
Expand Down Expand Up @@ -5259,7 +5272,7 @@ spar(s) CHAR *s; { /* Set parameters */
if (lscapu != 2) lscapu = 0; /* Assume no LS unless forced. */
y = 11; /* Position of next field, if any */
if (biggest >= 10) {
x = xunchar(s[10]);
x = xunchar(s[10]); /* s[10] is the CAPAS bitmask */
debug(F101,"spar capas","",x);
atcapu = (x & atcapb) && atcapr; /* Attributes */
lpcapu = (x & lpcapb) && lpcapr; /* Long packets */
Expand Down Expand Up @@ -5443,7 +5456,7 @@ spar(s) CHAR *s; { /* Set parameters */
char * p;
p = sysidlist[sysindex].sid_name;
tlog(F110,"Remote system type: ",p,0L);
if (sysindex > 0) { /* If partnet's system type known */
if (sysindex > 0) { /* If partner's system type known */
whoarewe(); /* see if we are a match. */
#ifdef CK_SPEED
/* Never unprefix XON and XOFF when sending to VMS */
Expand Down

0 comments on commit 51ffe26

Please # to comment.