DOMO ARIGATO, MISUTA ROBOTO :trollface:
This commit is contained in:
@@ -1024,6 +1024,82 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* outbuf) {
|
||||
std::vector<char*> lsPck;
|
||||
int len = buf->tmp ? buf->tmp - buf->ptr : 0,
|
||||
end = 0;
|
||||
char* cursor = buf->tmp ? buf->tmp : nullptr,
|
||||
* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
|
||||
* last = buf->tmp ? buf->tmp : buf->ptr;
|
||||
bool ended = true;
|
||||
struct pollfd fds[1];
|
||||
sockaddr_in sockad = from;
|
||||
addrlen_t socklen = sizeof(sockad);
|
||||
|
||||
fds[0].fd = sock;
|
||||
fds[0].events = POLLIN;
|
||||
|
||||
while (true) {
|
||||
if (!poll(fds, 1, 0)) {
|
||||
if (ended)
|
||||
buf->tmp = nullptr;
|
||||
return lsPck;
|
||||
}
|
||||
|
||||
int bytes = recvfrom(sock, &buf->ptr[len], buf->len - len, 0, (sockaddr*)&sockad, &socklen);
|
||||
if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
|
||||
if (ended)
|
||||
buf->tmp = nullptr;
|
||||
return lsPck;
|
||||
}
|
||||
len += bytes;
|
||||
end = len;
|
||||
|
||||
ended = false;
|
||||
|
||||
while (true) {
|
||||
int cmp = 0;
|
||||
|
||||
if (cursor)
|
||||
end -= (cursor - buf->ptr);
|
||||
|
||||
if (end < 0)
|
||||
break;
|
||||
|
||||
cursor = (char*)memchr(next, '\r', end);
|
||||
|
||||
if (cursor) {
|
||||
next = cursor;
|
||||
cursor--;
|
||||
|
||||
cmp = memcmp(cursor, Footer, sizeof(uint32_t));
|
||||
if (cmp == 0) {
|
||||
if (!outbuf) {
|
||||
lsPck.push_back(last);
|
||||
cursor += sizeof(uint32_t);
|
||||
last = cursor;
|
||||
next = cursor + 1;
|
||||
}
|
||||
else {
|
||||
memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
|
||||
lsPck.push_back(&outbuf->ptr[cursor - last]);
|
||||
cursor += sizeof(uint32_t);
|
||||
last = cursor;
|
||||
next = cursor + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!outbuf)
|
||||
buf->tmp = last;
|
||||
cursor = &buf->ptr[len];
|
||||
next = cursor + 1;
|
||||
break;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <>
|
||||
void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf) {
|
||||
switch (pack->type) {
|
||||
|
Reference in New Issue
Block a user