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

isisd: cleanup usage of circuit_id

Browse Source 
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
This commit is contained in:
Christian Franke 2018-03-05 18:42:30 +01:00
parent 98c5bc15e7
commit c59f88c809
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
isisd/isis_circuit.c
View File

@ -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;

2
isisd/isis_circuit.h
View File

@ -32,8 +32,6 @@
#include "isis_constants.h"
#include "isis_common.h"
#define CIRCUIT_MAX 255
struct isis_lsp;
struct password {

2
isisd/isis_pdu.c
View File

@ -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),

2
isisd/isisd.h
View File

@ -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];