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

HostDev: Change default mac mode to resolve

Browse Source 
Note - this will cause regressions in current API scripts if fixed was
assumed as default. Fix is to explicitly specify fixed
This commit is contained in:
Srivats P 2019-02-25 21:03:28 +05:30
parent 44357178c4
commit 2b8940ac49
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/mac.proto
View File

@ -33,13 +33,13 @@ message Mac {
// Dst Mac // Dst Mac
optional uint64 dst_mac = 1; optional uint64 dst_mac = 1;
optional MacAddrMode dst_mac_mode = 2 [default = e_mm_fixed]; optional MacAddrMode dst_mac_mode = 2 [default = e_mm_resolve];
optional uint32 dst_mac_count = 3 [default = 16]; optional uint32 dst_mac_count = 3 [default = 16];
optional uint32 dst_mac_step = 4 [default = 1]; optional uint32 dst_mac_step = 4 [default = 1];
// Src Mac // Src Mac
optional uint64 src_mac = 5; optional uint64 src_mac = 5;
optional MacAddrMode src_mac_mode = 6 [default = e_mm_fixed]; optional MacAddrMode src_mac_mode = 6 [default = e_mm_resolve];
optional uint32 src_mac_count = 7 [default = 16]; optional uint32 src_mac_count = 7 [default = 16];
optional uint32 src_mac_step = 8 [default = 1]; optional uint32 src_mac_step = 8 [default = 1];
} }

34
common/mac.ui
View File

@ -15,16 +15,16 @@
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Address</string> <string>Mode</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Mode</string> <string>Address</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -50,16 +50,6 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="MacEdit" name="leDstMac">
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QComboBox" name="cmbDstMacMode"> <widget class="QComboBox" name="cmbDstMacMode">
<item> <item>
<property name="text"> <property name="text">
@ -83,6 +73,16 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="2">
<widget class="MacEdit" name="leDstMac">
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="3"> <item row="1" column="3">
<widget class="IntEdit" name="leDstMacCount"> <widget class="IntEdit" name="leDstMacCount">
<property name="enabled"> <property name="enabled">
@ -105,9 +105,6 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="MacEdit" name="leSrcMac"/>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="cmbSrcMacMode"> <widget class="QComboBox" name="cmbSrcMacMode">
<item> <item>
<property name="text"> <property name="text">
@ -131,6 +128,9 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="2">
<widget class="MacEdit" name="leSrcMac"/>
</item>
<item row="2" column="3"> <item row="2" column="3">
<widget class="IntEdit" name="leSrcMacCount"> <widget class="IntEdit" name="leSrcMacCount">
<property name="enabled"> <property name="enabled">