Patch #:	3
Type:		bug fix
Priority:	medium
Reported:	Robert Crowe <bob@prepress.com>
Modification:	Choose network number of router in preference to rangeStart
Archived:	munnari.OZ.AU  mac/cap.patches/arns.patch003
Application:	'cd arns; patch -p < arns.patch003'


*** ddp.c.orig		Mon Oct 12 14:24:26 1992
--- ddp.c		Mon Dec 21 12:55:55 1992
***************
*** 16,22 ****
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.2 $
   *
   */
  
--- 16,22 ----
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.3 $
   *
   */
  
***************
*** 817,822 ****
--- 817,823 ----
  	u_char *addr;
  	u_char flags;
  	u_char function;
+ 	u_short srcNet;
  	u_short rangeStart;
  	u_short rangeEnd;
  	static char defZone[34];
***************
*** 835,844 ****
--- 836,847 ----
  
  	switch (lapType) {
  	  case SDDP: /* short DDP */
+ 	    srcNet = 0;
  	    function = pkt[5];
  	    data = pkt+6;
  	    break;
  	  case LDDP: /* long DDP */
+ 	    srcNet = (pkt[6] << 8) | pkt[7];
  	    function = pkt[13];
  	    data = pkt+14;
  	    break;
***************
*** 886,892 ****
  	nodeTab[thisNode].connType = ARNS_UNUSED;
  
  	thisNode = 0;
! 	thisNet = rangeStart;
  	eth_addmulti(etfd, zaddr);
  
  	/* probe for new node ID */
--- 889,895 ----
  	nodeTab[thisNode].connType = ARNS_UNUSED;
  
  	thisNode = 0;
! 	thisNet = (srcNet>=rangeStart&&srcNet<=rangeEnd) ? srcNet : rangeStart;
  	eth_addmulti(etfd, zaddr);
  
  	/* probe for new node ID */
*** README.orig		Mon Dec 21 12:57:14 1992
--- README		Mon Dec 21 12:56:44 1992
***************
*** 5,11 ****
  		      The University of Melbourne
  			  djh@munnari.OZ.AU
  			    January, 1992
! 			     version 1.2
  
  
  ARNS is 'A Remote Network Server' package for AppleTalk that allows a
--- 5,11 ----
  		      The University of Melbourne
  			  djh@munnari.OZ.AU
  			    January, 1992
! 			     version 1.3
  
  
  ARNS is 'A Remote Network Server' package for AppleTalk that allows a