#include "test.h"
#include "log.h"
-#include "socket.h"
#include "settings.h"
#include "util/serialize.h"
#include "network/connection.h"
+#include "network/networkpacket.h"
+#include "network/socket.h"
class TestConnection : public TestBase {
public:
{
// Some constants for testing
u32 proto_id = 0x12345678;
- u16 peer_id = 123;
+ session_t peer_id = 123;
u8 channel = 2;
SharedBuffer<u8> data1(1);
data1[0] = 100;
We should now have a packet with this data:
Header:
[0] u32 protocol_id
- [4] u16 sender_peer_id
+ [4] session_t sender_peer_id
[6] u8 channel
Data:
[7] u8 data1[0]
infostream<<"data1[0]="<<((u32)data1[0]&0xff)<<std::endl;*/
UASSERT(p2.getSize() == 3 + data1.getSize());
- UASSERT(readU8(&p2[0]) == TYPE_RELIABLE);
+ UASSERT(readU8(&p2[0]) == con::PACKET_TYPE_RELIABLE);
UASSERT(readU16(&p2[1]) == seqnum);
UASSERT(readU8(&p2[3]) == data1[0]);
}
void TestConnection::testConnectSendReceive()
{
- DSTACK("TestConnection::Run");
-
/*
Test some real connections
NetworkPacket pkt;
pkt.putRawPacket((u8*) "Hello World !", 14, 0);
- Buffer<u8> sentdata = pkt.oldForgePacket();
+ SharedBuffer<u8> sentdata = pkt.oldForgePacket();
infostream<<"** running client.Send()"<<std::endl;
client.Send(PEER_ID_SERVER, 0, &pkt, true);
<< ", data=" << (const char*)pkt.getU8Ptr(0)
<< std::endl;
- Buffer<u8> recvdata = pkt.oldForgePacket();
+ SharedBuffer<u8> recvdata = pkt.oldForgePacket();
UASSERT(memcmp(*sentdata, *recvdata, recvdata.getSize()) == 0);
}
- u16 peer_id_client = 2;
+ session_t peer_id_client = 2;
/*
Send a large packet
*/
infostream << "...";
infostream << std::endl;
- Buffer<u8> sentdata = pkt.oldForgePacket();
+ SharedBuffer<u8> sentdata = pkt.oldForgePacket();
server.Send(peer_id_client, 0, &pkt, true);
//sleep_ms(3000);
- Buffer<u8> recvdata;
+ SharedBuffer<u8> recvdata;
infostream << "** running client.Receive()" << std::endl;
- u16 peer_id = 132;
+ session_t peer_id = 132;
u16 size = 0;
bool received = false;
u64 timems0 = porting::getTimeMs();