Skip to content

Commit 78eebd8

Browse files
wenyingdhongliangl
wenyingd
authored and
hongliangl
committed
Bump up golangci-bin version
1. Bump up golangci-bin version to v1.50.0 2. Remove invalid configurations in golangci.yml 3. Formated several files 4. Removed unused code which is for padding messages Signed-off-by: wenyingd <wenyingd@vmware.com>
1 parent 2ade3b2 commit 78eebd8

12 files changed

Lines changed: 246 additions & 246 deletions

File tree

‎.golangci.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ linters-settings:
1212
linters:
1313
disable-all: true
1414
enable: # see https://golangci-lint.run/usage/linters/
15-
- deadcode
15+
- unused
1616
- staticcheck
1717
- govet
1818
- gofmt
1919
- goimports
2020
- gosec
2121
- misspell
22-
23-
run:
24-
deadline: 5m

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test:
99
# code linting
1010
.golangci-bin:
1111
@echo "===> Installing Golangci-lint <==="
12-
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $@ v1.41.1
12+
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $@ v1.50.0
1313

1414
.PHONY: golangci
1515
golangci: .golangci-bin

‎openflow13/match.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (m *MatchField) MarshalBinary() (data []byte, err error) {
127127
if m.HasMask {
128128
fld = (m.Field << 1) | 0x1
129129
} else {
130-
fld = (m.Field << 1) | 0x0
130+
fld = m.Field << 1
131131
}
132132
data[n] = fld
133133
n += 1
@@ -477,7 +477,7 @@ func DecodeMatchField(class uint16, field uint8, length uint8, hasMask bool, dat
477477
return nil, nil
478478
}
479479

480-
// ofp_match_type 1.3
480+
// ofp_match_type 1.3
481481
const (
482482
MatchType_Standard = iota /* Deprecated. */
483483
MatchType_OXM

‎openflow13/nx_action.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,6 @@ type NXActionLearn struct {
12221222
FinIdleTimeout uint16
12231223
FinHardTimeout uint16
12241224
LearnSpecs []*NXLearnSpec
1225-
pad2 []byte
12261225
}
12271226

12281227
func (a *NXActionLearn) Len() uint16 {

‎openflow13/nxt_message.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,11 @@ func NewSetPacketInFormet(format uint32) *VendorHeader {
8080
}
8181

8282
type ControllerID struct {
83-
pad [6]byte
84-
ID uint16
83+
ID uint16
8584
}
8685

8786
func (c *ControllerID) Len() uint16 {
88-
return uint16(len(c.pad) + 2)
87+
return 8
8988
}
9089

9190
func (c *ControllerID) MarshalBinary() (data []byte, err error) {
@@ -117,11 +116,10 @@ type TLVTableMap struct {
117116
OptType uint8
118117
OptLength uint8
119118
Index uint16
120-
pad [2]byte
121119
}
122120

123121
func (t *TLVTableMap) Len() uint16 {
124-
return uint16(len(t.pad) + 6)
122+
return 8
125123
}
126124

127125
func (t *TLVTableMap) MarshalBinary() (data []byte, err error) {
@@ -154,7 +152,6 @@ func (t *TLVTableMap) UnmarshalBinary(data []byte) error {
154152

155153
type TLVTableMod struct {
156154
Command uint16
157-
pad [6]byte
158155
TlvMaps []*TLVTableMap
159156
}
160157

@@ -908,7 +905,6 @@ func (p *PacketIn2PropBufferID) UnmarshalBinary(data []byte) error {
908905
type PacketIn2PropTableID struct {
909906
*PropHeader /* Type: NXPINT_TABLE_ID */
910907
TableID uint8
911-
pad [3]uint8
912908
}
913909

914910
func (p *PacketIn2PropTableID) Len() (n uint16) {

‎openflow15/match.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func (m *MatchField) MarshalBinary() (data []byte, err error) {
130130
if m.HasMask {
131131
fld = (m.Field << 1) | 0x1
132132
} else {
133-
fld = (m.Field << 1) | 0x0
133+
fld = m.Field << 1
134134
}
135135
data[n] = fld
136136
n += 1
@@ -276,7 +276,7 @@ func (o *OxmId) MarshalBinary() (data []byte, err error) {
276276
if o.HasMask {
277277
fld = (o.Field << 1) | 0x1
278278
} else {
279-
fld = (o.Field << 1) | 0x0
279+
fld = o.Field << 1
280280
}
281281
data[n] = fld
282282
n += 1

‎openflow15/nx_action.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,6 @@ type NXActionLearn struct {
12431243
FinIdleTimeout uint16
12441244
FinHardTimeout uint16
12451245
LearnSpecs []*NXLearnSpec
1246-
pad2 []byte
12471246
}
12481247

12491248
func (a *NXActionLearn) Len() uint16 {

‎openflow15/openflow15.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ const (
827827
ACFC_EPERM
828828
)
829829

830-
// ofp_flow_monitor_failed_code
830+
// ofp_flow_monitor_failed_code
831831
const (
832832
MOFC_UNKNOWN = iota
833833
MOFC_MONITOR_EXISTS

‎openflow15/port.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ type Port struct {
1717
Length uint16
1818
Pad []byte // 2 bytes
1919
HWAddr net.HardwareAddr
20-
pad2 []byte // 2 bytes for 64bit alignment
2120
Name []byte // Size 16
2221

2322
Config uint32

‎protocol/dhcp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const (
7777
const (
7878
DHCP_FLAG_BROADCAST uint16 = 0x80
7979

80-
// FLAG_BROADCAST_MASK uint16 = (1 << FLAG_BROADCAST)
80+
// FLAG_BROADCAST_MASK uint16 = (1 << FLAG_BROADCAST)
8181
)
8282

8383
func getRandomXID() (uint32, error) {

0 commit comments

Comments
 (0)