Skip to content

Commit

Permalink
Replace map containing configuration values with a struct, change use…
Browse files Browse the repository at this point in the history 
…s accordingly
  • Loading branch information
vimes authored and GeorgyKirichenko committed Mar 20, 2024
1 parent d1c1877 commit e68d113
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 326 deletions.
34 changes: 17 additions & 17 deletions dataplane/controlplane.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ eResult cControlPlane::init(bool use_kernel_interface)
return result;
}

gc_step = dataPlane->getConfigValue(eConfigType::gc_step);
gc_step = dataPlane->getConfigValues().gc_step;
dregress.gc_step = gc_step;

icmpOutRemainder = dataPlane->config.SWICMPOutRateLimit / dataPlane->config.rateLimitDivisor;
Expand Down Expand Up @@ -1415,7 +1415,7 @@ void cControlPlane::waitAllWorkers()
eResult cControlPlane::initMempool()
{
mempool = rte_mempool_create("cp",
CONFIG_YADECAP_MBUFS_COUNT + dataPlane->getConfigValue(eConfigType::fragmentation_size) + dataPlane->getConfigValue(eConfigType::master_mempool_size) + 4 * CONFIG_YADECAP_PORTS_SIZE * CONFIG_YADECAP_MBUFS_BURST_SIZE + 4 * dataPlane->ports.size() * dataPlane->getConfigValue(eConfigType::kernel_interface_queue_size),
CONFIG_YADECAP_MBUFS_COUNT + dataPlane->getConfigValues().fragmentation_size + dataPlane->getConfigValues().master_mempool_size + 4 * CONFIG_YADECAP_PORTS_SIZE * CONFIG_YADECAP_MBUFS_BURST_SIZE + 4 * dataPlane->ports.size() * dataPlane->getConfigValues().kernel_interface_queue_size,
CONFIG_YADECAP_MBUF_SIZE,
0,
sizeof(struct rte_pktmbuf_pool_private),
Expand Down Expand Up @@ -1515,7 +1515,7 @@ std::optional<tPortId> cControlPlane::add_kernel_interface(const tPortId port_id
snprintf(vdev_args,
sizeof(vdev_args),
"path=/dev/vhost-net,queues=1,queue_size=%lu,iface=%s,mac=%s",
dataPlane->getConfigValue(eConfigType::kernel_interface_queue_size),
dataPlane->getConfigValues().kernel_interface_queue_size,
interface_name.data(),
common::mac_address_t(ether_addr.addr_bytes).toString().data());

Expand Down Expand Up @@ -1557,7 +1557,7 @@ std::optional<tPortId> cControlPlane::add_kernel_interface(const tPortId port_id

int rc = rte_eth_rx_queue_setup(kernel_port_id,
0,
dataPlane->getConfigValue(eConfigType::kernel_interface_queue_size),
dataPlane->getConfigValues().kernel_interface_queue_size,
0, ///< @todo: socket
nullptr,
mempool);
Expand All @@ -1570,7 +1570,7 @@ std::optional<tPortId> cControlPlane::add_kernel_interface(const tPortId port_id

rc = rte_eth_tx_queue_setup(kernel_port_id,
0,
dataPlane->getConfigValue(eConfigType::kernel_interface_queue_size),
dataPlane->getConfigValues().kernel_interface_queue_size,
0, ///< @todo: socket
nullptr);
if (rc < 0)
Expand Down Expand Up @@ -2826,26 +2826,26 @@ bool cControlPlane::handlePacket_fw_state_sync_ingress(rte_mbuf* mbuf)
value.packets_forward = 0;
value.tcp.unpack(payload->flags);

uint32_t state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_other_protocols_timeout);
uint32_t state_timeout = dataPlane->getConfigValues().stateful_firewall_other_protocols_timeout;
if (payload->proto == IPPROTO_UDP)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_udp_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_udp_timeout;
}
else if (payload->proto == IPPROTO_TCP)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_timeout;
uint8_t flags = value.tcp.src_flags | value.tcp.dst_flags;
if (flags & (uint8_t)common::fwstate::tcp_flags_e::ACK)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_syn_ack_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_syn_ack_timeout;
}
else if (flags & (uint8_t)common::fwstate::tcp_flags_e::SYN)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_syn_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_syn_timeout;
}
if (flags & (uint8_t)common::fwstate::tcp_flags_e::FIN)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_fin_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_fin_timeout;
}
}
value.state_timeout = state_timeout;
Expand Down Expand Up @@ -2906,26 +2906,26 @@ bool cControlPlane::handlePacket_fw_state_sync_ingress(rte_mbuf* mbuf)
value.packets_forward = 0;
value.tcp.unpack(payload->flags);

uint32_t state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_other_protocols_timeout);
uint32_t state_timeout = dataPlane->getConfigValues().stateful_firewall_other_protocols_timeout;
if (payload->proto == IPPROTO_UDP)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_udp_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_udp_timeout;
}
else if (payload->proto == IPPROTO_TCP)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_timeout;
uint8_t flags = value.tcp.src_flags | value.tcp.dst_flags;
if (flags & (uint8_t)common::fwstate::tcp_flags_e::ACK)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_syn_ack_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_syn_ack_timeout;
}
else if (flags & (uint8_t)common::fwstate::tcp_flags_e::SYN)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_syn_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_syn_timeout;
}
if (flags & (uint8_t)common::fwstate::tcp_flags_e::FIN)
{
state_timeout = dataPlane->getConfigValue(eConfigType::stateful_firewall_tcp_fin_timeout);
state_timeout = dataPlane->getConfigValues().stateful_firewall_tcp_fin_timeout;
}
}
value.state_timeout = state_timeout;
Expand Down
Loading

0 comments on commit e68d113

Please sign in to comment.