Signed-off-by: Christian Franke <[email protected]>
---
Make the code a bit cleaner.
isisd/isis_lsp.c | 13 ++++++++++---
isisd/isis_tlv.h | 2 ++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 8f7fc0a..050a9f9 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -1225,12 +1225,19 @@ lsp_build (struct isis_lsp *lsp, struct isis_area *area)
/* Dynamic Hostname */
if (area->dynhostname)
{
+ const char *hostname = unix_hostname();
+ size_t hostname_len = strlen(hostname);
+
lsp->tlv_data.hostname = XMALLOC (MTYPE_ISIS_TLV,
sizeof (struct hostname));
- memcpy (lsp->tlv_data.hostname->name, unix_hostname (),
- strlen (unix_hostname ()));
- lsp->tlv_data.hostname->namelen = strlen (unix_hostname ());
+ strncpy((char *)lsp->tlv_data.hostname->name, hostname,
+ sizeof(lsp->tlv_data.hostname->name));
+ if (hostname_len <= MAX_TLV_LEN)
+ lsp->tlv_data.hostname->namelen = hostname_len;
+ else
+ lsp->tlv_data.hostname->namelen = MAX_TLV_LEN;
+
tlv_add_dynamic_hostname (lsp->tlv_data.hostname, lsp->pdu);
}
diff --git a/isisd/isis_tlv.h b/isisd/isis_tlv.h
index e092f4d..f5b59a7 100644
--- a/isisd/isis_tlv.h
+++ b/isisd/isis_tlv.h
@@ -112,6 +112,8 @@
#define AUTH_INFO_HDRLEN 3
+#define MAX_TLV_LEN 255
+
#define IS_NEIGHBOURS_LEN (ISIS_SYS_ID_LEN + 5)
#define LAN_NEIGHBOURS_LEN 6
#define LSP_ENTRIES_LEN (10 + ISIS_SYS_ID_LEN) /* FIXME: should be entry */
--
2.6.1
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
