matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix IGMPv3 group record aux data

Browse Source 
FieldValue, FieldFrameValue, FieldTextValue were all fixed. This used to
work earlier. I think somewhere across Qt versions, QByteArray() and
QString() changed such that it broke. Or more likely I was using those
incorrectly earlier but output was still correct which is no longer
true.

Anyway, it should be ok going forward (hopefully!)
This commit is contained in:
Srivats P 2020-04-03 20:39:14 +05:30
parent 487f3e653d
commit 63e648bbfe
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/gmp.cpp
View File

@ -404,8 +404,8 @@ QVariant GmpProtocol::fieldData(int index, FieldAttrib attrib,
grpRec["overrideAuxDataLength"] =
rec.is_override_aux_data_length();
grpRec["auxDataLength"] = rec.aux_data_length();
grpRec["auxData"] = QByteArray().append(
QString::fromStdString(rec.aux_data()));
grpRec["auxData"] = QByteArray(rec.aux_data().data(),
rec.aux_data().size());
grpRecords.append(grpRec);
}
@ -434,7 +434,7 @@ QVariant GmpProtocol::fieldData(int index, FieldAttrib attrib,
// group_address => subclass responsibility
// source list => subclass responsibility
rv.append(QString().fromStdString(rec.aux_data()));
rv.append(QByteArray(rec.aux_data().data(), rv[1]*4));
fv.append(rv);
}
@ -467,9 +467,9 @@ QVariant GmpProtocol::fieldData(int index, FieldAttrib attrib,
default:
str.append("UNKNOWN"); break;
}
str.append(QString("; AuxLen: %1").arg(
rec.is_override_aux_data_length() ?
rec.aux_data_length() : rec.aux_data().size()/4));
int auxLen = rec.is_override_aux_data_length() ?
rec.aux_data_length() : rec.aux_data().size()/4;
str.append(QString("; AuxLen: %1").arg(auxLen));
str.append(QString("; Source Count: %1").arg(
rec.is_override_source_count() ?
rec.source_count(): rec.sources_size()));
@ -479,8 +479,8 @@ QVariant GmpProtocol::fieldData(int index, FieldAttrib attrib,
str.append(QString("; XXX"));
str.append(QString("; AuxData: ").append(
QByteArray().append(QString().fromStdString(
rec.aux_data())).toHex()));
QByteArray(rec.aux_data().data(), auxLen*4)
.toHex()));
list.append(str);
}