Merge pull request #12698 from Orange-OpenSource/isisd

Isisd/Lib: Add new printfrr format facility for Intermediate System ID

diff --cc doc/developer/logging.rst
Simple merge

diff --cc isisd/fabricd.c
Simple merge

diff --cc isisd/isis_adjacency.c
Simple merge

diff --cc isisd/isis_adjacency.h
Simple merge

diff --cc isisd/isis_circuit.c
Simple merge

diff --cc isisd/isis_dynhn.c
Simple merge

diff --cc isisd/isis_events.c
Simple merge

diff --cc isisd/isis_lfa.c
Simple merge

diff --cc isisd/isis_lsp.c
index d569f6bd5be66e67685b5d5bcb03ee4954884863,dbe798e05d17e84ea217ef4fd10cfecae7e7dab8..fb69448d042c966635803c01c7bbe23a2be2a4ad
--- 1/isisd/isis_lsp.c
--- 2/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@@ -1418,18 -1413,19 +1413,18 @@@ int lsp_generate(struct isis_area *area
  
        refresh_time = lsp_refresh_time(newlsp, rem_lifetime);
  
 -      THREAD_OFF(area->t_lsp_refresh[level - 1]);
 +      EVENT_OFF(area->t_lsp_refresh[level - 1]);
        area->lsp_regenerate_pending[level - 1] = 0;
 -      thread_add_timer(master, lsp_refresh,
 -                       &area->lsp_refresh_arg[level - 1], refresh_time,
 -                       &area->t_lsp_refresh[level - 1]);
 +      event_add_timer(master, lsp_refresh, &area->lsp_refresh_arg[level - 1],
 +                      refresh_time, &area->t_lsp_refresh[level - 1]);
  
        if (IS_DEBUG_UPDATE_PACKETS) {
-               zlog_debug("ISIS-Upd (%s): Building L%d LSP %s, len %hu, seq 0x%08x, cksum 0x%04hx, lifetime %hus refresh %hus",
-                          area->area_tag, level,
-                          rawlspid_print(newlsp->hdr.lsp_id),
-                          newlsp->hdr.pdu_len, newlsp->hdr.seqno,
-                          newlsp->hdr.checksum, newlsp->hdr.rem_lifetime,
-                          refresh_time);
+               zlog_debug(
+                       "ISIS-Upd (%s): Building L%d LSP %pLS, len %hu, seq 0x%08x, cksum 0x%04hx, lifetime %hus refresh %hus",
+                       area->area_tag, level, newlsp->hdr.lsp_id,
+                       newlsp->hdr.pdu_len, newlsp->hdr.seqno,
+                       newlsp->hdr.checksum, newlsp->hdr.rem_lifetime,
+                       refresh_time);
        }
        sched_debug(
                "ISIS (%s): Built L%d LSP. Set triggered regenerate to non-pending.",

diff --cc isisd/isis_pdu.c
Simple merge

diff --cc isisd/isis_snmp.c
Simple merge

diff --cc isisd/isis_spf.c
Simple merge

diff --cc isisd/isis_sr.c
Simple merge

diff --cc isisd/isis_te.c
Simple merge

diff --cc isisd/isis_tx_queue.c
Simple merge

diff --cc isisd/isisd.c
Simple merge

diff --cc isisd/isisd.h
index 0b1f1cb620c18e85b5e461297b135453cbef890a,37738a92cfc5db34c248ce6f509adea5038a0514..454876b7b0276450cd968acd5f50582181058215
--- 1/isisd/isisd.h
--- 2/isisd/isisd.h
+++ b/isisd/isisd.h
@@@ -87,9 -88,9 +88,9 @@@ struct isis 
        uint32_t router_id;             /* Router ID from zebra */
        struct list *area_list; /* list of IS-IS areas */
        uint8_t max_area_addrs;           /* maximumAreaAdresses */
-       struct area_addr *man_area_addrs; /* manualAreaAddresses */
+       struct iso_address *man_area_addrs; /* manualAreaAddresses */
        time_t uptime;                    /* when did we start */
 -      struct thread *t_dync_clean;      /* dynamic hostname cache cleanup thread */
 +      struct event *t_dync_clean; /* dynamic hostname cache cleanup thread */
        uint32_t circuit_ids_used[8];     /* 256 bits to track circuit ids 1 through 255 */
        int snmp_notifications;
        struct list *dyn_cache;

diff --cc lib/link_state.c
Simple merge

diff --cc lib/subdir.am
Simple merge