This commit is contained in:
crusader 2018-09-11 16:11:02 +09:00
parent a9833d3070
commit c920ee3c3f
4 changed files with 32 additions and 27 deletions

View File

@ -6,15 +6,21 @@ import (
) )
type Host struct { type Host struct {
MetaIPType *meta.MetaIPType `json:"metaIPType,omitempty"` MetaIPType *meta.MetaIPType `json:"metaIPType,omitempty"`
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Address string `json:"address,omitempty"` Address string `json:"address,omitempty"`
Mac string `json:"mac,omitempty"` Mac string `json:"mac,omitempty"`
Meta map[string]string `json:"meta,omitempty"`
OsType string `json:"osType,omitempty"`
DeviceType string `json:"deviceType,omitempty"`
DeviceVendor string `json:"deviceVendor,omitempty"`
DeviceModel string `json:"deviceModel,omitempty"`
Meta map[string]map[string]string `json:"meta,omitempty"`
DiscoveredBy []string `json:"discoveredBy,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"`
Zone *Zone `json:"zone,omitempty"` Zone *Zone `json:"zone,omitempty"`
PortList []*Port `json:"portList,omitempty"` PortList []*Port `json:"portList,omitempty"`
DiscoveredBy string `json:"discoveredBy,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"`
} }

View File

@ -11,12 +11,12 @@ import (
type Port struct { type Port struct {
MetaPortType *meta.MetaPortType `json:"metaPortType,omitempty"` MetaPortType *meta.MetaPortType `json:"metaPortType,omitempty"`
PortNumber json.Number `json:"portNumber,omitempty"` PortNumber json.Number `json:"portNumber,omitempty"`
Meta map[string]string `json:"meta,omitempty"`
Host *Host `json:"host,omitempty"` Meta map[string]map[string]string `json:"meta,omitempty"`
ServiceList []*Service `json:"serviceList,omitempty"` DiscoveredBy []string `json:"discoveredBy,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"`
DiscoveredBy string `json:"discoveredBy,omitempty"` Host *Host `json:"host,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"` ServiceList []*Service `json:"serviceList,omitempty"`
UDPLayer gopacket.Layer `json:"-"` UDPLayer gopacket.Layer `json:"-"`
} }

View File

@ -10,11 +10,10 @@ type Service struct {
Key string `json:"key,omitempty"` Key string `json:"key,omitempty"`
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"` Description string `json:"description,omitempty"`
Meta map[string]string `json:"meta,omitempty"`
Meta map[string]map[string]string `json:"meta,omitempty"`
DiscoveredBy []string `json:"discoveredBy,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"`
Port *Port `json:"port,omitempty"` Port *Port `json:"port,omitempty"`
DiscoveredBy string `json:"discoveredBy,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"`
Metadata map[string]string `json:"metadata,omitempty"`
} }

View File

@ -8,15 +8,15 @@ import (
) )
type Zone struct { type Zone struct {
Network string `json:"network,omitempty"` Network string `json:"network,omitempty"`
Iface string `json:"iface,omitempty"` Iface string `json:"iface,omitempty"`
MetaIPType *meta.MetaIPType `json:"metaIPType,omitempty"` MetaIPType *meta.MetaIPType `json:"metaIPType,omitempty"`
Address string `json:"address,omitempty"` Address string `json:"address,omitempty"`
Mac string `json:"mac,omitempty"` Mac string `json:"mac,omitempty"`
Meta map[string]string `json:"meta,omitempty"`
DiscoveredBy string `json:"discoveredBy,omitempty"` Meta map[string]map[string]string `json:"meta,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"` DiscoveredBy []string `json:"discoveredBy,omitempty"`
DiscoveredDate *util.Timestamp `json:"discoveredDate,omitempty"`
mtx sync.RWMutex `json:"-"` mtx sync.RWMutex `json:"-"`
} }