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

MLD fixes

Browse Source
This commit is contained in:
Srivats P. 2010-11-07 20:05:24 +05:30
parent 1d1e6479c3
commit bea8fb736e
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/gmp.cpp
View File

@ -949,9 +949,14 @@ void GmpProtocol::loadConfigWidget()
configForm->qrv->setText(fieldData(kQrv, FieldValue).toString()); configForm->qrv->setText(fieldData(kQrv, FieldValue).toString());
configForm->qqi->setText(fieldData(kQqic, FieldValue).toString()); configForm->qqi->setText(fieldData(kQqic, FieldValue).toString());
QStringList sl = fieldData(kSources, FieldValue).toStringList();
configForm->sourceList->clear(); configForm->sourceList->clear();
configForm->sourceList->addItems( foreach(QString src, sl)
fieldData(kSources, FieldValue).toStringList()); {
QListWidgetItem *item = new QListWidgetItem(src);
item->setFlags(item->flags() | Qt::ItemIsEditable);
configForm->sourceList->addItem(item);
}
// NOTE: SourceCount should be loaded after sourceList // NOTE: SourceCount should be loaded after sourceList
configForm->overrideSourceCount->setChecked( configForm->overrideSourceCount->setChecked(

4
common/iputils.h
View File

@ -98,11 +98,11 @@ void inline ipAddress(quint64 baseIpHi, quint64 baseIpLo, int prefix,
prefixHi = baseIpHi & maskHi; prefixHi = baseIpHi & maskHi;
prefixLo = baseIpLo & maskLo; prefixLo = baseIpLo & maskLo;
if (mode == kIncrement) { if (mode == kIncrement) {
hostHi = ((baseIpHi & ~maskHi) + u) & ~maskHi; hostHi = ((baseIpHi & ~maskHi) + 0) & ~maskHi;
hostLo = ((baseIpLo & ~maskLo) + u) & ~maskLo; hostLo = ((baseIpLo & ~maskLo) + u) & ~maskLo;
} }
else if (mode == kDecrement) { else if (mode == kDecrement) {
hostHi = ((baseIpHi & ~maskHi) - u) & ~maskHi; hostHi = ((baseIpHi & ~maskHi) - 0) & ~maskHi;
hostLo = ((baseIpLo & ~maskLo) - u) & ~maskLo; hostLo = ((baseIpLo & ~maskLo) - u) & ~maskLo;
} }
else if (mode==kRandom) { else if (mode==kRandom) {

34
common/mld.cpp
View File

@ -279,9 +279,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
fv.resize(16); fv.resize(16);
for (int i = 0; i < data.sources_size(); i++) for (int i = 0; i < data.sources_size(); i++)
{ {
qToBigEndian(data.group_address().v6_hi(), qToBigEndian(data.sources(i).v6_hi(),
(uchar*)fv.data()); (uchar*)fv.data());
qToBigEndian(data.group_address().v6_hi(), qToBigEndian(data.sources(i).v6_lo(),
(uchar*)fv.data()+8); (uchar*)fv.data()+8);
list << QHostAddress((quint8*)fv.constData()).toString(); list << QHostAddress((quint8*)fv.constData()).toString();
@ -294,9 +294,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
fv.resize(16 * data.sources_size()); fv.resize(16 * data.sources_size());
for (int i = 0; i < data.sources_size(); i++) for (int i = 0; i < data.sources_size(); i++)
{ {
qToBigEndian(data.group_address().v6_hi(), qToBigEndian(data.sources(i).v6_hi(),
(uchar*)(fv.data() + i*16)); (uchar*)(fv.data() + i*16));
qToBigEndian(data.group_address().v6_lo(), qToBigEndian(data.sources(i).v6_lo(),
(uchar*)(fv.data() + i*16 + 8)); (uchar*)(fv.data() + i*16 + 8));
} }
return fv; return fv;
@ -308,9 +308,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
fv.resize(16); fv.resize(16);
for (int i = 0; i < data.sources_size(); i++) for (int i = 0; i < data.sources_size(); i++)
{ {
qToBigEndian(data.group_address().v6_hi(), qToBigEndian(data.sources(i).v6_hi(),
(uchar*)fv.data()); (uchar*)fv.data());
qToBigEndian(data.group_address().v6_hi(), qToBigEndian(data.sources(i).v6_lo(),
(uchar*)fv.data()+8); (uchar*)fv.data()+8);
list << QHostAddress((quint8*)fv.constData()).toString(); list << QHostAddress((quint8*)fv.constData()).toString();
@ -339,12 +339,12 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
QVariantMap grpRec = grpRecords.at(i).toMap(); QVariantMap grpRec = grpRecords.at(i).toMap();
OstProto::Gmp::GroupRecord rec = data.group_records(i); OstProto::Gmp::GroupRecord rec = data.group_records(i);
qToBigEndian(rec.group_address().v6_hi(), qToBigEndian(quint64(rec.group_address().v6_hi()),
(uchar*)(ip.data())); (uchar*)(ip.data()));
qToBigEndian(rec.group_address().v6_lo(), qToBigEndian(quint64(rec.group_address().v6_lo()),
(uchar*)(ip.data() + 8)); (uchar*)(ip.data() + 8));
grpRec["groupRecordAddress"] = QHostAddress(ip.constData()) grpRec["groupRecordAddress"] = QHostAddress(
.toString(); (quint8*)ip.constData()).toString();
QStringList sl; QStringList sl;
for (int j = 0; j < rec.sources_size(); j++) for (int j = 0; j < rec.sources_size(); j++)
@ -353,7 +353,8 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
(uchar*)(ip.data())); (uchar*)(ip.data()));
qToBigEndian(rec.sources(j).v6_lo(), qToBigEndian(rec.sources(j).v6_lo(),
(uchar*)(ip.data() + 8)); (uchar*)(ip.data() + 8));
sl.append(QHostAddress(ip.constData()).toString()); sl.append(QHostAddress(
(quint8*)ip.constData()).toString());
} }
grpRec["groupRecordSourceList"] = sl; grpRec["groupRecordSourceList"] = sl;
@ -377,14 +378,14 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
rv.insert(4, QByteArray(16+16*rec.sources_size(), char(0))); rv.insert(4, QByteArray(16+16*rec.sources_size(), char(0)));
qToBigEndian(rec.group_address().v6_hi(), qToBigEndian(rec.group_address().v6_hi(),
(uchar*)(rv.data()+4)); (uchar*)(rv.data()+4));
qToBigEndian(rec.group_address().v6_hi(), qToBigEndian(rec.group_address().v6_lo(),
(uchar*)(rv.data()+4+8)); (uchar*)(rv.data()+4+8));
for (int j = 0; j < rec.sources_size(); j++) for (int j = 0; j < rec.sources_size(); j++)
{ {
qToBigEndian(rec.sources(j).v6_hi(), qToBigEndian(rec.sources(j).v6_hi(),
(uchar*)(rv.data()+12+16*j)); (uchar*)(rv.data()+20+16*j));
qToBigEndian(rec.sources(j).v6_lo(), qToBigEndian(rec.sources(j).v6_lo(),
(uchar*)(rv.data()+12+16*j)); (uchar*)(rv.data()+20+16*j));
} }
fv.append(rv); fv.append(rv);
@ -410,7 +411,7 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
qToBigEndian(rec.group_address().v6_lo(), qToBigEndian(rec.group_address().v6_lo(),
(uchar*)(ip.data() + 8)); (uchar*)(ip.data() + 8));
str.append(QString("Group: %1").arg( str.append(QString("Group: %1").arg(
QHostAddress(ip.constData()).toString())); QHostAddress((quint8*)ip.constData()).toString()));
str.append("; Sources: "); str.append("; Sources: ");
QStringList sl; QStringList sl;
@ -420,7 +421,8 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
(uchar*)(ip.data())); (uchar*)(ip.data()));
qToBigEndian(rec.sources(j).v6_lo(), qToBigEndian(rec.sources(j).v6_lo(),
(uchar*)(ip.data() + 8)); (uchar*)(ip.data() + 8));
sl.append(QHostAddress(ip.constData()).toString()); sl.append(QHostAddress(
(quint8*)ip.constData()).toString());
} }
str.append(sl.join(", ")); str.append(sl.join(", "));