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

Merge pull request #8677 from idryzhov/isis-snmp-build-warning

Browse Source 
isisd: fix build warning and simplify code
This commit is contained in:
Patrick Ruddy 2021-05-19 14:39:47 +01:00 committed by GitHub
commit f334254982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
isisd/isis_snmp.c
View File

@ -616,11 +616,44 @@ static uint8_t isis_null_sysid[ISIS_SYS_ID_LEN];
#define ISIS_SNMP_ADJ_STATE_UP (3) #define ISIS_SNMP_ADJ_STATE_UP (3)
#define ISIS_SNMP_ADJ_STATE_FAILED (4) #define ISIS_SNMP_ADJ_STATE_FAILED (4)
static inline uint32_t isis_snmp_adj_state(enum isis_adj_state state)
{
switch (state) {
case ISIS_ADJ_UNKNOWN:
return ISIS_SNMP_ADJ_STATE_DOWN;
case ISIS_ADJ_INITIALIZING:
return ISIS_SNMP_ADJ_STATE_INITIALIZING;
case ISIS_ADJ_UP:
return ISIS_SNMP_ADJ_STATE_UP;
case ISIS_ADJ_DOWN:
return ISIS_SNMP_ADJ_STATE_FAILED;
}
return 0; /* not reached */
}
#define ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1 (1) #define ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1 (1)
#define ISIS_SNMP_ADJ_NEIGHTYPE_IS_L2 (2) #define ISIS_SNMP_ADJ_NEIGHTYPE_IS_L2 (2)
#define ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1_L2 (3) #define ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1_L2 (3)
#define ISIS_SNMP_ADJ_NEIGHTYPE_UNKNOWN (4) #define ISIS_SNMP_ADJ_NEIGHTYPE_UNKNOWN (4)
static inline uint32_t isis_snmp_adj_neightype(enum isis_system_type type)
{
switch (type) {
case ISIS_SYSTYPE_UNKNOWN:
case ISIS_SYSTYPE_ES:
return ISIS_SNMP_ADJ_NEIGHTYPE_UNKNOWN;
case ISIS_SYSTYPE_IS:
return ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1_L2;
case ISIS_SYSTYPE_L1_IS:
return ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1;
case ISIS_SYSTYPE_L2_IS:
return ISIS_SNMP_ADJ_NEIGHTYPE_IS_L2;
}
return 0; /* not reached */
}
#define ISIS_SNMP_INET_TYPE_V4 (1) #define ISIS_SNMP_INET_TYPE_V4 (1)
#define ISIS_SNMP_INET_TYPE_V6 (2) #define ISIS_SNMP_INET_TYPE_V6 (2)
@ -2510,23 +2543,7 @@ static uint8_t *isis_snmp_find_isadj(struct variable *v, oid *name,
switch (v->magic) { switch (v->magic) {
case ISIS_ISADJ_STATE: case ISIS_ISADJ_STATE:
return SNMP_INTEGER(isis_snmp_adj_state(adj->adj_state));
switch (adj->adj_state) {
case ISIS_ADJ_UNKNOWN:
case ISIS_ADJ_DOWN:
val = ISIS_SNMP_ADJ_STATE_DOWN;
break;
case ISIS_ADJ_INITIALIZING:
val = ISIS_SNMP_ADJ_STATE_INITIALIZING;
break;
case ISIS_ADJ_UP:
val = ISIS_SNMP_ADJ_STATE_UP;
break;
}
return SNMP_INTEGER(val);
case ISIS_ISADJ_3WAYSTATE: case ISIS_ISADJ_3WAYSTATE:
return SNMP_INTEGER(adj->threeway_state); return SNMP_INTEGER(adj->threeway_state);
@ -2538,27 +2555,7 @@ static uint8_t *isis_snmp_find_isadj(struct variable *v, oid *name,
} }
case ISIS_ISADJ_NEIGHSYSTYPE: case ISIS_ISADJ_NEIGHSYSTYPE:
return SNMP_INTEGER(isis_snmp_adj_neightype(adj->sys_type));
switch (adj->sys_type) {
case ISIS_SYSTYPE_UNKNOWN:
case ISIS_SYSTYPE_ES:
val = ISIS_SNMP_ADJ_NEIGHTYPE_UNKNOWN;
break;
case ISIS_SYSTYPE_IS:
val = ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1_L2;
break;
case ISIS_SYSTYPE_L1_IS:
val = ISIS_SNMP_ADJ_NEIGHTYPE_IS_L1;
break;
case ISIS_SYSTYPE_L2_IS:
val = ISIS_SNMP_ADJ_NEIGHTYPE_IS_L2;
break;
}
return SNMP_INTEGER(val);
case ISIS_ISADJ_NEIGHSYSID: case ISIS_ISADJ_NEIGHSYSID:
*var_len = sizeof(adj->sysid); *var_len = sizeof(adj->sysid);
@ -3345,25 +3342,7 @@ static int isis_snmp_adj_state_change_update(const struct isis_adjacency *adj)
lsp_id[ISIS_SYS_ID_LEN] = 0; lsp_id[ISIS_SYS_ID_LEN] = 0;
lsp_id[ISIS_SYS_ID_LEN + 1] = 0; lsp_id[ISIS_SYS_ID_LEN + 1] = 0;
val = ISIS_SNMP_ADJ_STATE_DOWN; val = isis_snmp_adj_state(adj->adj_state);
switch (adj->adj_state) {
case ISIS_ADJ_UNKNOWN:
val = ISIS_SNMP_ADJ_STATE_DOWN;
break;
case ISIS_ADJ_INITIALIZING:
val = ISIS_SNMP_ADJ_STATE_INITIALIZING;
break;
case ISIS_ADJ_UP:
val = ISIS_SNMP_ADJ_STATE_UP;
break;
case ISIS_ADJ_DOWN:
val = ISIS_SNMP_ADJ_STATE_FAILED;
break;
}
isis_snmp_update_worker_b( isis_snmp_update_worker_b(
adj->circuit, ISIS_TRAP_ADJ_STATE_CHANGE, adj->circuit, ISIS_TRAP_ADJ_STATE_CHANGE,