ipng/lcpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run VPP's checkstyle to reformat the code

Browse Source
This commit is contained in:
Pim van Pelt
2023-01-11 16:21:40 +00:00
parent e53d4376ab
commit 815a6e0dce
6 changed files with 168 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lcpng_if_sync.c
View File

@ -69,8 +69,7 @@ lcp_itf_pair_sync_state (lcp_itf_pair_t *lip)
if (state && !(sup_sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
{
LCP_IF_WARN (
"sync_state: %U flags %u sup-flags %u mtu %u sup-mtu %u: "
LCP_IF_WARN ("sync_state: %U flags %u sup-flags %u mtu %u sup-mtu %u: "
"forcing state to sup-flags to satisfy netlink",
format_lcp_itf_pair, lip, sw->flags, sup_sw->flags,
sw->mtu[VNET_MTU_L3], sup_sw->mtu[VNET_MTU_L3]);
@ -91,8 +90,8 @@ lcp_itf_pair_sync_state (lcp_itf_pair_t *lip)
{
LCP_IF_WARN ("sync_state: %U flags %u mtu %u sup-mtu %u: "
"clamping to sup-mtu to satisfy netlink",
format_lcp_itf_pair, lip, sw->flags,
sw->mtu[VNET_MTU_L3], sup_sw->mtu[VNET_MTU_L3]);
format_lcp_itf_pair, lip, sw->flags, sw->mtu[VNET_MTU_L3],
sup_sw->mtu[VNET_MTU_L3]);
mtu = sup_sw->mtu[VNET_MTU_L3];
}
@ -180,14 +179,14 @@ lcp_itf_admin_state_change (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
if (!lcp_sync ())
return 0;
LCP_IF_DBG ("admin_state_change: sw %U %u",
format_vnet_sw_if_index_name, vnm, sw_if_index,
flags);
LCP_IF_DBG ("admin_state_change: sw %U %u", format_vnet_sw_if_index_name,
vnm, sw_if_index, flags);
// Sync interface state changes into host
lip = lcp_itf_pair_get (lcp_itf_pair_find_by_phy (sw_if_index));
if (!lip) return NULL;
LCP_IF_INFO ("admin_state_change: %U flags %u", format_lcp_itf_pair, lip, flags);
LCP_IF_INFO ("admin_state_change: %U flags %u", format_lcp_itf_pair, lip,
flags);
if (vnet_sw_interface_is_sub (vnm, sw_if_index))
{
@ -412,8 +411,8 @@ lcp_itf_ip4_add_del_interface_addr (ip4_main_t *im, uword opaque,
return;
LCP_IF_DBG ("ip4_addr_%s: si:%U %U/%u", is_del ? "del" : "add",
format_vnet_sw_if_index_name, vnet_get_main (),
sw_if_index, format_ip4_address, address, address_length);
format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index,
format_ip4_address, address, address_length);
lip = lcp_itf_pair_get (lcp_itf_pair_find_by_phy (sw_if_index));
if (!lip)
@ -461,8 +460,8 @@ lcp_itf_ip6_add_del_interface_addr (ip6_main_t *im, uword opaque,
return;
LCP_IF_DBG ("ip6_addr_%s: si:%U %U/%u", is_del ? "del" : "add",
format_vnet_sw_if_index_name, vnet_get_main (),
sw_if_index, format_ip6_address, address, address_length);
format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index,
format_ip6_address, address, address_length);
lip = lcp_itf_pair_get (lcp_itf_pair_find_by_phy (sw_if_index));
if (!lip)
@ -510,9 +509,9 @@ lcp_itf_interface_add_del (vnet_main_t *vnm, u32 sw_if_index, u32 is_create)
return NULL;
LCP_IF_DBG ("interface_%s: sw %U parent %U", is_create ? "add" : "del",
format_vnet_sw_if_index_name, vnet_get_main (), sw->sw_if_index,
format_vnet_sw_if_index_name, vnet_get_main (),
sw->sw_if_index, format_vnet_sw_if_index_name,
vnet_get_main (), sw->sup_sw_if_index);
sw->sup_sw_if_index);
if (is_create)
{

34
lcpng_interface.c
View File

@ -722,9 +722,8 @@ lcp_itf_pair_find_walk (vnet_main_t *vnm, u32 sw_if_index, void *arg)
LCP_IF_DBG ("find_walk: found match outer %d dot1ad %d "
"inner-dot1q %d: interface %U",
sw->sub.eth.outer_vlan_id, sw->sub.eth.flags.dot1ad,
sw->sub.eth.inner_vlan_id,
format_vnet_sw_if_index_name, vnet_get_main (),
sw->sw_if_index);
sw->sub.eth.inner_vlan_id, format_vnet_sw_if_index_name,
vnet_get_main (), sw->sw_if_index);
match->matched_sw_if_index = sw->sw_if_index;
return WALK_STOP;
}
@ -776,8 +775,7 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
}
if (!lcp_validate_if_name (host_if_name)) {
LCP_IF_ERROR ("pair_create: Invalid host-if-name '%s'",
host_if_name);
LCP_IF_ERROR ("pair_create: Invalid host-if-name '%s'", host_if_name);
return VNET_API_ERROR_INVALID_ARGUMENT;
}
@ -819,10 +817,10 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
outer_proto = inner_proto = ETH_P_8021Q;
if (1 == sw->sub.eth.flags.dot1ad) outer_proto = ETH_P_8021AD;
LCP_IF_INFO (
"pair_create: creating dot1%s %d inner-dot1q %d on %U",
sw->sub.eth.flags.dot1ad ? "ad" : "q", outer_vlan, inner_vlan,
format_vnet_sw_if_index_name, vnet_get_main (), hw->sw_if_index);
LCP_IF_INFO ("pair_create: creating dot1%s %d inner-dot1q %d on %U",
sw->sub.eth.flags.dot1ad ? "ad" : "q", outer_vlan,
inner_vlan, format_vnet_sw_if_index_name, vnet_get_main (),
hw->sw_if_index);
parent_if_index = lcp_itf_pair_find_by_phy (sw->sup_sw_if_index);
if (INDEX_INVALID == parent_if_index)
@ -888,21 +886,20 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
outer_vlan,
outer_proto == ETH_P_8021AD ? "dot1ad" :
"dot1q",
format_vnet_sw_if_index_name,
vnet_get_main (), hw->sw_if_index);
format_vnet_sw_if_index_name, vnet_get_main (),
hw->sw_if_index);
return VNET_API_ERROR_INVALID_SW_IF_INDEX;
}
llip = lcp_itf_pair_get (linux_parent_if_index);
if (!llip)
{
LCP_IF_ERROR (
"pair_create: Cannot create LIP for a "
LCP_IF_ERROR ("pair_create: Cannot create LIP for a "
"sub-interface without a valid Linux parent");
return VNET_API_ERROR_INVALID_ARGUMENT;
}
LCP_IF_DBG ("pair_create: linux parent %U",
format_lcp_itf_pair, llip);
LCP_IF_DBG ("pair_create: linux parent %U", format_lcp_itf_pair,
llip);
parent_vif_index = llip->lip_vif_index;
}
else
@ -917,8 +914,8 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
LCP_IF_ERROR ("pair_create: Cannot create link "
"outer(proto:0x%04x,vlan:%u).inner(proto:0x%"
"04x,vlan:%u) name:'%s'",
outer_proto, outer_vlan, inner_proto,
inner_vlan, host_if_name);
outer_proto, outer_vlan, inner_proto, inner_vlan,
host_if_name);
}
if (!err)
@ -1004,8 +1001,7 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
tap_create_if (vm, &args);
if (args.rv < 0)
{
LCP_IF_ERROR ("pair_create: Cannot create TAP: retval:%d",
args.rv);
LCP_IF_ERROR ("pair_create: Cannot create TAP: retval:%d", args.rv);
clib_error_free (args.error);
return args.rv;
}

