Skip to content

Commit 4ffa530

Browse files
authored
Update rx.h
Support IPv6
1 parent 5e4351b commit 4ffa530

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

rx.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ class ReceptionBlock
1616
private:
1717
Reception* const c_Reception;
1818
ReceptionSession* const c_Session;
19-
const u16 m_BlockSequenceNumber;
20-
std::vector< std::unique_ptr< u08[] > > m_DecodedPacketBuffer;
21-
std::vector< std::unique_ptr< u08[] > > m_EncodedPacketBuffer;
22-
std::vector< std::unique_ptr< u08[] > > m_DecodingMatrix;
19+
const uint16_t m_BlockSequenceNumber;
20+
std::vector< std::unique_ptr< uint8_t[] > > m_DecodedPacketBuffer;
21+
std::vector< std::unique_ptr< uint8_t[] > > m_EncodedPacketBuffer;
22+
std::vector< std::unique_ptr< uint8_t[] > > m_DecodingMatrix;
2323
bool m_DecodingReady;
24-
const u08 FindMaximumRank(Header::Data* hdr = nullptr);
24+
const uint8_t FindMaximumRank(Header::Data* hdr = nullptr);
2525
const bool FindEndOfBlock(Header::Data* hdr = nullptr);
2626
enum ReceiveAction
2727
{
@@ -30,7 +30,7 @@ class ReceptionBlock
3030
DECODING,
3131
};
3232

33-
ReceiveAction FindAction(u08* buffer, u16 length);
33+
ReceiveAction FindAction(uint8_t* buffer, uint16_t length);
3434
bool Decoding();
3535
public:
3636
ReceptionBlock() = delete;
@@ -39,9 +39,9 @@ class ReceptionBlock
3939
ReceptionBlock& operator=(const ReceptionBlock&) = delete;
4040
ReceptionBlock& operator=(ReceptionBlock&&) = delete;
4141

42-
ReceptionBlock(Reception* const reception, ReceptionSession* const session, const u16 BlockSequenceNumber);
42+
ReceptionBlock(Reception* const reception, ReceptionSession* const session, const uint16_t BlockSequenceNumber);
4343
~ReceptionBlock();
44-
void Receive(u08* buffer, u16 length, const sockaddr_in * const sender_addr, const u32 sender_addr_len);
44+
void Receive(uint8_t* buffer, uint16_t length, const sockaddr* const sender_addr, const uint32_t sender_addr_len);
4545
};
4646

4747
class ReceptionSession
@@ -50,36 +50,36 @@ class ReceptionSession
5050
friend class Reception;
5151
private:
5252
Reception* const c_Reception;
53-
AVLTree< u16, ReceptionBlock* > m_Blocks;
53+
AVLTree< uint16_t, ReceptionBlock* > m_Blocks;
5454
ThreadPool<1, 1> m_RxTaskQueue;
55-
u16 m_SequenceNumberForService;
56-
u16 m_MinSequenceNumberAwaitingAck;
57-
u16 m_MaxSequenceNumberAwaitingAck;
58-
const sockaddr_in m_SenderAddress;
55+
uint16_t m_SequenceNumberForService;
56+
uint16_t m_MinSequenceNumberAwaitingAck;
57+
uint16_t m_MaxSequenceNumberAwaitingAck;
58+
const DataStructures::AddressType m_SenderAddress;
5959
public:
6060
ReceptionSession(const ReceptionSession&) = delete;
6161
ReceptionSession(ReceptionSession&&) = delete;
6262
ReceptionSession& operator=(const ReceptionSession&) = delete;
6363
ReceptionSession& operator=(ReceptionSession&&) = delete;
6464

65-
ReceptionSession(Reception * const Session, const sockaddr_in addr);
65+
ReceptionSession(Reception * const Session, const DataStructures::AddressType addr);
6666
~ReceptionSession();
67-
void Receive(u08* buffer, u16 length, const sockaddr_in * const sender_addr, const u32 sender_addr_len);
67+
void Receive(uint8_t* buffer, uint16_t length, const sockaddr* const sender_addr, const uint32_t sender_addr_len);
6868
};
6969

7070
class Reception
7171
{
7272
friend class ReceptionBlock;
7373
friend class ReceptionSession;
7474
private:
75-
const s32 c_Socket;
76-
AVLTree< DataStructures::IPv4PortKey, ReceptionSession* > m_Sessions;
75+
const int32_t c_Socket;
76+
AVLTree< DataStructures::SessionKey, ReceptionSession* > m_Sessions;
7777
public:
78-
const std::function <void (u08* buffer, u16 length, const sockaddr_in * const sender_addr, const u32 sender_addr_len)> m_RxCallback;
79-
Reception(s32 Socket, std::function <void (u08* buffer, u16 length, const sockaddr_in * const sender_addr, const u32 sender_addr_len)> rx);
78+
const std::function <void (uint8_t* buffer, uint16_t length, const sockaddr* const sender_addr, const uint32_t sender_addr_len)> m_RxCallback;
79+
Reception(int32_t Socket, std::function <void (uint8_t* buffer, uint16_t length, const sockaddr* const sender_addr, const uint32_t sender_addr_len)> rx);
8080
~Reception();
8181
public:
82-
void RxHandler(u08* buffer, u16 size, const sockaddr_in * const sender_addr, const u32 sender_addr_len);
82+
void RxHandler(uint8_t* buffer, uint16_t size, const sockaddr* const sender_addr, const uint32_t sender_addr_len);
8383
};
8484
}
8585

0 commit comments

Comments
 (0)