Re: RELENG_4 IPX commit broke net/mars_nwe?
On Thu, 13 Jan 2005, Boris Popov wrote:
> 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)
I've backed out the change, and wonder if the correct variation would be
the change I merged, with the addition of __packed, which would make the
above work on architectures with strong alignment requirements?
Robert N M Watson
>
> >
> > 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.h1999/08/28 18:21:52 1.15
> > +++ src/sys/netipx/ipx.h2005/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 {
> > charsipx_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
>
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: RELENG_4 IPX commit broke net/mars_nwe?
First, small followup: for now, i reverted netipx/ipx.h to previous version 1.15, and after system and port were rebuilt all works (not surprisingly :) Other stuff below... > 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) I see, this is from mars_nwe/emutli.h. First is identical to what rwatson commited in ipx.h v.1.15.2.1, but second is different in v.1.15.2.1: > # define sipx_network sipx_addr.x_net.u_net Looking at the old mars_nwe build log, i really see it's full of warnings: In file included from ../net.h:69, from ../nwserv.c:21: ../emutli.h:26: warning: `sipx_network' redefined So, the bottom line is that defines in mars_nwe/emutli.h now conflict with system defines? Sorry, i'm not a programmer myself, may be you cang give me some hints what i can try to make mars_nwe work with current ipx.h ... This is a production machine, but not very heavily used, so a couple of reboots wont't hurt anyone badly... TIA, Igor ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: RELENG_4 IPX commit broke net/mars_nwe?
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.h1999/08/28 18:21:52 1.15
> +++ src/sys/netipx/ipx.h2005/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 {
> charsipx_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
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
RELENG_4 IPX commit broke net/mars_nwe?
[Sorry, incidentally sent unfinished letter]
[Cc'ing Boris Popov as maintainer]
Greetings!
Looks like the follwoing commit broke net/mars_nwe port
on my RELENG_4 file server box:
Edit src/sys/netipx/ipx.h
Add delta 1.15.2.1 2005.01.02.13.00.51 rwatson
First, after upgrading machine (buildworld, kernel, installworld),
non-rebuilt nwserv didn't even start. After port was rebuilt,
it starts, but server doesn't appear on the network and doesn't
accept connections from client Windows boxes.
There is no errors or warnings in log files of IPXrouted(8) or
port programs, so i am totally lost...
Here are corresponding parts of ps -ax and other network info:
[...]
73 ?? Is 0:00,02 IPXrouted -s /var/log/nw.ipx.log
[...]
374 ?? I 0:00,04 nwbind GO aa.aa.0.0:0.0.0.0.0.1:4.51 400c
375 ?? I 0:00,00 ncpserv GO aa.aa.0.0:0.0.0.0.0.1:4.51 400c 4009
[...]
banka# ifconfig -a
fxp0: flags=9843 mtu 1500
inet aaa.bbb.ccc.213 netmask 0xffc0 broadcast aaa.bbb.ccc.255
inet aaa.bbb.ccc.221 netmask 0x broadcast aaa.bbb.ccc.221
ether 00:08:c7:49:99:b1
media: Ethernet 100baseTX
status: active
fxp0f0: flags=8843 mtu 1500
ipx .8c74999b1
ether 00:08:c7:49:99:b1
[...]
lo0: flags=8049 mtu 16384
inet 127.0.0.1 netmask 0xff00
ipx .1H
banka#
Can anyone help? I can send mars_nwe config and logs as well...
TIA,
Igor
PS. Oh, here is the diff from cvsweb:
===
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.h1999/08/28 18:21:52 1.15
+++ src/sys/netipx/ipx.h2005/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 {
charsipx_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
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
RELENG_4 IPX commit broke net/mars_nwe?
[Cc'ing Boris Popov as maintainer]
Greeings!
On my RELENG_4 file server box the follwoing commit broke
net/mars_nwe port:
Edit src/sys/netipx/ipx.h
Add delta 1.15.2.1 2005.01.02.13.00.51 rwatson
First, after upgrading machine (buildworld, kernel, installworld),
non-rebuilt nwserv didn't even start. After port was rebuilt,
it starts, but server doesn't appear on the network and doesn't
accept connections from client Windows boxes.
There is no errors or warnings in log files of IPXrouted(8) or
port programs, so i am totally lost...
Here are corresponding parts of ps -ax and other network info:
[...]
73 ?? Is 0:00,02 IPXrouted -s /var/log/nw.ipx.log
[...]
374 ?? I 0:00,04 nwbind GO aa.aa.0.0:0.0.0.0.0.1:4.51 400c
375 ?? I 0:00,00 ncpserv GO aa.aa.0.0:0.0.0.0.0.1:4.51 400c 4009
[...]
banka# ifconfig -a
fxp0: flags=9843 mtu 1500
inet aaa.bbb.ccc.213 netmask 0xffc0 broadcast aaa.bbb.ccc.255
inet aaa.bbb.ccc.221 netmask 0x broadcast aaa.bbb.ccc.221
ether 00:08:c7:49:99:b1
media: Ethernet 100baseTX
status: active
fxp0f0: flags=8843 mtu 1500
ipx .8c74999b1
ether 00:08:c7:49:99:b1
[...]
lo0: flags=8049 mtu 16384
inet 127.0.0.1 netmask 0xff00
ipx .1H
banka#
===
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.h1999/08/28 18:21:52 1.15
+++ src/sys/netipx/ipx.h2005/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 {
charsipx_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
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
