Submitted by: John Hay <jhay@mikom.csir.co.za>

Here is some patches to IPXrouted. It does the following:

Always use the sap port in the destination address of sap broadcasts.
Clear the host part of network addresses so that routes will really
be deleted in the kernel.

3 files changed, 5 insertions, 9 deletions

diff --git a/usr.sbin/IPXrouted/input.c b/usr.sbin/IPXrouted/input.c
index 0aec53a..0c653bb 100644
--- a/usr.sbin/IPXrouted/input.c
+++ b/usr.sbin/IPXrouted/input.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: input.c,v 1.9 1995/10/11 18:57:17 jhay Exp $
+ *	$Id: input.c,v 1.1 1995/10/26 21:28:16 julian Exp $
  */
 
 #ifndef lint
@@ -52,13 +52,11 @@ ipx_nettosa(net)
 union ipx_net net;
 {
 	static struct sockaddr_ipx sxn;
-	extern char ether_broadcast_addr[6];
 	
 	bzero(&sxn, sizeof (struct sockaddr_ipx));
 	sxn.sipx_family = AF_IPX;
 	sxn.sipx_len = sizeof (sxn);
 	sxn.sipx_addr.x_net = net;
-	sxn.sipx_addr.x_host = *(union ipx_host *)ether_broadcast_addr;
 	return( (struct sockaddr *)&sxn);
 	
 }
diff --git a/usr.sbin/IPXrouted/sap_output.c b/usr.sbin/IPXrouted/sap_output.c
index e074c3a..472e038 100644
--- a/usr.sbin/IPXrouted/sap_output.c
+++ b/usr.sbin/IPXrouted/sap_output.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sap_output.c,v 1.4 1995/10/11 18:57:28 jhay Exp $
+ *	$Id: sap_output.c,v 1.1 1995/10/26 21:28:24 julian Exp $
  */
 
 /*
@@ -60,8 +60,8 @@ sap_supply_toall(void)
 		dst = ifp->int_flags & IFF_BROADCAST ? ifp->int_broadaddr :
 		      ifp->int_flags & IFF_POINTOPOINT ? ifp->int_dstaddr :
 		      ifp->int_addr;
-		if (ipx_dst->sipx_addr.x_port == 0)
-			ipx_dst->sipx_addr.x_port = htons(IPXPORT_SAP);
+
+		ipx_dst->sipx_addr.x_port = htons(IPXPORT_SAP);
 
 		flags = ifp->int_flags & IFF_INTERFACE ? MSG_DONTROUTE : 0;
 		sap_supply(&dst, flags, ifp, SAP_WILDCARD);
diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c
index c3b3e05..57b51d4 100644
--- a/usr.sbin/IPXrouted/startup.c
+++ b/usr.sbin/IPXrouted/startup.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: startup.c,v 1.3 1995/10/11 18:57:30 jhay Exp $
+ *	$Id: startup.c,v 1.1 1995/10/26 21:28:26 julian Exp $
  */
 
 #ifndef lint
@@ -62,8 +62,6 @@ int	lookforinterfaces = 1;
 int	performnlist = 1;
 int	gateway = 0;
 int	externalinterfaces = 0;		/* # of remote and local interfaces */
-char	ether_broadcast_addr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
 
 void
 quit(s)