stephenseo/UDPConnection
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

Minor fixes

Browse source
This commit is contained in:
Stephen Seo 2019-12-18 14:34:53 +09:00
parent 4b36d05ccc
commit ffcc30bc64
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/UDPConnection.cpp
View file

@ -1170,7 +1170,9 @@ void UDPC::Context::update_impl() {
bool isNotRecChecked = conID & UDPC_ID_NO_REC_CHK; bool isNotRecChecked = conID & UDPC_ID_NO_REC_CHK;
bool isResending = conID & UDPC_ID_RESENDING; bool isResending = conID & UDPC_ID_RESENDING;
conID &= 0x0FFFFFFF; conID &= 0x0FFFFFFF;
UDPC_ConnectionId identifier{receivedData.sin6_addr, receivedData.sin6_scope_id, ntohs(receivedData.sin6_port)}; UDPC_ConnectionId identifier = UDPC_create_id_full(receivedData.sin6_addr,
receivedData.sin6_scope_id,
ntohs(receivedData.sin6_port));
if(isConnect && !isPing && bytes < (int)(UDPC_CON_HEADER_SIZE)) { if(isConnect && !isPing && bytes < (int)(UDPC_CON_HEADER_SIZE)) {
// invalid packet size // invalid packet size
@ -2227,14 +2229,15 @@ UDPC_ConnectionId* UDPC_get_list_connected(UDPC_HContext ctx, unsigned int *size
*size = c->conMap.size(); *size = c->conMap.size();
} }
UDPC_ConnectionId *list = (UDPC_ConnectionId*)std::malloc( UDPC_ConnectionId *list = (UDPC_ConnectionId*)std::calloc(
sizeof(UDPC_ConnectionId) * (c->conMap.size() + 1)); c->conMap.size() + 1, sizeof(UDPC_ConnectionId));
UDPC_ConnectionId *current = list; UDPC_ConnectionId *current = list;
for(auto iter = c->conMap.begin(); iter != c->conMap.end(); ++iter) { for(auto iter = c->conMap.begin(); iter != c->conMap.end(); ++iter) {
*current = iter->first; *current = iter->first;
++current; ++current;
} }
*current = UDPC_ConnectionId{{0}, 0, 0}; // following line is redudnant, since calloc initialized all bits to zero
// *current = UDPC_ConnectionId{{0}, 0, 0};
return list; return list;
} }