From owner-freebsd-questions@FreeBSD.ORG  Thu Jan 13 08:07:20 2005
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A7A6C16A4CE; Thu, 13 Jan 2005 08:07:20 +0000 (GMT)
Received: from relay.vertex.kz (relay.vertex.kz [212.19.129.142])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A61EB43D55; Thu, 13 Jan 2005 08:07:17 +0000 (GMT)
	(envelope-from bp@vertex.kz)
Received: from lion.butya.kz (localhost [127.0.0.1])
	by relay.vertex.kz (Postfix) with SMTP id 5692D5C5A;
	Thu, 13 Jan 2005 14:07:14 +0600 (ALMT)
Received: from relay.vertex.kz (localhost [127.0.0.1])
	by localhost.vertex.kz (Postfix) with ESMTP id 3110A5C4B;
	Thu, 13 Jan 2005 14:07:14 +0600 (ALMT)
Received: by relay.vertex.kz (Postfix, from userid 1000)
	id 2C0805BE5; Thu, 13 Jan 2005 14:07:14 +0600 (ALMT)
Date: Thu, 13 Jan 2005 14:07:14 +0600
From: Boris Popov <bp@FreeBSD.org>
To: "Igor B. Bykhalo" <goshik@binep.ac.ru>
Message-ID: <20050113080714.GH13517@vertex.kz>
References: <19510236615.20050112205002@binep.ac.ru>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <19510236615.20050112205002@binep.ac.ru>
User-Agent: Mutt/1.5.6i
cc: rwatson@freebsd.org
cc: FreeBSD Questions <freebsd-questions@FreeBSD.org>
Subject: Re: RELENG_4 IPX commit broke net/mars_nwe?
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>,
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jan 2005 08:07:20 -0000

On Wed, Jan 12, 2005 at 08:50:02PM +0300, Igor B. Bykhalo wrote:
> 
> Looks like the follwoing commit broke net/mars_nwe port
> on my RELENG_4 file server box:

	Yes, it seems to be.  Mars_nwe have different idea about
added macro:

# define sipx_node sipx_addr.x_host.c_host
# define sipx_network sipx_addr.x_net.c_net
# define ipx_netlong(iaddr) (((union ipx_net_u *)(&((iaddr).x_net)))->long_e)

> 
>  Edit src/sys/netipx/ipx.h
>   Add delta 1.15.2.1 2005.01.02.13.00.51 rwatson
> 
> 
> ===================================================================
> RCS file: /usr/local/www/cvsroot/FreeBSD/src/sys/netipx/ipx.h,v
> retrieving revision 1.15
> retrieving revision 1.15.2.1
> diff -u -p -r1.15 -r1.15.2.1
> --- src/sys/netipx/ipx.h        1999/08/28 18:21:52     1.15
> +++ src/sys/netipx/ipx.h        2005/01/02 13:00:51     1.15.2.1
> @@ -33,7 +33,7 @@
>   *
>   *     @(#)ipx.h
>   *
> - * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipx/ipx.h,v 1.15 1999/08/28 18:21:52 jhay Exp $
> + * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipx/ipx.h,v 1.15.2.1 2005/01/02 13:00:51 rwatson Exp $
>   */
>  
>  #ifndef _NETIPX_IPX_H_
> @@ -108,6 +108,7 @@ union ipx_host {
>  union ipx_net {
>         u_char  c_net[4];
>         u_short s_net[2];
> +       u_int   u_net;
>  };
>  
>  union ipx_net_u {
> @@ -131,6 +132,8 @@ struct sockaddr_ipx {
>         char            sipx_zero[2];
>  };
>  #define sipx_port sipx_addr.x_port
> +#define sipx_network sipx_addr.x_net.u_net
> +#define sipx_node sipx_addr.x_host.c_host
>  
>  /*
>   * Definitions for IPX Internetwork Packet Exchange Protocol
> 

-- 
Boris Popov
http://rbp.euro.ru