* isisd.c: thread_master *master is already defined in isis_main.c.

* isis_misc.[c|h], isis_lsp.[c|h]: Move static variables out of header
  files.

diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 50028a9118c3353c960923aacbd32b2efb31bac7..a9ea3cee48a1782b752cc4edb9c58ccf73a4a086 100644 (file)
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-24 Hasso Tepper <hasso at quagga.net>
+
+       * isisd.c: thread_master *master is already defined in isis_main.c.
+       * isis_misc.[c|h], isis_lsp.[c|h]: Move static variables out of
+         header files.
+
 2004-09-23 Hasso Tepper <hasso at quagga.net>
 
        * *.[c|h]: list -> struct list *, listnode -> struct listnode *.

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index d0764e04182a94935372d3d7145afbb39512bb20..5467b48345133f88152133199b4ffb5e20f88c1a 100644 (file)
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -60,6 +60,9 @@
 extern struct isis *isis;
 extern struct thread_master *master;
 
+/* staticly assigned vars for printing purposes */
+char lsp_bits_string[200];     /* FIXME: enough ? */
+
 int
 lsp_id_cmp (u_char * id1, u_char * id2)
 {

diff --git a/isisd/isis_lsp.h b/isisd/isis_lsp.h
index c6eb7c27bd30245d9bf775abc831be5633e45025..d92175c497d9c5e199cfed9403ccecf41901f072 100644 (file)
--- a/isisd/isis_lsp.h
+++ b/isisd/isis_lsp.h
@@ -120,9 +120,6 @@ int lsp_print_all (struct vty *vty, dict_t * lspdb, char detail,
                   char dynhost);
 char *lsp_bits2string (u_char *);
 
-/* staticly assigned vars for printing purposes */
-char lsp_bits_string[200];     /* FIXME: enough ? */
-
 #ifdef TOPOLOGY_GENERATE
 void generate_topology_lsps (struct isis_area *area);
 void remove_topology_lsps (struct isis_area *area);

diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index 7fe5286f7d37299986a8e777f007fd8cb6bbfff0..51c4d92992469c98ba8f9e8cc0200b7db2ef7295 100644 (file)
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -46,6 +46,21 @@
 #include "isisd/isis_constants.h"
 #include "isisd/isis_adjacency.h"
 
+/* staticly assigned vars for printing purposes */
+struct in_addr new_prefix;
+/* len of xxxx.xxxx.xxxx + place for #0 termination */
+char sysid[15];
+/* len of xxxx.xxxx.xxxx + place for #0 termination */
+char snpa[15];
+/* len of xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx */
+char isonet[51];
+/* + place for #0 termination */
+/* len of xxxx.xxxx.xxxx.xx.xx + place for #0 termination */
+char lspid[21];
+/* len of xxYxxMxWxdxxhxxmxxs + place for #0 termination */
+char datestring[20];
+char nlpidstring[30];
+
 /*
  * This converts the isonet to its printable format
  */

diff --git a/isisd/isis_misc.h b/isisd/isis_misc.h
index 75c8d8b48ba8cc0b1580a85a3705b4abfe650053..330556a6e8b00297637cb8b0753d89319e9e7594 100644 (file)
--- a/isisd/isis_misc.h
+++ b/isisd/isis_misc.h
@@ -60,21 +60,6 @@ const char *unix_hostname (void);
  */
 #define GETSYSID(A,L) (A->area_addr + (A->addr_len - (L + 1)))
 
-/* staticly assigned vars for printing purposes */
-struct in_addr new_prefix;
-/* len of xxxx.xxxx.xxxx + place for #0 termination */
-char sysid[15];
-/* len of xxxx.xxxx.xxxx + place for #0 termination */
-char snpa[15];
-/* len of xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx */
-char isonet[51];
-/* + place for #0 termination */
-/* len of xxxx.xxxx.xxxx.xx.xx + place for #0 termination */
-char lspid[21];
-/* len of xxYxxMxWxdxxhxxmxxs + place for #0 termination */
-char datestring[20];
-char nlpidstring[30];
-
 /* used for calculating nice string representation instead of plain seconds */
 
 #define SECS_PER_MINUTE 60

diff --git a/isisd/isisd.c b/isisd/isisd.c
index 3fbed0beac3be00faa142d22af96da61f7f48cf0..af05cd152f6f4d9f8607d6c27cdbce2343c3b8d6 100644 (file)
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -60,7 +60,7 @@ u_char DEFAULT_TOPOLOGY_BASEIS[6] = { 0xFE, 0xED, 0xFE, 0xED, 0x00, 0x00 };
 #endif /* TOPOLOGY_GENERATE */
 
 struct isis *isis = NULL;
-struct thread_master *master;
+extern struct thread_master *master;
 
 void
 isis_new (unsigned long process_id)