Date: Thu, 13 Jan 2005 14:07:14 +0600 From: Boris Popov <bp@FreeBSD.org> To: "Igor B. Bykhalo" <goshik@binep.ac.ru> Cc: FreeBSD Questions <freebsd-questions@FreeBSD.org> Subject: Re: RELENG_4 IPX commit broke net/mars_nwe? Message-ID: <20050113080714.GH13517@vertex.kz> In-Reply-To: <19510236615.20050112205002@binep.ac.ru> References: <19510236615.20050112205002@binep.ac.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050113080714.GH13517>