summaryrefslogtreecommitdiffstats
path: root/isisd/isis_misc.c
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2017-07-05 18:37:36 +0200
committerChristian Franke <chris@opensourcerouting.org>2017-08-03 11:34:04 +0200
commitaf8ac8f98fbe565b182020895553d862ad743012 (patch)
tree1e934f37d3015ee84edb4b0ef4e03ddf94e35897 /isisd/isis_misc.c
parentisisd: send/receive *SNPs with new parser (diff)
downloadfrr-af8ac8f98fbe565b182020895553d862ad743012.tar.xz
frr-af8ac8f98fbe565b182020895553d862ad743012.zip
isisd: send/receive LSPs with new parser
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'isisd/isis_misc.c')
-rw-r--r--isisd/isis_misc.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index cf6558c13..4d7b4c381 100644
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -39,7 +39,6 @@
#include "isisd/isisd.h"
#include "isisd/isis_misc.h"
-#include "isisd/isis_tlv.h"
#include "isisd/isis_lsp.h"
#include "isisd/isis_constants.h"
#include "isisd/isis_adjacency.h"
@@ -216,25 +215,6 @@ char *nlpid2string(struct nlpids *nlpids)
}
/*
- * supports the given af ?
- */
-int speaks(struct nlpids *nlpids, int family)
-{
- int i, speaks = 0;
-
- if (nlpids == (struct nlpids *)NULL)
- return speaks;
- for (i = 0; i < nlpids->count; i++) {
- if (family == AF_INET && nlpids->nlpids[i] == NLPID_IP)
- speaks = 1;
- if (family == AF_INET6 && nlpids->nlpids[i] == NLPID_IPV6)
- speaks = 1;
- }
-
- return speaks;
-}
-
-/*
* Returns 0 on error, IS-IS Circuit Type on ok
*/
int string2circuit_t(const char *str)
@@ -486,7 +466,7 @@ const char *print_sys_hostname(const u_char *sysid)
dyn = dynhn_find_by_id(sysid);
if (dyn)
- return (const char *)dyn->name.name;
+ return dyn->hostname;
return sysid_print(sysid);
}