[ECOS] Bridge test code in OpenBSD

[ECOS] Bridge test code in OpenBSD

[Manu Sharma]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/richtext, Size: 2072 bytes --]

Hi,
<nl><nl>

It seems that the test code in bridge.c is dependent on definition of CYGPKG_NET_BRIDGE, but CYGPKG_NET_BRIDGE has a 'no_define' directive associated with it in file openbsd_net.cdl which suppresses its definition in the generated header. As an end result, the running the test produces a print "No bridge support available".
<nl><nl>

The following patch should fix the problem :
Index: net/tcpip/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/tcpip/current/ChangeLog,v
retrieving revision 1.44
diff -u -r1.44 ChangeLog
--- net/tcpip/current/ChangeLog 22 Sep 2003 15:33:36 -0000      1.44
+++ net/tcpip/current/ChangeLog 25 Sep 2003 13:14:55 -0000
@@ -1,3 +1,8 @@
+2003-09-25  Manu Sharma <lt>manu.sharma@ascom.com>
+        * cdl/openbsd_net.cdl: Removed the no_define directive for
+        CYGPKG_NET_BRIDGE. The test code in bridge.c depends on this
+        definition.
+
<nl> 2003-09-22  Reinhard Jessich  <lt>Reinhard.Jessich@frequentis.com>
<nl> 
<nl>        * include/net/if.h: Define macro IF_IS_EMPTY needed by eth_drv.c
Index: net/tcpip/current/cdl/openbsd_net.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/tcpip/current/cdl/openbsd_net.cdl,v
retrieving revision 1.2
diff -u -r1.2 openbsd_net.cdl
--- net/tcpip/current/cdl/openbsd_net.cdl       24 Feb 2003 14:31:59 -0000      1.2
+++ net/tcpip/current/cdl/openbsd_net.cdl       25 Sep 2003 13:15:12 -0000
@@ -182,7 +182,6 @@
<nl>          display "Built-in ethernet bridge code"
<nl>          default_value 0
<nl>          implements CYGINT_NET_BRIDGE_HANDLER
-     no_define
<nl>          description   "
<nl>              This option controls whether to include the built-in code for
<nl>              the Ethernet bridge."
<nl><nl>

regards,
Manu
<nl><nl>


--
Before posting, please read the FAQ: http://sources.redhat.com/fom/ecos
and search the list archive: http://sources.redhat.com/ml/ecos-discuss

Re: [ECOS] Bridge test code in OpenBSD

[Andrew Lunn]

On Thu, Sep 25, 2003 at 03:57:00PM +0200, Manu Sharma wrote:
> Hi,
> 
> It seems that the test code in bridge.c is dependent on definition
> of CYGPKG_NET_BRIDGE, but CYGPKG_NET_BRIDGE has a 'no_define'
> directive associated with it in file openbsd_net.cdl which
> suppresses its definition in the generated header. As an end result,
> the running the test produces a print "No bridge support available".

Hi Manu

I fixed it in a different way. I instead modified the test program to
look for CYGINT_NET_BRIDGE_HANDLER. Doing it this way the bridge test
program will be build for the build in bridge code or any other bridge
package which implements the interface.

        Andrew

Index: net/common/current//ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/ChangeLog,v
retrieving revision 1.41
diff -u -r1.41 ChangeLog
--- net/common/current//ChangeLog       16 Sep 2003 22:05:05 -0000      1.41
+++ net/common/current//ChangeLog       6 Oct 2003 19:05:58 -0000
@@ -1,3 +1,8 @@
+2003-10-06  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+       * tests/bridge.c: Build the test when we have the bridge
+       handler code enabled and so presumably a bridge.
+
 2003-09-16  Jay Foster  <jay@systech.com>
   
        * src/ifaddrs.c (getifaddrs): Fix up allocation and freeing of
Index: net/common/current//tests/bridge.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/tests/bridge.c,v
retrieving revision 1.2
diff -u -r1.2 bridge.c
--- net/common/current//tests/bridge.c  31 May 2002 01:05:55 -0000      1.2
+++ net/common/current//tests/bridge.c  6 Oct 2003 19:06:00 -0000
@@ -67,7 +67,7 @@
 #include <network.h>
 #include <sys/types.h>
 #include <stdlib.h>
-#ifdef CYGPKG_NET_BRIDGE
+#ifdef CYGPKG_NET_BRIDGE_HANDLER
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
@@ -984,7 +984,7 @@
   printf("cyg_user_start done\n");
 }
  
-#else // CYGPKG_NET_BRIDGE
+#else // CYGPKG_NET_BRIDGE_HANDLER
  
 void
 cyg_user_start(void) {


-- 
Before posting, please read the FAQ: http://sources.redhat.com/fom/ecos
and search the list archive: http://sources.redhat.com/ml/ecos-discuss