Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert 91dc3d39f0 ('Move counter variable in processMsg into Opus condition.'). #2825

Merged
merged 1 commit into from Feb 7, 2017
Merged

Revert 91dc3d39f0 ('Move counter variable in processMsg into Opus condition.'). #2825

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/murmur/Server.cpp
View file
Open in desktop
Expand Up @@ -978,6 +978,7 @@ void Server::processMsg(ServerUser *u, const char *data, int len) {
return;

QByteArray qba, qba_npos;
unsigned int counter;
char buffer[UDP_PACKET_SIZE];
PacketDataStream pdi(data + 1, len - 1);
PacketDataStream pds(buffer+1, UDP_PACKET_SIZE-1);
Expand All @@ -998,9 +999,11 @@ void Server::processMsg(ServerUser *u, const char *data, int len) {
}
}

// Read the sequence number.
pdi >> counter;

// Skip to the end of the voice data.
if ((type >> 5) != MessageHandler::UDPVoiceOpus) {
unsigned int counter;
do {
counter = pdi.next8();
pdi.skip(counter & 0x7f);
Expand Down