Refactoring
Refactored Protocol.Name -> Protocol.Type; added Encapsulation field Refactored TLS parsing; added support for ALPN
This commit is contained in:
@@ -16,7 +16,7 @@ type testCase struct {
|
||||
Data []byte
|
||||
SrcPort int
|
||||
DstPort int
|
||||
WantProto string
|
||||
WantType string
|
||||
WantConfidence float64
|
||||
WantError error
|
||||
}
|
||||
@@ -52,7 +52,7 @@ func testRunner(t *testing.T, tests []*testCase) {
|
||||
} else if test.WantError != nil {
|
||||
t.Fatalf("Detect(%s, %s, %d, %d) returned protocol %q version %s, expected error %q",
|
||||
test.Direction, testBytesSample(test.Data, 8), test.SrcPort, test.DstPort,
|
||||
proto.Name, proto.Version, test.WantError)
|
||||
proto.Type, proto.Version, test.WantError)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -60,16 +60,16 @@ func testRunner(t *testing.T, tests []*testCase) {
|
||||
if proto == nil {
|
||||
t.Fatalf("Detect(%s, %s, %d, %d) returned nil, expected protocol %q",
|
||||
test.Direction, testBytesSample(test.Data, 8), test.SrcPort, test.DstPort,
|
||||
test.WantProto)
|
||||
test.WantType)
|
||||
return
|
||||
}
|
||||
|
||||
t.Logf("Detect(%s, %s, %d, %d) returned protocol %q version %s with confidence %g%%",
|
||||
t.Logf("Detect(%s, %s, %d, %d) returned protocol %s with confidence %g%%",
|
||||
test.Direction, testBytesSample(test.Data, 4), test.SrcPort, test.DstPort,
|
||||
proto.Name, proto.Version, confidence*100)
|
||||
proto, confidence*100)
|
||||
|
||||
if proto.Name != test.WantProto {
|
||||
t.Errorf("Expected protocol %q", test.WantProto)
|
||||
if proto.Type != test.WantType {
|
||||
t.Errorf("Expected protocol %q, got %q", test.WantType, proto.Type)
|
||||
}
|
||||
if !testAlmostEqual(confidence, test.WantConfidence) {
|
||||
t.Errorf("Expected confidence %g%%", test.WantConfidence*100)
|
||||
|
Reference in New Issue
Block a user