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

IGMPv3/MLDv2 record type +1/-1 jugglery removed

Browse Source
This commit is contained in:
Srivats P. 2010-11-06 23:40:07 +05:30
parent dbc7409616
commit a465e926a5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/gmp.cpp
View File

@ -123,7 +123,7 @@ void GmpConfigForm::on_addGroupRecord_clicked()
QVariantMap grpRec; QVariantMap grpRec;
QListWidgetItem *item = new QListWidgetItem; QListWidgetItem *item = new QListWidgetItem;
grpRec["groupRecordType"] = defRec.type()-1; grpRec["groupRecordType"] = defRec.type();
grpRec["groupRecordAddress"] = _defaultGroupIp; grpRec["groupRecordAddress"] = _defaultGroupIp;
grpRec["overrideGroupRecordSourceCount"] =defRec.is_override_source_count(); grpRec["overrideGroupRecordSourceCount"] =defRec.is_override_source_count();
grpRec["groupRecordSourceCount"] = defRec.source_count(); grpRec["groupRecordSourceCount"] = defRec.source_count();
@ -615,7 +615,7 @@ QVariant GmpProtocol::fieldData(int index, FieldAttrib attrib,
QVariantMap grpRec; QVariantMap grpRec;
OstProto::Gmp::GroupRecord rec = data.group_records(i); OstProto::Gmp::GroupRecord rec = data.group_records(i);
grpRec["groupRecordType"] = rec.type()-1; grpRec["groupRecordType"] = rec.type();
// grpRec["groupRecordAddress"] = subclass responsibility // grpRec["groupRecordAddress"] = subclass responsibility
grpRec["overrideGroupRecordSourceCount"] = grpRec["overrideGroupRecordSourceCount"] =
rec.is_override_source_count(); rec.is_override_source_count();
@ -877,7 +877,7 @@ bool GmpProtocol::setFieldData(int index, const QVariant &value,
OstProto::Gmp::GroupRecord *rec = data.add_group_records(); OstProto::Gmp::GroupRecord *rec = data.add_group_records();
rec->set_type(OstProto::Gmp::GroupRecord::RecordType( rec->set_type(OstProto::Gmp::GroupRecord::RecordType(
grpRec["groupRecordType"].toInt() + 1)); grpRec["groupRecordType"].toInt()));
// NOTE: rec->group_address => subclass responsibility // NOTE: rec->group_address => subclass responsibility
rec->set_is_override_source_count( rec->set_is_override_source_count(
grpRec["overrideGroupRecordSourceCount"].toBool()); grpRec["overrideGroupRecordSourceCount"].toBool());

1
common/gmp.proto
View File

@ -70,6 +70,7 @@ message Gmp {
// //
message GroupRecord { message GroupRecord {
enum RecordType { enum RecordType {
kReserved = 0;
kIsInclude = 1; kIsInclude = 1;
kIsExclude = 2; kIsExclude = 2;
kToInclude = 3; kToInclude = 3;

5
common/gmp.ui
View File

@ -502,6 +502,11 @@
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QComboBox" name="groupRecordType" > <widget class="QComboBox" name="groupRecordType" >
<item>
<property name="text" >
<string>Reserved</string>
</property>
</item>
<item> <item>
<property name="text" > <property name="text" >
<string>Is Include</string> <string>Is Include</string>