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

Replace variable length arrays with std::vector #1662

Merged
merged 1 commit into from
Dec 24, 2024
Merged

Replace variable length arrays with std::vector #1662

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
4 changes: 2 additions & 2 deletions Examples/DpdkExample-FilterTraffic/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void listDpdkPorts()
void prepareCoreConfiguration(std::vector<pcpp::DpdkDevice*>& dpdkDevicesToUse,
std::vector<pcpp::SystemCore>& coresToUse, bool writePacketsToDisk,
const std::string& packetFilePath, pcpp::DpdkDevice* sendPacketsTo,
AppWorkerConfig workerConfigArr[], int workerConfigArrLen, uint16_t rxQueues)
std::vector<AppWorkerConfig>& workerConfigArr, int workerConfigArrLen, uint16_t rxQueues)
Dimi1010 marked this conversation as resolved.
Show resolved Hide resolved
{
// create a list of pairs of DpdkDevice and RX queues for all RX queues in all requested devices
int totalNumOfRxQueues = 0;
Expand Down Expand Up @@ -588,7 +588,7 @@ int main(int argc, char* argv[])
}

// prepare configuration for every core
AppWorkerConfig workerConfigArr[coresToUse.size()];
std::vector<AppWorkerConfig> workerConfigArr(coresToUse.size());
prepareCoreConfiguration(dpdkDevicesToUse, coresToUse, writePacketsToDisk, packetFilePath, sendPacketsTo,
workerConfigArr, coresToUse.size(), rxQueues);

Expand Down
8 changes: 4 additions & 4 deletions Examples/PfRingExample-FilterTraffic/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ int main(int argc, char* argv[])
int threadCount = 0;

// create an array of packet stats with the size of all machine cores
PacketStats packetStatsArr[totalNumOfCores];
std::vector<PacketStats> packetStatsArr(totalNumOfCores);

// init each packet stats instance with an illegal core ID
for (int coreId = 0; coreId < totalNumOfCores; coreId++)
Expand All @@ -430,7 +430,7 @@ int main(int argc, char* argv[])
PacketMatchingEngine matchingEngine(srcIPToMatch, dstIPToMatch, srcPortToMatch, dstPortToMatch, protocolToMatch);

// create a flow table for each core
std::unordered_map<uint32_t, bool> flowTables[totalNumOfCores];
std::vector<std::unordered_map<uint32_t, bool>> flowTables(totalNumOfCores);

pcpp::PcapFileWriterDevice** pcapWriters = nullptr;

Expand Down Expand Up @@ -463,9 +463,9 @@ int main(int argc, char* argv[])

// prepare packet capture configuration
CaptureThreadArgs args;
args.packetStatArr = packetStatsArr;
args.packetStatArr = packetStatsArr.data();
args.matchingEngine = &matchingEngine;
args.flowTables = flowTables;
args.flowTables = flowTables.data();
args.sendPacketsTo = sendPacketsToIface;
args.pcapWriters = pcapWriters;

Expand Down
20 changes: 10 additions & 10 deletions Pcap++/src/DpdkDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,8 +929,8 @@ namespace pcpp
return 0;
}

struct rte_mbuf* mBufArray[rawPacketArrLength];
uint16_t packetsReceived = rte_eth_rx_burst(m_Id, rxQueueId, mBufArray, rawPacketArrLength);
std::vector<struct rte_mbuf*> mBufArray(rawPacketArrLength);
uint16_t packetsReceived = rte_eth_rx_burst(m_Id, rxQueueId, mBufArray.data(), rawPacketArrLength);

if (unlikely(!packetsReceived))
{
Expand Down Expand Up @@ -972,8 +972,8 @@ namespace pcpp
return 0;
}

struct rte_mbuf* mBufArray[packetsArrLength];
uint16_t packetsReceived = rte_eth_rx_burst(m_Id, rxQueueId, mBufArray, packetsArrLength);
std::vector<struct rte_mbuf*> mBufArray(packetsArrLength);
uint16_t packetsReceived = rte_eth_rx_burst(m_Id, rxQueueId, mBufArray.data(), packetsArrLength);

if (unlikely(!packetsReceived))
{
Expand Down Expand Up @@ -1133,9 +1133,9 @@ namespace pcpp

uint16_t DpdkDevice::sendPackets(Packet** packetsArr, uint16_t arrLength, uint16_t txQueueId, bool useTxBuffer)
{
rte_mbuf* mBufArr[arrLength];
std::vector<rte_mbuf*> mBufArr(arrLength);
MBufRawPacketVector mBufVec;
MBufRawPacket* mBufRawPacketArr[arrLength];
std::vector<MBufRawPacket*> mBufRawPacketArr(arrLength);

for (size_t i = 0; i < arrLength; i++)
{
Expand All @@ -1162,7 +1162,7 @@ namespace pcpp
}

uint16_t packetsSent =
sendPacketsInner(txQueueId, (void*)mBufArr, getNextPacketFromMBufArray, arrLength, useTxBuffer);
sendPacketsInner(txQueueId, (void*)mBufArr.data(), getNextPacketFromMBufArray, arrLength, useTxBuffer);

bool needToFreeMbuf = (!useTxBuffer && (packetsSent != arrLength));
for (int index = 0; index < arrLength; index++)
Expand All @@ -1174,8 +1174,8 @@ namespace pcpp
uint16_t DpdkDevice::sendPackets(RawPacketVector& rawPacketsVec, uint16_t txQueueId, bool useTxBuffer)
{
size_t vecSize = rawPacketsVec.size();
rte_mbuf* mBufArr[vecSize];
MBufRawPacket* mBufRawPacketArr[vecSize];
std::vector<rte_mbuf*> mBufArr(vecSize);
std::vector<MBufRawPacket*> mBufRawPacketArr(vecSize);
MBufRawPacketVector mBufVec;
int mBufIndex = 0;

Expand Down Expand Up @@ -1204,7 +1204,7 @@ namespace pcpp
}

uint16_t packetsSent =
sendPacketsInner(txQueueId, (void*)mBufArr, getNextPacketFromMBufArray, vecSize, useTxBuffer);
sendPacketsInner(txQueueId, (void*)mBufArr.data(), getNextPacketFromMBufArray, vecSize, useTxBuffer);

bool needToFreeMbuf = (!useTxBuffer && (packetsSent != vecSize));
for (size_t index = 0; index < rawPacketsVec.size(); index++)
Expand Down
2 changes: 1 addition & 1 deletion Pcap++/src/DpdkDeviceList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ namespace pcpp

// Should be equal to the number of static params
initDpdkArgc += 7;
std::string dpdkParamsArray[initDpdkArgc];
std::vector<std::string> dpdkParamsArray(initDpdkArgc);
initDpdkArgvBuffer = new char*[initDpdkArgc];
i = 0;
while (dpdkParamsStream.good() && i < initDpdkArgc)
Expand Down
Loading