[Mit-cadr-cvs] r373 - trunk/emulator/usim

[ggilley at common-lisp.net]

Author: ggilley
Date: Wed Nov 28 21:59:44 2012
New Revision: 373

Log:
stab at fixing hang on close showing up on ubuntu

Modified:
   trunk/emulator/usim/chaos.c
   trunk/emulator/usim/template.disk9

Modified: trunk/emulator/usim/chaos.c
==============================================================================
--- trunk/emulator/usim/chaos.c	Wed Nov 28 21:48:56 2012	(r372)
+++ trunk/emulator/usim/chaos.c	Wed Nov 28 21:59:44 2012	(r373)
@@ -805,7 +805,7 @@
             free(node);
         if (packet)
         {
-            if (cmp_gt(packet->number, conn->lastreceived))
+            if ((packet->opcode >> 8) != CHAOS_OPCODE_SNS && cmp_gt(packet->number, conn->lastreceived))
                 conn->lastreceived = packet->number;
             conn->remotelastreceived = packet->acknowledgement;
             if (3 * (short)(conn->lastreceived - conn->lastacked) > conn->rwsize)

Modified: trunk/emulator/usim/template.disk9
==============================================================================
--- trunk/emulator/usim/template.disk9	Wed Nov 28 21:48:56 2012	(r372)
+++ trunk/emulator/usim/template.disk9	Wed Nov 28 21:59:44 2012	(r373)
@@ -17,14 +17,14 @@
 #
 partitions:
 MCR1	021	0224	ucadr.mcr.841
-MCR2	0245	0224	nil.mcr.6
+MCR2	0245	0224
 MCR3	0471	0224
 MCR4	0715	0224
 PAGE	01141	0100000
-LOD1	0101141	061400	partition-78.50-LOD1
-LOD2	0162541	061400  LOD2
+LOD1	0101141	061400	partition-78.48-LOD1
+LOD2	0162541	061400
 LOD3	0244141	061400
 LOD4	0325541	061400
-FILE	0407141	0400000 FILE
+FILE	0407141	0400000