16
lcpng_interface.h
View File

@ -23,21 +23,15 @@
extern vlib_log_class_t lcp_itf_pair_logger;
#define LCP_IF_DBG(...) \
vlib_log_debug (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_DBG(...) vlib_log_debug (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_INFO(...) \
vlib_log_info (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_INFO(...) vlib_log_info (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_NOTICE(...) \
vlib_log_notice (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_NOTICE(...) vlib_log_notice (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_WARN(...) \
vlib_log_warn (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_ERROR(...) \
vlib_log_err (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_WARN(...) vlib_log_warn (lcp_itf_pair_logger, __VA_ARGS__);
#define LCP_IF_ERROR(...) vlib_log_err (lcp_itf_pair_logger, __VA_ARGS__);
#define foreach_lcp_itf_pair_flag _ (STALE, 0, "stale")

10
lcpng_netlink.c
View File

@ -300,8 +300,8 @@ lcp_nl_process_msgs (void)
}
else
{
LCP_NL_DBG ("process_msgs: Processed %u messages in %llu usecs", n_msgs,
usecs);
LCP_NL_DBG ("process_msgs: Processed %u messages in %llu usecs",
n_msgs, usecs);
}
}
@ -405,7 +405,8 @@ lcp_nl_pair_add_cb (lcp_itf_pair_t *lip)
if ((nm->nl_ns.clib_file_lcp_refcnt > 0) &&
vec_cmp(nm->nl_ns.netns_name, lip->lip_namespace))
{
LCP_NL_WARN ("pair_add_cb: Existing netlink listener for netns %v -- this "
LCP_NL_WARN (
"pair_add_cb: Existing netlink listener for netns %v -- this "
"itf-pair is in netns %v, will not be listened!",
nm->nl_ns.netns_name, lip->lip_namespace);
return;
@ -562,7 +563,8 @@ lcp_nl_open_socket (u8 *ns)
nm->tx_buf_size);
if (err != 0)
{
LCP_NL_ERROR ("open_socket: Failed to set buffer size tx %u rx %u error %s",
LCP_NL_ERROR (
"open_socket: Failed to set buffer size tx %u rx %u error %s",
nm->tx_buf_size, nm->rx_buf_size, nl_geterror (err));
}

3
lcpng_netlink.h
View File

@ -42,7 +42,8 @@ typedef enum nl_event_type_t_
#define LCP_NL_DBG(...) vlib_log_debug (lcp_nl_main.nl_logger, __VA_ARGS__);
#define LCP_NL_INFO(...) vlib_log_info (lcp_nl_main.nl_logger, __VA_ARGS__);
#define LCP_NL_NOTICE(...) vlib_log_notice (lcp_nl_main.nl_logger, __VA_ARGS__);
#define LCP_NL_NOTICE(...) \
vlib_log_notice (lcp_nl_main.nl_logger, __VA_ARGS__);
#define LCP_NL_WARN(...) vlib_log_warn (lcp_nl_main.nl_logger, __VA_ARGS__);
#define LCP_NL_ERROR(...) vlib_log_err (lcp_nl_main.nl_logger, __VA_ARGS__);

54
lcpng_nl_sync.c
View File

@ -579,15 +579,16 @@ lcp_nl_link_add_vlan (struct rtnl_link *rl)
*/
if (!(parent_lip = lcp_itf_pair_get (lcp_itf_pair_find_by_vif (parent_idx))))
{
LCP_NL_WARN ("link_add_vlan: No LIP for parent of %U", format_nl_object, rl);
LCP_NL_WARN ("link_add_vlan: No LIP for parent of %U", format_nl_object,
rl);
return NULL;
}
parent_sw = vnet_get_sw_interface (vnm, parent_lip->lip_phy_sw_if_index);
if (!parent_sw)
{
LCP_NL_ERROR ("link_add_vlan: Cannot get parent of %U", format_lcp_itf_pair,
parent_lip);
LCP_NL_ERROR ("link_add_vlan: Cannot get parent of %U",
format_lcp_itf_pair, parent_lip);
return NULL;
}
@ -635,7 +636,8 @@ lcp_nl_link_add_vlan (struct rtnl_link *rl)
&subid))
{
LCP_NL_ERROR ("link_add_vlan: Cannot find available subid on phy %U",
format_vnet_sw_if_index_name, vnm, parent_sw->sup_sw_if_index);
format_vnet_sw_if_index_name, vnm,
parent_sw->sup_sw_if_index);
lcpm->lcp_auto_subint = old_lcp_auto_subint;
return NULL;
}
@ -649,8 +651,8 @@ lcp_nl_link_add_vlan (struct rtnl_link *rl)
{
LCP_NL_ERROR ("link_add_vlan: Cannot create sub-int on phy %U flags %u "
"inner-dot1q %u dot1%s %u",
format_vnet_sw_if_index_name, vnm, parent_sw->sup_sw_if_index,
flags, inner_vlan,
format_vnet_sw_if_index_name, vnm,
parent_sw->sup_sw_if_index, flags, inner_vlan,
parent_sw->sub.eth.flags.dot1ad ? "ad" : "q", outer_vlan);
lcpm->lcp_auto_subint = old_lcp_auto_subint;
return NULL;
@ -668,12 +670,12 @@ lcp_nl_link_add_vlan (struct rtnl_link *rl)
lcpm->lcp_auto_subint = old_lcp_auto_subint;
return NULL;
}
LCP_NL_INFO ("link_add_vlan: creating subid %u outer %u inner %u flags %u on "
LCP_NL_INFO (
"link_add_vlan: creating subid %u outer %u inner %u flags %u on "
"host %U phy %U",
subid, outer_vlan, inner_vlan, flags,
format_vnet_sw_if_index_name, vnm,
parent_lip->lip_host_sw_if_index, format_vnet_sw_if_index_name,
vnm, phy_lip->lip_host_sw_if_index);
subid, outer_vlan, inner_vlan, flags, format_vnet_sw_if_index_name, vnm,
parent_lip->lip_host_sw_if_index, format_vnet_sw_if_index_name, vnm,
phy_lip->lip_host_sw_if_index);
if (vnet_create_sub_interface (phy_lip->lip_host_sw_if_index, subid, flags,
inner_vlan, outer_vlan, &host_sw_if_index))
@ -688,7 +690,8 @@ lcp_nl_link_add_vlan (struct rtnl_link *rl)
}
// Always keep sub-int on the TAP up
vnet_sw_interface_admin_up (vnm, host_sw_if_index);
LCP_NL_NOTICE ("link_add_vlan: Creating LIP for host %U phy %U name %s idx %d",
LCP_NL_NOTICE (
"link_add_vlan: Creating LIP for host %U phy %U name %s idx %d",
format_vnet_sw_if_index_name, vnm, host_sw_if_index,
format_vnet_sw_if_index_name, vnm, phy_sw_if_index,
rtnl_link_get_name (rl), idx);
@ -726,8 +729,9 @@ lcp_nl_link_del (struct rtnl_link *rl)
if (rtnl_link_is_vlan (rl))
{
LCP_NL_NOTICE ("link_del: Removing subint %U", format_vnet_sw_if_index_name,
vnet_get_main (), lip->lip_phy_sw_if_index);
LCP_NL_NOTICE ("link_del: Removing subint %U",
format_vnet_sw_if_index_name, vnet_get_main (),
lip->lip_phy_sw_if_index);
vnet_delete_sub_interface (lip->lip_phy_sw_if_index);
vnet_delete_sub_interface (lip->lip_host_sw_if_index);
}
@ -907,7 +911,8 @@ lcp_nl_addr_add_del (struct rtnl_addr *ra, int is_del)
lcp_itf_pair_t *lip;
ip_address_t nh;
LCP_NL_DBG ("addr_%s: netlink %U", is_del ? "del" : "add", format_nl_object, ra);
LCP_NL_DBG ("addr_%s: netlink %U", is_del ? "del" : "add", format_nl_object,
ra);
if (!(lip = lcp_itf_pair_get (
lcp_itf_pair_find_by_vif (rtnl_addr_get_ifindex (ra)))))
@ -944,10 +949,10 @@ lcp_nl_addr_add_del (struct rtnl_addr *ra, int is_del)
lcp_nl_ip6_mroutes_add_del (lip->lip_phy_sw_if_index, !is_del);
}
LCP_NL_NOTICE ("addr_%s %U/%d iface %U", is_del ? "del: Deleted" : "add: Added",
LCP_NL_NOTICE (
"addr_%s %U/%d iface %U", is_del ? "del: Deleted" : "add: Added",
format_ip_address, &nh, rtnl_addr_get_prefixlen (ra),
format_vnet_sw_if_index_name, vnet_get_main (),
lip->lip_phy_sw_if_index);
format_vnet_sw_if_index_name, vnet_get_main (), lip->lip_phy_sw_if_index);
}
void
@ -988,7 +993,8 @@ lcp_nl_neigh_add (struct rtnl_neigh *rn)
if ((rna = rtnl_neigh_get_dst (rn)) == NULL)
{
LCP_NL_DBG ("neigh_del: ignore missing neighbor %U", format_nl_object, rn);
LCP_NL_DBG ("neigh_del: ignore missing neighbor %U", format_nl_object,
rn);
return;
}
lcp_nl_mk_ip_addr (rna, &nh);
@ -1019,9 +1025,10 @@ lcp_nl_neigh_add (struct rtnl_neigh *rn)
}
else
{
LCP_NL_INFO ("neigh_add: Added %U lladdr %U iface %U", format_ip_address,
&nh, format_mac_address, &mac, format_vnet_sw_if_index_name,
vnet_get_main (), lip->lip_phy_sw_if_index);
LCP_NL_INFO ("neigh_add: Added %U lladdr %U iface %U",
format_ip_address, &nh, format_mac_address, &mac,
format_vnet_sw_if_index_name, vnet_get_main (),
lip->lip_phy_sw_if_index);
}
}
}
@ -1050,7 +1057,8 @@ lcp_nl_neigh_del (struct rtnl_neigh *rn)
if ((rna = rtnl_neigh_get_dst (rn)) == NULL)
{
LCP_NL_DBG ("neigh_del: ignore missing neighbor %U", format_nl_object, rn);
LCP_NL_DBG ("neigh_del: ignore missing neighbor %U", format_nl_object,
rn);
return;
}
lcp_nl_mk_ip_addr (rna, &nh);