Skip to content

Commit

Permalink
Post-refactor changes
Browse files Browse the repository at this point in the history
- Change Fake_WinPacketListRawFree implementation to use production function
- Remove dead code
- Add comment with logic explanation
- Remove unused packets definitions
- Update .gitignore

Change-Id: Ib4d4d3f063ca961a6e65a09a7a371264016b38b4
Partial-Bug: #1737177
  • Loading branch information
jablonskim committed Jul 18, 2018
1 parent b6e1aec commit 32b7519
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -29,7 +29,7 @@ modules.order
.vs
*.VC.db
*.VC.VC.opendb
/ipch/
*/ipch/
/sandesh/gen-c/*
/test/cmocka
/test/atomic-test/x64
2 changes: 1 addition & 1 deletion test/windows/fake_win_packet_raw.c
Expand Up @@ -251,7 +251,7 @@ Fake_WinPacketListRawFree(PWIN_PACKET_LIST List)
if (List->WinPacket != NULL) {
Fake_WinPacketFree(List->WinPacket);
}
test_free(List);
WinPacketListRawFreeElement(List);
}
}

Expand Down
1 change: 0 additions & 1 deletion windows/vr_nbl.c
Expand Up @@ -385,7 +385,6 @@ FilterSendNetBufferLists(
}

// Enforce 1 to 1 NBL <-> NB relationship
// PNET_BUFFER_LIST splittedNblList = SplitMultiNetBufferNetBufferList(curNbl);
PWIN_PACKET_RAW rawPacket = WinPacketRawFromNBL(curNbl);
PWIN_PACKET_LIST splittedPacketList = WinPacketSplitMultiPacket((PWIN_MULTI_PACKET)rawPacket);
if (splittedPacketList == NULL) {
Expand Down
8 changes: 8 additions & 0 deletions windows/win_packet.c
Expand Up @@ -11,6 +11,7 @@

static void WinPacketFreeRecursiveImpl(PWIN_PACKET_RAW RawPacket);

/* NOTICE: This cast is safe to perform only if WinPacket contains single SubPacket */
static inline PWIN_PACKET
WinPacketFromRawPacket(PWIN_PACKET_RAW Packet)
{
Expand Down Expand Up @@ -95,6 +96,13 @@ WinPacketSplitMultiPacketWithSingleSubPacket(PWIN_PACKET_RAW RawMultiPacket)
return element;
}

/*
* Splits NBL with multiple NBs (WinMultiPacket) into list of NBLs,
* in which each NBL has a single NB (WinPackets).
*
* The original NBL is set as a parent and left intact.
* The returned value is a list of new NBLs (WinPacketList).
*/
static PWIN_PACKET_LIST
WinPacketSplitMultiPacketWithMultipleSubPackets(PWIN_PACKET_RAW RawMultiPacket)
{
Expand Down
12 changes: 2 additions & 10 deletions windows/win_packet_raw.c
Expand Up @@ -9,14 +9,6 @@

#include <ndis.h>

struct _WIN_SUB_PACKET {
NET_BUFFER NetBuffer;
};

struct _WIN_PACKET_RAW {
NET_BUFFER_LIST NetBufferList;
};

static const ULONG PacketListAllocationTag = 'ELPW';

PWIN_PACKET_RAW
Expand Down Expand Up @@ -168,7 +160,7 @@ WinPacketListRawFreeElement(PWIN_PACKET_LIST Element)
static inline PNET_BUFFER
WinSubPacketRawToNB(PWIN_SUB_PACKET SubPacket)
{
return &SubPacket->NetBuffer;
return (PNET_BUFFER)SubPacket;
}

static inline PWIN_SUB_PACKET
Expand Down Expand Up @@ -212,7 +204,7 @@ WinSubPacketRawSetNext(PWIN_SUB_PACKET SubPacket, PWIN_SUB_PACKET Next)
PNET_BUFFER_LIST
WinPacketRawToNBL(PWIN_PACKET_RAW Packet)
{
return &Packet->NetBufferList;
return (PNET_BUFFER_LIST)Packet;
}

PWIN_PACKET_RAW
Expand Down

0 comments on commit 32b7519

Please sign in to comment.