izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix formatting

Browse Source
This commit is contained in:
loki
2019-12-17 18:42:37 +01:00
parent 6c0471620b
commit b317258a74
1 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunshine/stream.cpp
+28 -29
View File
@@ -171,49 +171,48 @@ public:
case ENET_EVENT_TYPE_RECEIVE: case ENET_EVENT_TYPE_RECEIVE:
{ {
packet_t packet { event.packet }; packet_t packet { event.packet };
peer_t peer { event.peer }; peer_t peer { event.peer };
msg_t req { new RTSP_MESSAGE {} }; msg_t req { new RTSP_MESSAGE {} };
//TODO: compare addresses of the peers //TODO: compare addresses of the peers
if(_queue_packet.second == nullptr) { if(_queue_packet.second == nullptr) {
parseRtspMessage(req.get(), (char*)packet->data, packet->dataLength); parseRtspMessage(req.get(), (char*)packet->data, packet->dataLength);
for(auto option = req->options; option != nullptr; option = option->next) { for(auto option = req->options; option != nullptr; option = option->next) {
if("Content-length"sv == option->option) { if("Content-length"sv == option->option) {
_queue_packet = std::make_pair(peer, std::move(packet)); _queue_packet = std::make_pair(peer, std::move(packet));
return; return;
} }
} }
} }
else { else {
std::vector<char> full_payload; std::vector<char> full_payload;
auto old_msg = std::move(_queue_packet); auto old_msg = std::move(_queue_packet);
TUPLE_2D_REF(_, old_packet, old_msg); TUPLE_2D_REF(_, old_packet, old_msg);
std::string_view new_payload { (char*)packet->data, packet->dataLength };
std::string_view old_payload { (char*)old_packet->data, old_packet->dataLength };
full_payload.resize(new_payload.size() + old_payload.size());
std::string_view new_payload { (char*)packet->data, packet->dataLength }; std::copy(std::begin(old_payload), std::end(old_payload), std::begin(full_payload));
std::string_view old_payload { (char*)old_packet->data, old_packet->dataLength }; std::copy(std::begin(new_payload), std::end(new_payload), std::begin(full_payload) + old_payload.size());
full_payload.resize(new_payload.size() + old_payload.size());
std::copy(std::begin(old_payload), std::end(old_payload), std::begin(full_payload));
std::copy(std::begin(new_payload), std::end(new_payload), std::begin(full_payload) + old_payload.size());
parseRtspMessage(req.get(), full_payload.data(), full_payload.size()); parseRtspMessage(req.get(), full_payload.data(), full_payload.size());
} }
print_msg(req.get()); print_msg(req.get());
msg_t resp; msg_t resp;
auto func = _map_cmd_cb.find(req->message.request.command); auto func = _map_cmd_cb.find(req->message.request.command);
if(func != std::end(_map_cmd_cb)) { if(func != std::end(_map_cmd_cb)) {
func->second(_host, peer, std::move(req)); func->second(_host, peer, std::move(req));
} }
else { else {
cmd_not_found(_host, peer, std::move(req)); cmd_not_found(_host, peer, std::move(req));
} }
return; return;
} }
break; break;
case ENET_EVENT_TYPE_CONNECT: case ENET_EVENT_TYPE_CONNECT: