proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 20:22:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* isis_misc.[c|h], isis_lsp.[c|h]: Move static variables out of header
  files.
This commit is contained in:
hasso 2004-09-24 10:45:28 +00:00
parent 26f7a244d0
commit 73d1aeada7
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
isisd/ChangeLog
View File

@ -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> 2004-09-23 Hasso Tepper <hasso at quagga.net>
* *.[c|h]: list -> struct list *, listnode -> struct listnode *. * *.[c|h]: list -> struct list *, listnode -> struct listnode *.

3
isisd/isis_lsp.c
View File

@ -60,6 +60,9 @@
extern struct isis *isis; extern struct isis *isis;
extern struct thread_master *master; extern struct thread_master *master;
/* staticly assigned vars for printing purposes */
char lsp_bits_string[200]; /* FIXME: enough ? */
int int
lsp_id_cmp (u_char * id1, u_char * id2) lsp_id_cmp (u_char * id1, u_char * id2)
{ {

3
isisd/isis_lsp.h
View File

@ -120,9 +120,6 @@ int lsp_print_all (struct vty *vty, dict_t * lspdb, char detail,
char dynhost); char dynhost);
char *lsp_bits2string (u_char *); char *lsp_bits2string (u_char *);
/* staticly assigned vars for printing purposes */
char lsp_bits_string[200]; /* FIXME: enough ? */
#ifdef TOPOLOGY_GENERATE #ifdef TOPOLOGY_GENERATE
void generate_topology_lsps (struct isis_area *area); void generate_topology_lsps (struct isis_area *area);
void remove_topology_lsps (struct isis_area *area); void remove_topology_lsps (struct isis_area *area);

15
isisd/isis_misc.c
View File

@ -46,6 +46,21 @@
#include "isisd/isis_constants.h" #include "isisd/isis_constants.h"
#include "isisd/isis_adjacency.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 * This converts the isonet to its printable format
*/ */

15
isisd/isis_misc.h
View File

@ -60,21 +60,6 @@ const char *unix_hostname (void);
*/ */
#define GETSYSID(A,L) (A->area_addr + (A->addr_len - (L + 1))) #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 */ /* used for calculating nice string representation instead of plain seconds */
#define SECS_PER_MINUTE 60 #define SECS_PER_MINUTE 60

2
isisd/isisd.c
View File

@ -60,7 +60,7 @@ u_char DEFAULT_TOPOLOGY_BASEIS[6] = { 0xFE, 0xED, 0xFE, 0xED, 0x00, 0x00 };
#endif /* TOPOLOGY_GENERATE */ #endif /* TOPOLOGY_GENERATE */
struct isis *isis = NULL; struct isis *isis = NULL;
struct thread_master *master; extern struct thread_master *master;
void void
isis_new (unsigned long process_id) isis_new (unsigned long process_id)