Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

isisd, zebra: Use array_size instead of ARRAY_SIZE #13179

Merged
merged 1 commit into from
Apr 1, 2023
Merged

isisd, zebra: Use array_size instead of ARRAY_SIZE #13179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 42 additions & 47 deletions isisd/isis_snmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,6 @@
/* Declare static local variables for convenience. */
SNMP_LOCAL_VARIABLES

/* If ARRAY_SIZE is not available use a primitive substitution */
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#endif

/*
* Define time function, it serves two purposes
* 1. Uses unint32_t for unix time and encapsulates
Expand Down Expand Up @@ -425,7 +420,7 @@ static struct isis_func_to_prefix isis_func_to_prefix_arr[] = {
{isis_snmp_find_isadj_ipaddr, {ISIS_ISADJIPADDR_ENTRY}, 4},
{isis_snmp_find_isadj_prot_supp, {ISIS_ISADJPROTSUPP_ENTRY}, 4},
};
static size_t isis_func_to_prefix_count = ARRAY_SIZE(isis_func_to_prefix_arr);
static size_t isis_func_to_prefix_count = array_size(isis_func_to_prefix_arr);

static struct variable isis_var_arr[] = {
{ISIS_SYS_VERSION, INTEGER, RONLY, isis_snmp_find_sys_object},
Expand Down Expand Up @@ -554,7 +549,7 @@ static struct variable isis_var_arr[] = {
isis_snmp_find_isadj_prot_supp},
};

static const size_t isis_var_count = ARRAY_SIZE(isis_var_arr);
static const size_t isis_var_count = array_size(isis_var_arr);

/* Minimal set of hard-coded data */
#define ISIS_VERSION (1)
Expand Down Expand Up @@ -2859,7 +2854,7 @@ static int isis_snmp_db_overload_update(const struct isis_area *area)

/* Put in trap value */
snmp_varlist_add_variable(&notification_vars, isis_snmp_trap_var,
ARRAY_SIZE(isis_snmp_trap_var), ASN_OBJECT_ID,
array_size(isis_snmp_trap_var), ASN_OBJECT_ID,
(uint8_t *)&isis_snmp_trap_val_db_overload,
sizeof(isis_snmp_trap_val_db_overload));

Expand All @@ -2868,11 +2863,11 @@ static int isis_snmp_db_overload_update(const struct isis_area *area)

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_sys_level_index,
ARRAY_SIZE(isis_snmp_trap_data_var_sys_level_index), INTEGER,
array_size(isis_snmp_trap_data_var_sys_level_index), INTEGER,
(uint8_t *)&val, sizeof(val));

/* Patch sys_level_state with proper index */
off = ARRAY_SIZE(isis_snmp_trap_data_var_sys_level_state) - 1;
off = array_size(isis_snmp_trap_data_var_sys_level_state) - 1;
isis_snmp_trap_data_var_sys_level_state[off] = val;

/* Prepare data */
Expand All @@ -2883,7 +2878,7 @@ static int isis_snmp_db_overload_update(const struct isis_area *area)

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_sys_level_state,
ARRAY_SIZE(isis_snmp_trap_data_var_sys_level_state), INTEGER,
array_size(isis_snmp_trap_data_var_sys_level_state), INTEGER,
(uint8_t *)&val, sizeof(val));

