This commit is contained in:
crusader 2018-06-20 21:08:53 +09:00
parent 565798baae
commit b2bd7528c8
3 changed files with 15 additions and 13 deletions

2
Gopkg.lock generated
View File

@ -115,7 +115,7 @@
"service/container/discovery",
"service/probe"
]
revision = "7770cfcc68d259e679074b57f0c9091f127e7644"
revision = "292dd88aae9a1eb66fe5c1d45cbac20799cce3a0"
[[projects]]
branch = "master"

View File

@ -103,9 +103,9 @@ LOOP:
if 0 == packetCount {
s = &ocmd.Service{
Name: m.Name(),
MetaCryptoTypeKey: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
Name: m.Name(),
MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
}
break LOOP
}
@ -155,9 +155,9 @@ LOOP:
if found {
s = &ocmd.Service{
Name: m.Name(),
MetaCryptoTypeKey: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
Name: m.Name(),
MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
}
break LOOP
}
@ -213,9 +213,9 @@ LOOP:
if nil != err {
if !m.HasResponse(j) {
s = &ocmd.Service{
Name: m.Name(),
MetaCryptoTypeKey: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
Name: m.Name(),
MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
}
break
}
@ -227,9 +227,9 @@ LOOP:
if m.Match(info, j, csm.NewPacket(buf, rn)) {
if packetCount-1 == j {
s = &ocmd.Service{
Name: m.Name(),
MetaCryptoTypeKey: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
Name: m.Name(),
MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(),
}
break
}

View File

@ -7,6 +7,7 @@ import (
cuej "git.loafle.net/commons/util-go/encoding/json"
occu "git.loafle.net/overflow/commons-go/core/util"
ocmd "git.loafle.net/overflow/commons-go/model/discovery"
ocmm "git.loafle.net/overflow/commons-go/model/meta"
"git.loafle.net/overflow/container_discovery/internal/matcher"
)
@ -28,6 +29,7 @@ func scanServiceUDP(port *ocmd.Port, ds *ocmd.DiscoverService, resultChan chan i
s := &ocmd.Service{
Name: m.Name(),
Port: port,
MetaCryptoType: ocmm.ToMetaCryptoType(ocmm.MetaCryptoTypeEnumNONE),
DiscoveredDate: occu.NowPtr(),
}