Make it compile in NetBSD and OpenBSD.

diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 810be798e3480b5b560902029b489978b1155a98..1d2e22f51f9e551533d81ff1b9d3136300a6af47 100644 (file)
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-19 Rivo Nurges <rix at estpak.ee>
+
+       * *.c: Removing many useless net/ethernet.h includes and some tiny
+         fixes to make it compile on NetBSD and OpenBSD.
+
 2004-05-08 Paul Jakma <paul@dishone.st>
 
        * isis_zebra.c: Sync with zclient changes.

diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index d11e32e31925118c3ccbb77c0b63eff463f6971f..86fed1d9004cb459218a33af8445ac57663b2990 100644 (file)
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -25,8 +25,6 @@
 #include <limits.h>
 #include <string.h>
 #include <zebra.h>
-#include <net/ethernet.h>
-
 
 #include "log.h"
 #include "memory.h"

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 1865e33e274360da6401d9edd02412a7181311f1..192b107f855db28923a41838ada538146b9002c6 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -23,7 +23,11 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <zebra.h>
+#ifdef GNU_LINUX
 #include <net/ethernet.h>
+#else
+#include <netinet/if_ether.h>
+#endif
 
 #include "log.h"
 #include "memory.h"

diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c
index 2282bbc85c5ec051c4fe1bf85975999f8e29faf0..b20579037aee8c2f3bf735700deb70024fefc79c 100644 (file)
--- a/isisd/isis_csm.c
+++ b/isisd/isis_csm.c
@@ -21,7 +21,6 @@
  */
 
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "log.h"
 #include "memory.h"

diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c
index 8b6c8ff0017ee1bd51e3ee01eab4884694b15789..a2fddcce8fe4581d1ddd92fe69a2aa52b72b0a3c 100644 (file)
--- a/isisd/isis_dr.c
+++ b/isisd/isis_dr.c
@@ -23,7 +23,6 @@
 
 
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "log.h"
 #include "hash.h"

diff --git a/isisd/isis_dynhn.c b/isisd/isis_dynhn.c
index 0ba1842827d43bc4a001550d58c30de8e01ac087..6b1d27b9af1ef596fb58d3ddbff181f49dc07fc2 100644 (file)
--- a/isisd/isis_dynhn.c
+++ b/isisd/isis_dynhn.c
@@ -22,7 +22,6 @@
 
 #include <time.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "vty.h"
 #include "linklist.h"

diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index 29ea8067be503290f6febaa4f2e812b965c3f599..be136e2644940de62dbd480aefd390c833ccb278 100644 (file)
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "log.h"
 #include "memory.h"

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 0faadbd8cc980889236abb87156e80163b8f4083..a29ba8031732b2dfc0a4e2877031f5ca3ee8fe33 100644 (file)
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "linklist.h"
 #include "thread.h"

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 120075067173996adeb0dea141cdebed45dd0de4..0d9cf3efcd5abf7ab5b1cf1a374b5e95cfb3b7d8 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "getopt.h"
 #include "thread.h"
@@ -104,8 +103,8 @@ struct thread_master *master;
 char *pid_file = PATH_ISISD_PID;
 
 /* for reload */
-char _cwd[64];
-char _progpath[64];
+char _cwd[MAXPATHLEN];
+char _progpath[MAXPATHLEN];
 int _argc;
 char **_argv;
 char **_envp;

diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index 1f19606c67852508c6fbeb060597a92b8a1a5b62..709dbe4ff91da121b662898bceb1033b956ca4dc 100644 (file)
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <ctype.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 #include <sys/utsname.h>
 
 #include "stream.h"

diff --git a/isisd/isis_network.c b/isisd/isis_network.c
index c10aeebf26200da06f55dd62ac5043011933e4cb..4f9af61ef57886800cf5c07c176ff59d7455174d 100644 (file)
--- a/isisd/isis_network.c
+++ b/isisd/isis_network.c
@@ -24,7 +24,13 @@
 #include <sys/socket.h>
 #include <errno.h>
 #include <zebra.h>
+#ifdef GNU_LINUX
 #include <net/ethernet.h>     /* the L2 protocols */
+#else
+#include <net/if.h>
+#include <netinet/if_ether.h>
+#endif
+
 
 #include "log.h"
 #include "stream.h"
@@ -237,12 +243,14 @@ open_bpf_dev (struct isis_circuit *circuit)
     zlog_warn ("failed to set BPF dev to immediate mode");
   }
 
+#ifdef BIOCSSEESENT
   /*
    * We want to see only incoming packets
    */
   if (ioctl (fd, BIOCSSEESENT, (caddr_t)&false) < 0) {
     zlog_warn ("failed to set BPF dev to incoming only mode");
   }
+#endif
 
   /*
    * ...but all of them

diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index 65009ba6359ce9109f6c3d64f123ae291f4d6a0a..f93025db01e6b6599bc9ad26f2fdbc410e43064f 100644 (file)
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "memory.h"
 #include "thread.h"

diff --git a/isisd/isis_route.c b/isisd/isis_route.c
index 74231adc6eb1a02bf041eb168272d6b9a0a19eaf..b889d3b8abc506b46b2865e4f9f4b664686bbeb3 100644 (file)
--- a/isisd/isis_route.c
+++ b/isisd/isis_route.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "thread.h"
 #include "linklist.h"

diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c
index 4df983d2b62726143ab2e47076e270199c449851..9a8df61002be5da612148cd86ed695511ce99efc 100644 (file)
--- a/isisd/isis_routemap.c
+++ b/isisd/isis_routemap.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "thread.h"
 #include "linklist.h"

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index a522877adec7c1c2a6f932d237c784e80c7463fd..03f724f60d660a99d9af7ec6378df25ea6e8343a 100644 (file)
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "thread.h"
 #include "linklist.h"

diff --git a/isisd/isis_tlv.c b/isisd/isis_tlv.c
index eb673d9fb5d9489645a97eb3d445fb0054b3f958..ab39ceba462311223815a67e2d7ba1765e6d0d04 100644 (file)
--- a/isisd/isis_tlv.c
+++ b/isisd/isis_tlv.c
@@ -22,7 +22,6 @@
  */
 
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "log.h"
 #include "linklist.h"

diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index 4b496c3a7be9334e8aa81f57cdf06cb62c12c437..136d2b525e44d17181d9539dde0b06b40eea0d33 100644 (file)
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -21,7 +21,6 @@
  */
 
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "thread.h"
 #include "command.h"

diff --git a/isisd/isisd.c b/isisd/isisd.c
index 9cdb2557a743b78c26bdae8e3d54858a1802d1cf..8d0b3a2121bba138a6cddafa6d5af1dffcc5b94a 100644 (file)
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <zebra.h>
-#include <net/ethernet.h>
 
 #include "thread.h"
 #include "vty.h"