github.com/PDP-10.klh10
1
0
Fork 0
mirror of https://github.com/PDP-10/klh10.git synced 2026-04-29 05:04:54 +00:00
Code Issues Releases Wiki Activity

Correct pklen calculations for CH11

Browse Source 
I'm terribly sorry about this, which dates back to 2005 (or earlier). The effect is on packets >127 bytes (data), but only when receiving from Ethernet, as far as I can see, where a "trailer" is added at the wrong place, resulting in garbage at the ITS end. (I think I've seen this live occasionally.)
This commit is contained in:
Björn Victor
2020-09-01 09:08:02 +02:00
parent 6ac420eede
commit 0a67ea9ea2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dpchaos.c
View File

@@ -649,7 +649,7 @@ void chaostohost_pf_ether(struct dpchaos_s *dpchaos, unsigned char *buffp, int c
return; return;
} }
// Chaos data length // Chaos data length
int ccnt = ((pp[3] & 0xf) << 4) | pp[2]; /* un-swapped */ int ccnt = ((pp[3] & 0xf) << 8) | pp[2]; /* un-swapped */
if (DBGFLG & 1) { if (DBGFLG & 1) {
dbprintln("Read Chaos pkt len %d (incl EH), offset %d, %d (pkt len), %d (Chaos data len)", dbprintln("Read Chaos pkt len %d (incl EH), offset %d, %d (pkt len), %d (Chaos data len)",
@@ -836,7 +836,7 @@ void chaostohost_chudp(struct dpchaos_s *dpchaos, unsigned char *buffp)
{ {
/* check that the packet is complete: /* check that the packet is complete:
4 bytes CHUDP header, Chaos header, add Chaos pkt length, plus 6 bytes trailer */ 4 bytes CHUDP header, Chaos header, add Chaos pkt length, plus 6 bytes trailer */
int chalen = ((buffp[DPCHAOS_CHUDP_DATAOFFSET+2] & 0xf)<<4) | buffp[DPCHAOS_CHUDP_DATAOFFSET+3]; int chalen = ((buffp[DPCHAOS_CHUDP_DATAOFFSET+2] & 0xf)<<8) | buffp[DPCHAOS_CHUDP_DATAOFFSET+3];
int datalen = (DPCHAOS_CHUDP_DATAOFFSET + CHAOS_HEADERSIZE + chalen); int datalen = (DPCHAOS_CHUDP_DATAOFFSET + CHAOS_HEADERSIZE + chalen);
int chafrom = (buffp[cnt-4]<<8) | buffp[cnt-3]; int chafrom = (buffp[cnt-4]<<8) | buffp[cnt-3];
char *ip = inet_ntoa(ip_sender.sin_addr); char *ip = inet_ntoa(ip_sender.sin_addr);
@@ -1031,7 +1031,7 @@ hosttochaos(register struct dpchaos_s *dpchaos)
} }
/* Come here to handle output packet */ /* Come here to handle output packet */
int chlen = ((buff[dpchaos->dpchaos_outoff+2] & 0xf) << 4) | buff[dpchaos->dpchaos_outoff+3]; // DPCHAOS_CHUDP_DATAOFFSET int chlen = ((buff[dpchaos->dpchaos_outoff+2] & 0xf) << 8) | buff[dpchaos->dpchaos_outoff+3]; // DPCHAOS_CHUDP_DATAOFFSET
if ((chlen+(chlen%2) + CHAOS_HEADERSIZE + dpchaos->dpchaos_outoff + CHAOS_HW_TRAILERSIZE) > rcnt) { if ((chlen+(chlen%2) + CHAOS_HEADERSIZE + dpchaos->dpchaos_outoff + CHAOS_HW_TRAILERSIZE) > rcnt) {
if (1 || DBGFLG) if (1 || DBGFLG)
@@ -1528,7 +1528,7 @@ dumppkt(unsigned char *ucp, int cnt)
cnt -= off; cnt -= off;
fprintf(stderr,"Opcode: %#o (%s), unused: %o\r\nFC: %d, Nbytes %d.\r\n", fprintf(stderr,"Opcode: %#o (%s), unused: %o\r\nFC: %d, Nbytes %d.\r\n",
ucp[0], ch_opcode(ucp[0]), ucp[0], ch_opcode(ucp[0]),
ucp[1], ucp[2]>>4, ((ucp[2]&0xf)<<4) | ucp[3]); ucp[1], ucp[2]>>4, ((ucp[2]&0xf)<<8) | ucp[3]);
fprintf(stderr,"Dest host: %#o, index %#o\r\nSource host: %#o, index %#o\r\n", fprintf(stderr,"Dest host: %#o, index %#o\r\nSource host: %#o, index %#o\r\n",
(ucp[4]<<8)|ucp[5], (ucp[6]<<8)|ucp[7], (ucp[4]<<8)|ucp[5], (ucp[6]<<8)|ucp[7],
(ucp[8]<<8)|ucp[9], (ucp[10]<<8)|ucp[11]); (ucp[8]<<8)|ucp[9], (ucp[10]<<8)|ucp[11]);

6
src/dvch11.c
View File

@@ -1162,7 +1162,7 @@ showpkt(FILE *f, char *id, unsigned char *ucp, int cnt)
fprintf(stderr,"%s pkt dump, len %d\r\n", id, cnt); fprintf(stderr,"%s pkt dump, len %d\r\n", id, cnt);
fprintf(stderr,"Opcode: %#o (%s), unused: %o\r\nFC: %d., Nbytes %d.\r\n", fprintf(stderr,"Opcode: %#o (%s), unused: %o\r\nFC: %d., Nbytes %d.\r\n",
ucp[0], ch_opcode(ucp[0]), ucp[0], ch_opcode(ucp[0]),
ucp[1], ucp[2]>>4, ((ucp[2]&0xf)<<4) | ucp[3]); ucp[1], ucp[2]>>4, ((ucp[2]&0xf)<<8) | ucp[3]);
fprintf(stderr,"Dest host: %#o, index %#o\r\nSource host: %#o, index %#o\r\n", fprintf(stderr,"Dest host: %#o, index %#o\r\nSource host: %#o, index %#o\r\n",
(ucp[4]<<8)|ucp[5], (ucp[6]<<8)|ucp[7], (ucp[4]<<8)|ucp[5], (ucp[6]<<8)|ucp[7],
(ucp[8]<<8)|ucp[9], (ucp[10]<<8)|ucp[11]); (ucp[8]<<8)|ucp[9], (ucp[10]<<8)|ucp[11]);
@@ -1432,7 +1432,7 @@ chaos_outxfer(register struct ch11 *ch)
/* Output xfer requested! */ /* Output xfer requested! */
#if 1 /* #### Debug */ #if 1 /* #### Debug */
int chlen = ((ch->ch_sbuf[dpc->dpchaos_outoff+2] & 0xf) << 4) | ch->ch_sbuf[dpc->dpchaos_outoff+3]; // DPCHUDP_DATAOFFSET int chlen = ((ch->ch_sbuf[dpc->dpchaos_outoff+2] & 0xf) << 8) | ch->ch_sbuf[dpc->dpchaos_outoff+3]; // DPCHUDP_DATAOFFSET
#endif #endif
cnt = (ch->ch_optr - ch->ch_sbuf) - dpc->dpchaos_outoff; // DPCHUDP_DATAOFFSET cnt = (ch->ch_optr - ch->ch_sbuf) - dpc->dpchaos_outoff; // DPCHUDP_DATAOFFSET
#if 1 /* #### Debug */ #if 1 /* #### Debug */
@@ -1523,7 +1523,7 @@ chaos_inxfer(register struct ch11 *ch)
/* check hw trailer: dest, checksum */ /* check hw trailer: dest, checksum */
// byte order warning... // byte order warning...
u_short chlen = ((pp[2] & 0xf) << 4) | pp[3]; u_short chlen = ((pp[2] & 0xf) << 8) | pp[3];
u_short trdest = ((pp[cnt-6]<<8) | pp[cnt-5]); u_short trdest = ((pp[cnt-6]<<8) | pp[cnt-5]);
u_short hddest = (pp[4] << 8) | pp[5]; u_short hddest = (pp[4] << 8) | pp[5];
u_short cksm = (pp[cnt-2]<<8) | pp[cnt-1]; u_short cksm = (pp[cnt-2]<<8) | pp[cnt-1];