RELENG_4 IPX commit broke net/mars_nwe?

[Igor B. Bykhalo]

[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<UP,BROADCAST,RUNNING,SIMPLEX,LINK0,MULTICAST> mtu 1500
        inet aaa.bbb.ccc.213 netmask 0xffffffc0 broadcast aaa.bbb.ccc.255
        inet aaa.bbb.ccc.221 netmask 0xffffffff broadcast aaa.bbb.ccc.221
        ether 00:08:c7:49:99:b1
        media: Ethernet 100baseTX <full-duplex>
        status: active
fxp0f0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
        ipx bbbb0000.8c74999b1
        ether 00:08:c7:49:99:b1
[...]
lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
        inet 127.0.0.1 netmask 0xff000000
        ipx aaaa0000.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.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