Patch #:	5
Type:		bugfix
Priority:	medium
Affects:	sites running GatorBoxes & UAR tunnels
Reported:	Jean-Luc Richier <Jean-Luc.Richier@imag.fr>
Summary:	UAR not handling directed broadcasts correctly
Archived:	munnari.OZ.AU  mac/cap.patches/uar.1.0.patch05
Application:	'cd uar; patch -p < uar.1.0.patch05'


*** ddp.c.orig	Sun Oct 24 19:07:56 1993
--- ddp.c	Wed May 18 13:30:05 1994
***************
*** 15,21 ****
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1 $
   *
   */
  
--- 15,21 ----
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.1 $
   *
   */
  
***************
*** 650,660 ****
  	    fprintf(stderr, "   (local)\n");
  	}
  
  	if (iflist[rtmp->intfc].phase == PHASE2)
  	  pd->lapType = LDDP;
  
  	if (iflist[rtmp->intfc].phase == PHASE2
! 	 && pd->dstNode == BCAST)
  	  dstNet = 0x0000;
  	else
  	  dstNet = pd->dstNet;
--- 650,670 ----
  	    fprintf(stderr, "   (local)\n");
  	}
  
+ 	/*
+ 	 * ensure only long DDP sent for Phase 2
+ 	 *
+ 	 */
  	if (iflist[rtmp->intfc].phase == PHASE2)
  	  pd->lapType = LDDP;
  
+ 	/*
+ 	 * if local Phase 2 broadcast, make
+ 	 * network-wide (maybe zone-specific)
+ 	 *
+ 	 */
  	if (iflist[rtmp->intfc].phase == PHASE2
! 	 && pd->dstNode == BCAST
! 	 && rtmp->dist == 0)
  	  dstNet = 0x0000;
  	else
  	  dstNet = pd->dstNet;
***************
*** 711,721 ****
  	addr = NULL;
  
  	/*
! 	 * determine destination address and local
! 	 * destination node for Phase 1 LAP header
  	 *
  	 */
! 	if (pd->dstNode == BCAST) {
  	  dstNode = BCAST;
  	  dstNet  = iflist[rtmp->intfc].net;
  	  switch (iflist[rtmp->intfc].itype) {
--- 721,732 ----
  	addr = NULL;
  
  	/*
! 	 * determine destination ethernet address (and
! 	 * local destination node for Phase 1 LAP header)
  	 *
  	 */
! 	if (pd->dstNode == BCAST
! 	 && rtmp->dist == 0) {
  	  dstNode = BCAST;
  	  dstNet  = iflist[rtmp->intfc].net;
  	  switch (iflist[rtmp->intfc].itype) {
*** README.orig		Fri Mar 11 11:38:59 1994
--- README		Wed May 18 13:30:52 1994
***************
*** 4,10 ****
  		     The University of Melbourne
  			  djh@munnari.OZ.AU
  			    October, 1993
! 			    version 1.0.4
  
  
  
--- 4,10 ----
  		     The University of Melbourne
  			  djh@munnari.OZ.AU
  			    October, 1993
! 			    version 1.0.5