send_v2trap(notification_vars);
Expand All @@ -2905,7 +2900,7 @@ static int isis_snmp_lsp_exceed_max_update(const struct isis_area *area,

/* Put in trap value */
snmp_varlist_add_variable(&notification_vars, isis_snmp_trap_var,
ARRAY_SIZE(isis_snmp_trap_var), ASN_OBJECT_ID,
array_size(isis_snmp_trap_var), ASN_OBJECT_ID,
(uint8_t *)&isis_snmp_trap_val_lsp_exceed_max,
sizeof(isis_snmp_trap_val_lsp_exceed_max));

Expand All @@ -2914,12 +2909,12 @@ static int isis_snmp_lsp_exceed_max_update(const struct isis_area *area,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_sys_level_index,
ARRAY_SIZE(isis_snmp_trap_data_var_sys_level_index), INTEGER,
array_size(isis_snmp_trap_data_var_sys_level_index), INTEGER,
(uint8_t *)&val, sizeof(val));

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_pdu_lsp_id,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
array_size(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
ISIS_SYS_ID_LEN + 2);

send_v2trap(notification_vars);
Expand Down Expand Up @@ -2962,18 +2957,18 @@ static void isis_snmp_update_worker_a(const struct isis_circuit *circuit,
/* Put in trap value */
memcpy(var_name, isis_snmp_notifications,
sizeof(isis_snmp_notifications));
var_count = ARRAY_SIZE(isis_snmp_notifications);
var_count = array_size(isis_snmp_notifications);
var_name[var_count++] = trap_id;

/* Put in trap value */
snmp_varlist_add_variable(&notification_vars, isis_snmp_trap_var,
ARRAY_SIZE(isis_snmp_trap_var), ASN_OBJECT_ID,
array_size(isis_snmp_trap_var), ASN_OBJECT_ID,
(uint8_t *)var_name, var_count * sizeof(oid));

val = circuit->is_type;
snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_sys_level_index,
ARRAY_SIZE(isis_snmp_trap_data_var_sys_level_index), INTEGER,
array_size(isis_snmp_trap_data_var_sys_level_index), INTEGER,
(uint8_t *)&val, sizeof(val));

if (oid_a_len != 0) {
Expand All @@ -2992,7 +2987,7 @@ static void isis_snmp_update_worker_a(const struct isis_circuit *circuit,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_circ_if_index,
ARRAY_SIZE(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
array_size(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
(uint8_t *)&val, sizeof(val));


Expand Down Expand Up @@ -3042,18 +3037,18 @@ static void isis_snmp_update_worker_b(const struct isis_circuit *circuit,
/* Put in trap value */
memcpy(var_name, isis_snmp_notifications,
sizeof(isis_snmp_notifications));
var_count = ARRAY_SIZE(isis_snmp_notifications);
var_count = array_size(isis_snmp_notifications);
var_name[var_count++] = trap_id;

/* Put in trap value */
snmp_varlist_add_variable(&notification_vars, isis_snmp_trap_var,
ARRAY_SIZE(isis_snmp_trap_var), ASN_OBJECT_ID,
array_size(isis_snmp_trap_var), ASN_OBJECT_ID,
(uint8_t *)var_name, var_count * sizeof(oid));

val = circuit->is_type;
snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_sys_level_index,
ARRAY_SIZE(isis_snmp_trap_data_var_sys_level_index), INTEGER,
array_size(isis_snmp_trap_data_var_sys_level_index), INTEGER,
(uint8_t *)&val, sizeof(val));

if (circuit->interface == NULL)
Expand All @@ -3063,7 +3058,7 @@ static void isis_snmp_update_worker_b(const struct isis_circuit *circuit,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_circ_if_index,
ARRAY_SIZE(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
array_size(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
(uint8_t *)&val, sizeof(val));


Expand Down Expand Up @@ -3108,9 +3103,9 @@ static int isis_snmp_id_len_mismatch_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_a(
circuit, ISIS_TRAP_ID_LEN_MISMATCH,
isis_snmp_trap_data_var_pdu_field_len,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_field_len), UNSIGNED32,
array_size(isis_snmp_trap_data_var_pdu_field_len), UNSIGNED32,
&val, sizeof(val), isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);
return 0;
}
Expand All @@ -3133,10 +3128,10 @@ isis_snmp_max_area_addr_mismatch_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_a(
circuit, ISIS_TRAP_MAX_AREA_ADDR_MISMATCH,
isis_snmp_trap_data_var_pdu_max_area_addr,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_max_area_addr),
array_size(isis_snmp_trap_data_var_pdu_max_area_addr),
UNSIGNED32, &val, sizeof(val),
isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);
return 0;
}
Expand All @@ -3150,7 +3145,7 @@ static int isis_snmp_own_lsp_purge_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_a(
circuit, ISIS_TRAP_OWN_LSP_PURGE, NULL, 0, STRING, NULL, 0,
isis_snmp_trap_data_var_pdu_lsp_id,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
array_size(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
ISIS_SYS_ID_LEN + 2);
return 0;
}
Expand All @@ -3164,7 +3159,7 @@ static int isis_snmp_seqno_skipped_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_a(
circuit, ISIS_TRAP_SEQNO_SKIPPED, NULL, 0, STRING, NULL, 0,
isis_snmp_trap_data_var_pdu_lsp_id,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
array_size(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
ISIS_SYS_ID_LEN + 2);
return 0;
}
Expand All @@ -3183,7 +3178,7 @@ isis_snmp_authentication_type_failure_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_a(
circuit, ISIS_TRAP_AUTHEN_TYPE_FAILURE, NULL, 0, STRING, NULL,
0, isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);
return 0;
}
Expand All @@ -3201,7 +3196,7 @@ isis_snmp_authentication_failure_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_a(
circuit, ISIS_TRAP_AUTHEN_FAILURE, NULL, 0, STRING, NULL, 0,
isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);
return 0;
}
Expand All @@ -3223,9 +3218,9 @@ static int isis_snmp_version_skew_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_b(
circuit, ISIS_TRAP_VERSION_SKEW,
isis_snmp_trap_data_var_pdu_proto_ver,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_proto_ver), UNSIGNED32,
array_size(isis_snmp_trap_data_var_pdu_proto_ver), UNSIGNED32,
&val, sizeof(val), isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);
return 0;
}
Expand All @@ -3248,7 +3243,7 @@ static int isis_snmp_area_mismatch_update(const struct isis_circuit *circuit,

/* Put in trap value */
snmp_varlist_add_variable(&notification_vars, isis_snmp_trap_var,
ARRAY_SIZE(isis_snmp_trap_var), ASN_OBJECT_ID,
array_size(isis_snmp_trap_var), ASN_OBJECT_ID,
(uint8_t *)&isis_snmp_trap_val_area_mismatch,
sizeof(isis_snmp_trap_val_area_mismatch));

Expand All @@ -3260,7 +3255,7 @@ static int isis_snmp_area_mismatch_update(const struct isis_circuit *circuit,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_circ_if_index,
ARRAY_SIZE(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
array_size(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
(uint8_t *)&val, sizeof(val));


Expand All @@ -3269,7 +3264,7 @@ static int isis_snmp_area_mismatch_update(const struct isis_circuit *circuit,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);

send_v2trap(notification_vars);
Expand All @@ -3292,7 +3287,7 @@ static int isis_snmp_reject_adjacency_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_a(
circuit, ISIS_TRAP_REJ_ADJACENCY, NULL, 0, STRING, NULL, 0,
isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);
return 0;
}
Expand All @@ -3307,9 +3302,9 @@ static int isis_snmp_lsp_too_large_update(const struct isis_circuit *circuit,
isis_snmp_update_worker_b(
circuit, ISIS_TRAP_LSP_TOO_LARGE,
isis_snmp_trap_data_var_pdu_lsp_size,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_lsp_size), UNSIGNED32,
array_size(isis_snmp_trap_data_var_pdu_lsp_size), UNSIGNED32,
&pdu_size, sizeof(pdu_size), isis_snmp_trap_data_var_pdu_lsp_id,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
array_size(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
ISIS_SYS_ID_LEN + 2);
return 0;
}
Expand All @@ -3334,9 +3329,9 @@ static int isis_snmp_adj_state_change_update(const struct isis_adjacency *adj)
isis_snmp_update_worker_b(
adj->circuit, ISIS_TRAP_ADJ_STATE_CHANGE,
isis_snmp_trap_data_var_pdu_lsp_id,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
array_size(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
ISIS_SYS_ID_LEN + 2, isis_snmp_trap_data_var_adj_state,
ARRAY_SIZE(isis_snmp_trap_data_var_adj_state), INTEGER, &val,
array_size(isis_snmp_trap_data_var_adj_state), INTEGER, &val,
sizeof(val));
return 0;
}
Expand All @@ -3359,7 +3354,7 @@ static int isis_snmp_lsp_error_update(const struct isis_circuit *circuit,

/* Put in trap value */
snmp_varlist_add_variable(&notification_vars, isis_snmp_trap_var,
ARRAY_SIZE(isis_snmp_trap_var), ASN_OBJECT_ID,
array_size(isis_snmp_trap_var), ASN_OBJECT_ID,
(uint8_t *)&isis_snmp_trap_val_lsp_error,
sizeof(isis_snmp_trap_val_lsp_error));

Expand All @@ -3368,13 +3363,13 @@ static int isis_snmp_lsp_error_update(const struct isis_circuit *circuit,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_sys_level_index,
ARRAY_SIZE(isis_snmp_trap_data_var_sys_level_index), INTEGER,
array_size(isis_snmp_trap_data_var_sys_level_index), INTEGER,
(uint8_t *)&val, sizeof(val));


snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_pdu_lsp_id,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
array_size(isis_snmp_trap_data_var_pdu_lsp_id), STRING, lsp_id,
ISIS_SYS_ID_LEN + 2);

/* Prepare data */
Expand All @@ -3385,7 +3380,7 @@ static int isis_snmp_lsp_error_update(const struct isis_circuit *circuit,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_circ_if_index,
ARRAY_SIZE(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
array_size(isis_snmp_trap_data_var_circ_if_index), UNSIGNED32,
(uint8_t *)&val, sizeof(val));

/* Prepare data */
Expand All @@ -3394,23 +3389,23 @@ static int isis_snmp_lsp_error_update(const struct isis_circuit *circuit,

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_pdu_fragment,
ARRAY_SIZE(isis_snmp_trap_data_var_pdu_fragment), STRING,
array_size(isis_snmp_trap_data_var_pdu_fragment), STRING,
raw_pdu, raw_pdu_len);

/* Prepare data */
val = 0;

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_error_offset,
ARRAY_SIZE(isis_snmp_trap_data_var_error_offset), UNSIGNED32,
array_size(isis_snmp_trap_data_var_error_offset), UNSIGNED32,
(uint8_t *)&val, sizeof(val));

/* Prepare data */
val = 0;

snmp_varlist_add_variable(
&notification_vars, isis_snmp_trap_data_var_error_tlv_type,
ARRAY_SIZE(isis_snmp_trap_data_var_error_tlv_type), UNSIGNED32,
array_size(isis_snmp_trap_data_var_error_tlv_type), UNSIGNED32,
(uint8_t *)&val, sizeof(val));

send_v2trap(notification_vars);
Expand Down
2 changes: 1 addition & 1 deletion zebra/dpdk/zebra_dplane_dpdk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ static int zd_dpdk_init(void)
zd_dpdk_vty_init();

frr_with_privs (&zserv_privs) {
rc = rte_eal_init(ARRAY_SIZE(argv), argv);
rc = rte_eal_init(array_size(argv), argv);
}
if (rc < 0) {
zlog_warn("EAL init failed %s", rte_strerror(rte_errno));
Expand Down