isisd: cleanup usage of circuit_id

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index a2d1e75d94010e73bab176b2d8d815a43f8f7a4e..4341584a240b6d512e11c3c88821d26964a626d5 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -234,8 +234,8 @@ void isis_circuit_add_addr(struct isis_circuit *circuit,
 
 #ifdef EXTREME_DEBUG
                prefix2str(connected->address, buf, sizeof(buf));
-               zlog_debug("Added IP address %s to circuit %d", buf,
-                          circuit->circuit_id);
+               zlog_debug("Added IP address %s to circuit %s", buf,
+                          circuit->interface->name);
 #endif /* EXTREME_DEBUG */
        }
        if (connected->address->family == AF_INET6) {
@@ -265,8 +265,8 @@ void isis_circuit_add_addr(struct isis_circuit *circuit,
 
 #ifdef EXTREME_DEBUG
                prefix2str(connected->address, buf, sizeof(buf));
-               zlog_debug("Added IPv6 address %s to circuit %d", buf,
-                          circuit->circuit_id);
+               zlog_debug("Added IPv6 address %s to circuit %s", buf,
+                          circuit->interface->name);
 #endif /* EXTREME_DEBUG */
        }
        return;
@@ -300,9 +300,9 @@ void isis_circuit_del_addr(struct isis_circuit *circuit,
                } else {
                        prefix2str(connected->address, buf, sizeof(buf));
                        zlog_warn(
-                               "Nonexistant ip address %s removal attempt from \
-                      circuit %d",
-                               buf, circuit->circuit_id);
+                               "Nonexistent ip address %s removal attempt from \
+                      circuit %s",
+                               buf, circuit->interface->name);
                        zlog_warn("Current ip addresses on %s:",
                                  circuit->interface->name);
                        for (ALL_LIST_ELEMENTS_RO(circuit->ip_addrs, node,
@@ -349,9 +349,9 @@ void isis_circuit_del_addr(struct isis_circuit *circuit,
                if (!found) {
                        prefix2str(connected->address, buf, sizeof(buf));
                        zlog_warn(
-                               "Nonexitant ip address %s removal attempt from \
-                     circuit %d",
-                               buf, circuit->circuit_id);
+                               "Nonexistent ip address %s removal attempt from \
+                     circuit %s",
+                               buf, circuit->interface->name);
                        zlog_warn("Current ip addresses on %s:",
                                  circuit->interface->name);
                        for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_link, node,
@@ -458,19 +458,16 @@ void isis_circuit_if_del(struct isis_circuit *circuit, struct interface *ifp)
        if (circuit->ip_addrs) {
                assert(listcount(circuit->ip_addrs) == 0);
                list_delete_and_null(&circuit->ip_addrs);
-               circuit->ip_addrs = NULL;
        }
 
        if (circuit->ipv6_link) {
                assert(listcount(circuit->ipv6_link) == 0);
                list_delete_and_null(&circuit->ipv6_link);
-               circuit->ipv6_link = NULL;
        }
 
        if (circuit->ipv6_non_link) {
                assert(listcount(circuit->ipv6_non_link) == 0);
                list_delete_and_null(&circuit->ipv6_non_link);
-               circuit->ipv6_non_link = NULL;
        }
 
        circuit->circ_type = CIRCUIT_T_UNKNOWN;

diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h
index 3d97d42b5ea2754a0e72456e2e1060b465b2d679..367ad51f57810d18e6f52c4cdea0293ad0b60121 100644 (file)
--- a/isisd/isis_circuit.h
+++ b/isisd/isis_circuit.h
@@ -32,8 +32,6 @@
 #include "isis_constants.h"
 #include "isis_common.h"
 
-#define CIRCUIT_MAX 255
-
 struct isis_lsp;
 
 struct password {

diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index cdbfb0e65330a82d77f882172c8539c1553d3e1c..20a491ac187a26819edecf6afee19e4c82fc9d63 100644 (file)
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -415,7 +415,7 @@ static int process_p2p_hello(struct iih_info *iih)
        if (isis->debugs & DEBUG_ADJ_PACKETS) {
                zlog_debug(
                        "ISIS-Adj (%s): Rcvd P2P IIH from (%s), cir type %s,"
-                       " cir id %02d, length %d",
+                       " cir id %hhu, length %" PRIu16,
                        iih->circuit->area->area_tag,
                        iih->circuit->interface->name,
                        circuit_t2string(iih->circuit->is_type),

diff --git a/isisd/isisd.h b/isisd/isisd.h
index 4cf164d00ae8e85db654202207b0c47bf39cfad8..85d3974fa620d92bffe97d3f476b989cca9f7cb6 100644 (file)
--- a/isisd/isisd.h
+++ b/isisd/isisd.h
@@ -53,7 +53,7 @@ struct isis {
        u_int32_t debugs;                 /* bitmap for debug */
        time_t uptime;                    /* when did we start */
        struct thread *t_dync_clean;      /* dynamic hostname cache cleanup thread */
-       uint32_t circuit_ids_used[8];     /* 256 bits to track circuit ids 0 through 255 */
+       uint32_t circuit_ids_used[8];     /* 256 bits to track circuit ids 1 through 255 */
 
        struct route_table *ext_info[REDIST_PROTOCOL_COUNT];