From d5ca888bc434dd1f5d26649b6ecc087a23d2846b Mon Sep 17 00:00:00 2001 From: yakovlevdmv Date: Thu, 5 Apr 2018 06:15:00 +0300 Subject: [PATCH] Added Analytics datatypes. Changing namespaces prefix at struct tags --- Analytics/types.go | 101 ++++++++++++ Device.go | 100 ++++++++---- Device/types.go | 334 ++++++++++++++++++------------------- Event/types.go | 29 ++-- Imaging/types.go | 50 +++--- Media/types.go | 344 +++++++++++++++++++-------------------- PTZ/types.go | 154 +++++++++--------- networking/networking.go | 18 +- 8 files changed, 638 insertions(+), 492 deletions(-) create mode 100644 Analytics/types.go diff --git a/Analytics/types.go b/Analytics/types.go new file mode 100644 index 0000000..f564479 --- /dev/null +++ b/Analytics/types.go @@ -0,0 +1,101 @@ +package Analytics + +import ( + "github.com/yakovlevdmv/goonvif/xsd/onvif" + "github.com/yakovlevdmv/goonvif/xsd" +) + +type GetSupportedRules struct { + XMLName string `xml:"tan:GetSupportedRules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` +} + + +type CreateRules struct { + XMLName string `xml:"tan:CreateRules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + Rule onvif.Config `xml:"tan:Rule"` + +} + + +type DeleteRules struct { + XMLName string `xml:"tan:DeleteRules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + RuleName xsd.String `xml:"tan:RuleName"` + +} + + +type GetRules struct { + XMLName string `xml:"tan:GetRules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + +} + + +type GetRuleOptions struct { + XMLName string `xml:"tan:GetRuleOptions"` + RuleType xsd.QName `xml:"tan:RuleType"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + +} + + +type ModifyRules struct { + XMLName string `xml:"tan:ModifyRules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + Rule onvif.Config `xml:"tan:Rule"` + +} + + +type GetServiceCapabilities struct { + XMLName string `xml:"tan:GetServiceCapabilities"` +} + + +type GetSupportedAnalyticsModules struct { + XMLName string `xml:"tan:GetSupportedAnalyticsModules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + +} + + +type GetAnalyticsModuleOptions struct { + XMLName string `xml:"tan:GetAnalyticsModuleOptions"` + Type xsd.QName `xml:"tan:Type"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + +} + + +type CreateAnalyticsModules struct { + XMLName string `xml:"tev:CreateAnalyticsModules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + AnalyticsModule onvif.Config `xml:"tan:AnalyticsModule"` + +} + + +type DeleteAnalyticsModules struct { + XMLName string `xml:"tan:DeleteAnalyticsModules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + AnalyticsModuleName xsd.String `xml:"tan:AnalyticsModuleName"` + +} + + +type GetAnalyticsModules struct { + XMLName string `xml:"tan:GetAnalyticsModules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + +} + + +type ModifyAnalyticsModules struct { + XMLName string `xml:"tan:ModifyAnalyticsModules"` + ConfigurationToken onvif.ReferenceToken `xml:"tan:ConfigurationToken"` + AnalyticsModule onvif.Config `xml:"tan:AnalyticsModule"` + +} diff --git a/Device.go b/Device.go index 51b15ce..118bb27 100644 --- a/Device.go +++ b/Device.go @@ -1,14 +1,17 @@ package goonvif import ( - "net" "encoding/xml" "log" "fmt" "github.com/beevik/etree" - "github.com/yakovlevdmv/goonvif/networking" "github.com/yakovlevdmv/gosoap" "strconv" + "github.com/yakovlevdmv/WS-Discovery" + "github.com/yakovlevdmv/goonvif/Networking" + "reflect" + "strings" + "github.com/yakovlevdmv/goonvif/Device" ) var xlmns = map[string]string { @@ -16,8 +19,9 @@ var xlmns = map[string]string { "tds":"http://www.onvif.org/ver10/device/wsdl", "trt":"http://www.onvif.org/ver10/media/wsdl", "tev":"http://www.onvif.org/ver10/events/wsdl", - "tpz":"http://www.onvif.org/ver20/ptz/wsdl", + "tptz":"http://www.onvif.org/ver20/ptz/wsdl", "timg":"http://www.onvif.org/ver20/imaging/wsdl", + "tan":"http://www.onvif.org/ver20/analytics/wsdl", "xmime":"http://www.w3.org/2005/05/xmlmime", "wsnt":"http://docs.oasis-open.org/wsn/b-2", "xop":"http://www.w3.org/2004/08/xop/include", @@ -67,23 +71,60 @@ type deviceInfo struct { //It contains methods, which helps to communicate with ONVIF device type device struct { - xaddr net.IP + xaddr string login string password string - token [64]uint8 - endpoints map[string]string info deviceInfo } -func getAvailableDevicesAtEthernet(interfaceName string) { +func GetAvailableDevicesAtSpecificEthernetInterface(interfaceName string) { + /* + Call an WS-Discovery Probe Message to Discover NVT type Devices + */ + devices := WS_Discovery.SendProbe(interfaceName, nil, []string{"dn:"+NVT.String()}, map[string]string{"dn":"http://www.onvif.org/ver10/network/wsdl"}) + for _, j := range devices { + fmt.Println(j) + } +} +func (dev *device) getSupportedServices() { + resp, err := dev.CallMethod(Device.GetCapabilities{}) + if err != nil { + log.Println(err.Error()) + return + } else { + doc := etree.NewDocument() + if err := doc.ReadFromString(resp); err != nil { + log.Println(err.Error()) + return + } + services := doc.FindElements("./Envelope/Body/GetCapabilitiesResponse/Capabilities/*/XAddr") + for _, j := range services{ + fmt.Println(j.Text()) + fmt.Println(j.Parent().Tag) + dev.addEndpoint(j.Parent().Tag, j.Text()) + } + } } //NewDevice function construct a ONVIF Device entity -func NewDevice() *device { +func NewDevice(xaddr string) *device { + dev := new(device) + dev.xaddr = xaddr + dev.endpoints = make(map[string]string) + dev.addEndpoint("Device", "http://"+xaddr+"/onvif/device_service") + dev.getSupportedServices() + return dev +} + +func (dev *device)addEndpoint(Key, Value string) { + dev.endpoints[Key]=Value +} + +func newDeviceEntity() *device { return &device{} } @@ -99,7 +140,7 @@ func (dev *device) Authenticate(username, password string) { func buildMethodSOAP(msg string) (gosoap.SoapMessage, error) { doc := etree.NewDocument() if err := doc.ReadFromString(msg); err != nil { - log.Println("Got error") + //log.Println("Got error") return "", err } element := doc.Root() @@ -116,7 +157,19 @@ func buildMethodSOAP(msg string) (gosoap.SoapMessage, error) { //CallMethod functions call an method, defined struct. //You should use Authenticate method to call authorized requests. -func (dev device) CallMethod(endpoint string, method interface{}) (string, error) { +func (dev device) CallMethod(method interface{}) (string, error) { + pkgPath := strings.Split(reflect.TypeOf(method).PkgPath(),"/") + pkg := pkgPath[len(pkgPath)-1] + + var endpoint string + switch pkg { + case "Device": endpoint = dev.endpoints["Device"] + case "Event": endpoint = dev.endpoints["Event"] + case "Imaging": endpoint = dev.endpoints["Imaging"] + case "Media": endpoint = dev.endpoints["Media"] + case "PTZ": endpoint = dev.endpoints["PTZ"] + } + //TODO: Get endpoint automatically if dev.login != "" && dev.password != "" { return dev.CallAuthorizedMethod(endpoint, method) @@ -133,31 +186,25 @@ func (dev device) CallNonAuthorizedMethod(endpoint string, method interface{}) ( */ output, err := xml.MarshalIndent(method, " ", " ") if err != nil { - log.Printf("error: %v\n", err.Error()) + //log.Printf("error: %v\n", err.Error()) return "", err } - if err != nil { - fmt.Println(err) - } - /* Build an SOAP request with */ soap, err := buildMethodSOAP(string(output)) if err != nil { - log.Printf("error: %v\n", err) + //log.Printf("error: %v\n", err) return "", err } soap.AddRootNamespaces(xlmns) - fmt.Println(soap.String()) - /* Sending request and returns the response */ - return networking.SendSoap(endpoint, soap.String()), nil + return networking.SendSoap(endpoint, soap.String()) } //CallMethod functions call an method, defined struct with authentication data @@ -167,21 +214,17 @@ func (dev device) CallAuthorizedMethod(endpoint string, method interface{}) (str */ output, err := xml.MarshalIndent(method, " ", " ") if err != nil { - log.Printf("error: %v\n", err.Error()) + //log.Printf("error: %v\n", err.Error()) return "", err } - if err != nil { - fmt.Println(err) - } - - /* Build an SOAP request with */ soap, err := buildMethodSOAP(string(output)) if err != nil { - log.Fatal(err) + //log.Printf("error: %v\n", err.Error()) + return "", err } /* @@ -199,7 +242,7 @@ func (dev device) CallAuthorizedMethod(endpoint string, method interface{}) (str soapReq, err := xml.MarshalIndent(auth, "", " ") if err != nil { - log.Printf("error: %v\n", err.Error()) + //log.Printf("error: %v\n", err.Error()) return "", err } @@ -208,9 +251,8 @@ func (dev device) CallAuthorizedMethod(endpoint string, method interface{}) (str */ soap.AddStringHeaderContent(string(soapReq)) - fmt.Println(soap.String()) /* Sending request and returns the response */ - return networking.SendSoap(endpoint, soap.String()), nil + return networking.SendSoap(endpoint, soap.String()) } diff --git a/Device/types.go b/Device/types.go index f5d778c..3c19d1e 100644 --- a/Device/types.go +++ b/Device/types.go @@ -83,28 +83,28 @@ type MiscCapabilities struct { type StorageConfiguration struct { onvif.DeviceEntity - Data StorageConfigurationData `xml:"wsdl:Data"` + Data StorageConfigurationData `xml:"tds:Data"` } type StorageConfigurationData struct { Type xsd.String `xml:"type,attr"` - LocalPath xsd.AnyURI `xml:"wsdl:LocalPath"` - StorageUri xsd.AnyURI `xml:"wsdl:StorageUri"` - User UserCredential `xml:"wsdl:User"` - Extension xsd.AnyURI `xml:"wsdl:Extension"` + LocalPath xsd.AnyURI `xml:"tds:LocalPath"` + StorageUri xsd.AnyURI `xml:"tds:StorageUri"` + User UserCredential `xml:"tds:User"` + Extension xsd.AnyURI `xml:"tds:Extension"` } type UserCredential struct { - UserName xsd.String `xml:"wsdl:UserName"` - Password xsd.String `xml:"wsdl:Password"` - Extension xsd.AnyType `xml:"wsdl:Extension"` + UserName xsd.String `xml:"tds:UserName"` + Password xsd.String `xml:"tds:Password"` + Extension xsd.AnyType `xml:"tds:Extension"` } //Device main types type GetServices struct { - XMLName string `xml:"wsdl:GetServices"` - IncludeCapability xsd.Boolean `xml:"wsdl:IncludeCapability"` + XMLName string `xml:"tds:GetServices"` + IncludeCapability xsd.Boolean `xml:"tds:IncludeCapability"` } @@ -116,7 +116,7 @@ type GetServicesResponse struct { type GetServiceCapabilities struct { - XMLName string `xml:"wsdl:GetServiceCapabilities"` + XMLName string `xml:"tds:GetServiceCapabilities"` } @@ -127,7 +127,7 @@ type GetServiceCapabilitiesResponse struct { } type GetDeviceInformation struct { - XMLName string `xml:"wsdl:GetDeviceInformation"` + XMLName string `xml:"tds:GetDeviceInformation"` } @@ -142,11 +142,11 @@ type GetDeviceInformationResponse struct { type SetSystemDateAndTime struct { - XMLName string `xml:"wsdl:SetSystemDateAndTime"` - DateTimeType onvif.SetDateTimeType `xml:"wsdl:DateTimeType"` - DaylightSavings xsd.Boolean `xml:"wsdl:DaylightSavings"` - TimeZone onvif.TimeZone `xml:"wsdl:TimeZone"` - UTCDateTime onvif.DateTime `xml:"wsdl:UTCDateTime"` + XMLName string `xml:"tds:SetSystemDateAndTime"` + DateTimeType onvif.SetDateTimeType `xml:"tds:DateTimeType"` + DaylightSavings xsd.Boolean `xml:"tds:DaylightSavings"` + TimeZone onvif.TimeZone `xml:"tds:TimeZone"` + UTCDateTime onvif.DateTime `xml:"tds:UTCDateTime"` } @@ -156,7 +156,7 @@ type SetSystemDateAndTimeResponse struct { type GetSystemDateAndTime struct { - XMLName string `xml:"wsdl:GetSystemDateAndTime"` + XMLName string `xml:"tds:GetSystemDateAndTime"` } @@ -168,8 +168,8 @@ type GetSystemDateAndTimeResponse struct { type SetSystemFactoryDefault struct { - XMLName string `xml:"wsdl:SetSystemFactoryDefault"` - FactoryDefault onvif.FactoryDefaultType `xml:"wsdl:FactoryDefault"` + XMLName string `xml:"tds:SetSystemFactoryDefault"` + FactoryDefault onvif.FactoryDefaultType `xml:"tds:FactoryDefault"` } @@ -180,8 +180,8 @@ type SetSystemFactoryDefaultResponse struct { type UpgradeSystemFirmware struct { - XMLName string `xml:"wsdl:UpgradeSystemFirmware"` - Firmware onvif.AttachmentData `xml:"wsdl:Firmware"` + XMLName string `xml:"tds:UpgradeSystemFirmware"` + Firmware onvif.AttachmentData `xml:"tds:Firmware"` } @@ -193,7 +193,7 @@ type UpgradeSystemFirmwareResponse struct { type SystemReboot struct { - XMLName string `xml:"wsdl:SystemReboot"` + XMLName string `xml:"tds:SystemReboot"` } @@ -205,8 +205,8 @@ type SystemRebootResponse struct { //TODO: one or more repetitions type RestoreSystem struct { - XMLName string `xml:"wsdl:RestoreSystem"` - BackupFiles onvif.BackupFile `xml:"wsdl:BackupFiles"` + XMLName string `xml:"tds:RestoreSystem"` + BackupFiles onvif.BackupFile `xml:"tds:BackupFiles"` } @@ -217,7 +217,7 @@ type RestoreSystemResponse struct { type GetSystemBackup struct { - XMLName string `xml:"wsdl:GetSystemBackup"` + XMLName string `xml:"tds:GetSystemBackup"` } @@ -229,8 +229,8 @@ type GetSystemBackupResponse struct { type GetSystemLog struct { - XMLName string `xml:"wsdl:GetSystemLog"` - LogType onvif.SystemLogType `xml:"wsdl:LogType"` + XMLName string `xml:"tds:GetSystemLog"` + LogType onvif.SystemLogType `xml:"tds:LogType"` } @@ -242,7 +242,7 @@ type GetSystemLogResponse struct { type GetSystemSupportInformation struct { - XMLName string `xml:"wsdl:GetSystemSupportInformation"` + XMLName string `xml:"tds:GetSystemSupportInformation"` } @@ -254,7 +254,7 @@ type GetSystemSupportInformationResponse struct { type GetScopes struct { - XMLName string `xml:"wsdl:GetScopes"` + XMLName string `xml:"tds:GetScopes"` } @@ -266,8 +266,8 @@ type GetScopesResponse struct { //TODO: one or more scopes type SetScopes struct { - XMLName string `xml:"wsdl:SetScopes"` - Scopes xsd.AnyURI `xml:"wsdl:Scopes"` + XMLName string `xml:"tds:SetScopes"` + Scopes xsd.AnyURI `xml:"tds:Scopes"` } @@ -278,8 +278,8 @@ type SetScopesResponse struct { //TODO: list of scopes type AddScopes struct { - XMLName string `xml:"wsdl:AddScopes"` - ScopeItem xsd.AnyURI`xml:"wsdl:ScopeItem"` + XMLName string `xml:"tds:AddScopes"` + ScopeItem xsd.AnyURI`xml:"tds:ScopeItem"` } @@ -290,7 +290,7 @@ type AddScopesResponse struct { //TODO: One or more repetitions type RemoveScopes struct { - XMLName string `xml:"wsdl:RemoveScopes"` + XMLName string `xml:"tds:RemoveScopes"` ScopeItem xsd.AnyURI `xml:"onvif:ScopeItem"` } @@ -303,7 +303,7 @@ type RemoveScopesResponse struct { type GetDiscoveryMode struct { - XMLName string `xml:"wsdl:GetDiscoveryMode"` + XMLName string `xml:"tds:GetDiscoveryMode"` } @@ -315,8 +315,8 @@ type GetDiscoveryModeResponse struct { type SetDiscoveryMode struct { - XMLName string `xml:"wsdl:SetDiscoveryMode"` - DiscoveryMode onvif.DiscoveryMode `xml:"wsdl:DiscoveryMode"` + XMLName string `xml:"tds:SetDiscoveryMode"` + DiscoveryMode onvif.DiscoveryMode `xml:"tds:DiscoveryMode"` } @@ -327,7 +327,7 @@ type SetDiscoveryModeResponse struct { type GetRemoteDiscoveryMode struct { - XMLName string `xml:"wsdl:GetRemoteDiscoveryMode"` + XMLName string `xml:"tds:GetRemoteDiscoveryMode"` } @@ -339,8 +339,8 @@ type GetRemoteDiscoveryModeResponse struct { type SetRemoteDiscoveryMode struct { - XMLName string `xml:"wsdl:SetRemoteDiscoveryMode"` - RemoteDiscoveryMode onvif.DiscoveryMode `xml:"wsdl:RemoteDiscoveryMode"` + XMLName string `xml:"tds:SetRemoteDiscoveryMode"` + RemoteDiscoveryMode onvif.DiscoveryMode `xml:"tds:RemoteDiscoveryMode"` } @@ -351,7 +351,7 @@ type SetRemoteDiscoveryModeResponse struct { type GetDPAddresses struct { - XMLName string `xml:"wsdl:GetDPAddresses"` + XMLName string `xml:"tds:GetDPAddresses"` } @@ -363,8 +363,8 @@ type GetDPAddressesResponse struct { type SetDPAddresses struct { - XMLName string `xml:"wsdl:SetDPAddresses"` - DPAddress onvif.NetworkHost `xml:"wsdl:DPAddress"` + XMLName string `xml:"tds:SetDPAddresses"` + DPAddress onvif.NetworkHost `xml:"tds:DPAddress"` } @@ -375,7 +375,7 @@ type SetDPAddressesResponse struct { type GetEndpointReference struct { - XMLName string `xml:"wsdl:GetEndpointReference"` + XMLName string `xml:"tds:GetEndpointReference"` } @@ -387,7 +387,7 @@ type GetEndpointReferenceResponse struct { type GetRemoteUser struct { - XMLName string `xml:"wsdl:GetRemoteUser"` + XMLName string `xml:"tds:GetRemoteUser"` } @@ -399,8 +399,8 @@ type GetRemoteUserResponse struct { type SetRemoteUser struct { - XMLName string `xml:"wsdl:SetRemoteUser"` - RemoteUser onvif.RemoteUser `xml:"wsdl:RemoteUser"` + XMLName string `xml:"tds:SetRemoteUser"` + RemoteUser onvif.RemoteUser `xml:"tds:RemoteUser"` } @@ -411,7 +411,7 @@ type SetRemoteUserResponse struct { type GetUsers struct { - XMLName string `xml:"wsdl:GetUsers"` + XMLName string `xml:"tds:GetUsers"` } @@ -423,8 +423,8 @@ type GetUsersResponse struct { //TODO: List of users type CreateUsers struct { - XMLName string `xml:"wsdl:CreateUsers"` - User onvif.User `xml:"wsdl:User,omitempty"` + XMLName string `xml:"tds:CreateUsers"` + User onvif.User `xml:"tds:User,omitempty"` } @@ -435,8 +435,8 @@ type CreateUsersResponse struct { //TODO: one or more Username type DeleteUsers struct { - XMLName xsd.String `xml:"wsdl:DeleteUsers"` - Username xsd.String `xml:"wsdl:Username"` + XMLName xsd.String `xml:"tds:DeleteUsers"` + Username xsd.String `xml:"tds:Username"` } @@ -447,8 +447,8 @@ type DeleteUsersResponse struct { type SetUser struct { - XMLName string `xml:"wsdl:SetUser"` - User onvif.User `xml:"wsdl:User"` + XMLName string `xml:"tds:SetUser"` + User onvif.User `xml:"tds:User"` } @@ -459,7 +459,7 @@ type SetUserResponse struct { type GetWsdlUrl struct { - XMLName string `xml:"wsdl:GetWsdlUrl"` + XMLName string `xml:"tds:GetWsdlUrl"` } @@ -471,8 +471,8 @@ type GetWsdlUrlResponse struct { type GetCapabilities struct { - XMLName string `xml:"wsdl:GetCapabilities"` - Category onvif.CapabilityCategory `xml:"wsdl:Category"` + XMLName string `xml:"tds:GetCapabilities"` + Category onvif.CapabilityCategory `xml:"tds:Category"` } @@ -484,7 +484,7 @@ type GetCapabilitiesResponse struct { type GetHostname struct { - XMLName string `xml:"wsdl:GetHostname"` + XMLName string `xml:"tds:GetHostname"` } @@ -495,8 +495,8 @@ type GetHostnameResponse struct { type SetHostname struct { - XMLName string `xml:"wsdl:SetHostname"` - Name xsd.Token `xml:"wsdl:Name"` + XMLName string `xml:"tds:SetHostname"` + Name xsd.Token `xml:"tds:Name"` } @@ -507,8 +507,8 @@ type SetHostnameResponse struct { type SetHostnameFromDHCP struct { - XMLName string `xml:"wsdl:SetHostnameFromDHCP"` - FromDHCP xsd.Boolean `xml:"wsdl:FromDHCP"` + XMLName string `xml:"tds:SetHostnameFromDHCP"` + FromDHCP xsd.Boolean `xml:"tds:FromDHCP"` } @@ -520,7 +520,7 @@ type SetHostnameFromDHCPResponse struct { type GetDNS struct { - XMLName string `xml:"wsdl:GetDNS"` + XMLName string `xml:"tds:GetDNS"` } @@ -532,10 +532,10 @@ type GetDNSResponse struct { type SetDNS struct { - XMLName string `xml:"wsdl:SetDNS"` - FromDHCP xsd.Boolean `xml:"wsdl:FromDHCP"` - SearchDomain xsd.Token `xml:"wsdl:SearchDomain"` - DNSManual onvif.IPAddress `xml:"wsdl:DNSManual"` + XMLName string `xml:"tds:SetDNS"` + FromDHCP xsd.Boolean `xml:"tds:FromDHCP"` + SearchDomain xsd.Token `xml:"tds:SearchDomain"` + DNSManual onvif.IPAddress `xml:"tds:DNSManual"` } @@ -546,7 +546,7 @@ type SetDNSResponse struct { type GetNTP struct { - XMLName string `xml:"wsdl:GetNTP"` + XMLName string `xml:"tds:GetNTP"` } @@ -558,9 +558,9 @@ type GetNTPResponse struct { type SetNTP struct { - XMLName string `xml:"wsdl:SetNTP"` - FromDHCP xsd.Boolean `xml:"wsdl:FromDHCP"` - NTPManual onvif.NetworkHost `xml:"wsdl:NTPManual"` + XMLName string `xml:"tds:SetNTP"` + FromDHCP xsd.Boolean `xml:"tds:FromDHCP"` + NTPManual onvif.NetworkHost `xml:"tds:NTPManual"` } @@ -571,7 +571,7 @@ type SetNTPResponse struct { type GetDynamicDNS struct { - XMLName string `xml:"wsdl:GetDynamicDNS"` + XMLName string `xml:"tds:GetDynamicDNS"` } @@ -583,10 +583,10 @@ type GetDynamicDNSResponse struct { type SetDynamicDNS struct { - XMLName string `xml:"wsdl:SetDynamicDNS"` - Type onvif.DynamicDNSType `xml:"wsdl:Type"` - Name onvif.DNSName `xml:"wsdl:Name"` - TTL xsd.Duration `xml:"wsdl:TTL"` + XMLName string `xml:"tds:SetDynamicDNS"` + Type onvif.DynamicDNSType `xml:"tds:Type"` + Name onvif.DNSName `xml:"tds:Name"` + TTL xsd.Duration `xml:"tds:TTL"` } @@ -597,7 +597,7 @@ type SetDynamicDNSResponse struct { type GetNetworkInterfaces struct { - XMLName string `xml:"wsdl:GetNetworkInterfaces"` + XMLName string `xml:"tds:GetNetworkInterfaces"` } @@ -609,9 +609,9 @@ type GetNetworkInterfacesResponse struct { type SetNetworkInterfaces struct { - XMLName string `xml:"wsdl:SetNetworkInterfaces"` - InterfaceToken onvif.ReferenceToken `xml:"wsdl:InterfaceToken"` - NetworkInterface onvif.NetworkInterfaceSetConfiguration `xml:"wsdl:NetworkInterface"` + XMLName string `xml:"tds:SetNetworkInterfaces"` + InterfaceToken onvif.ReferenceToken `xml:"tds:InterfaceToken"` + NetworkInterface onvif.NetworkInterfaceSetConfiguration `xml:"tds:NetworkInterface"` } @@ -623,7 +623,7 @@ type SetNetworkInterfacesResponse struct { type GetNetworkProtocols struct { - XMLName string `xml:"wsdl:GetNetworkProtocols"` + XMLName string `xml:"tds:GetNetworkProtocols"` } @@ -635,8 +635,8 @@ type GetNetworkProtocolsResponse struct { type SetNetworkProtocols struct { - XMLName string `xml:"wsdl:SetNetworkProtocols"` - NetworkProtocols onvif.NetworkProtocol `xml:"wsdl:NetworkProtocols"` + XMLName string `xml:"tds:SetNetworkProtocols"` + NetworkProtocols onvif.NetworkProtocol `xml:"tds:NetworkProtocols"` } @@ -647,7 +647,7 @@ type SetNetworkProtocolsResponse struct { type GetNetworkDefaultGateway struct { - XMLName string `xml:"wsdl:GetNetworkDefaultGateway"` + XMLName string `xml:"tds:GetNetworkDefaultGateway"` } @@ -659,9 +659,9 @@ type GetNetworkDefaultGatewayResponse struct { type SetNetworkDefaultGateway struct { - XMLName string `xml:"wsdl:SetNetworkDefaultGateway"` - IPv4Address onvif.IPv4Address `xml:"wsdl:IPv4Address"` - IPv6Address onvif.IPv6Address `xml:"wsdl:IPv6Address"` + XMLName string `xml:"tds:SetNetworkDefaultGateway"` + IPv4Address onvif.IPv4Address `xml:"tds:IPv4Address"` + IPv6Address onvif.IPv6Address `xml:"tds:IPv6Address"` } @@ -672,7 +672,7 @@ type SetNetworkDefaultGatewayResponse struct { type GetZeroConfiguration struct { - XMLName string `xml:"wsdl:GetZeroConfiguration"` + XMLName string `xml:"tds:GetZeroConfiguration"` } @@ -684,9 +684,9 @@ type GetZeroConfigurationResponse struct { type SetZeroConfiguration struct { - XMLName string `xml:"wsdl:SetZeroConfiguration"` - InterfaceToken onvif.ReferenceToken `xml:"wsdl:InterfaceToken"` - Enabled xsd.Boolean `xml:"wsdl:Enabled"` + XMLName string `xml:"tds:SetZeroConfiguration"` + InterfaceToken onvif.ReferenceToken `xml:"tds:InterfaceToken"` + Enabled xsd.Boolean `xml:"tds:Enabled"` } @@ -697,7 +697,7 @@ type SetZeroConfigurationResponse struct { type GetIPAddressFilter struct { - XMLName string `xml:"wsdl:GetIPAddressFilter"` + XMLName string `xml:"tds:GetIPAddressFilter"` } @@ -709,8 +709,8 @@ type GetIPAddressFilterResponse struct { type SetIPAddressFilter struct { - XMLName string `xml:"wsdl:SetIPAddressFilter"` - IPAddressFilter onvif.IPAddressFilter `xml:"wsdl:IPAddressFilter"` + XMLName string `xml:"tds:SetIPAddressFilter"` + IPAddressFilter onvif.IPAddressFilter `xml:"tds:IPAddressFilter"` } @@ -725,8 +725,8 @@ type SetIPAddressFilterResponse struct { //the device shall support adding of IP filtering addresses through //the AddIPAddressFilter command. type AddIPAddressFilter struct { - XMLName string `xml:"wsdl:AddIPAddressFilter"` - IPAddressFilter onvif.IPAddressFilter `xml:"wsdl:IPAddressFilter"` + XMLName string `xml:"tds:AddIPAddressFilter"` + IPAddressFilter onvif.IPAddressFilter `xml:"tds:IPAddressFilter"` } @@ -737,7 +737,7 @@ type AddIPAddressFilterResponse struct { type RemoveIPAddressFilter struct { - XMLName string `xml:"wsdl:RemoveIPAddressFilter"` + XMLName string `xml:"tds:RemoveIPAddressFilter"` IPAddressFilter onvif.IPAddressFilter `xml:"onvif:IPAddressFilter"` } @@ -749,7 +749,7 @@ type RemoveIPAddressFilterResponse struct { type GetAccessPolicy struct { - XMLName string `xml:"wsdl:GetAccessPolicy"` + XMLName string `xml:"tds:GetAccessPolicy"` } @@ -760,8 +760,8 @@ type GetAccessPolicyResponse struct { type SetAccessPolicy struct { - XMLName string `xml:"wsdl:SetAccessPolicy"` - PolicyFile onvif.BinaryData `xml:"wsdl:PolicyFile"` + XMLName string `xml:"tds:SetAccessPolicy"` + PolicyFile onvif.BinaryData `xml:"tds:PolicyFile"` } @@ -772,11 +772,11 @@ type SetAccessPolicyResponse struct { type CreateCertificate struct { - XMLName string `xml:"wsdl:CreateCertificate"` - CertificateID xsd.Token `xml:"wsdl:CertificateID,omitempty"` - Subject string `xml:"wsdl:Subject,omitempty"` - ValidNotBefore xsd.DateTime `xml:"wsdl:ValidNotBefore,omitempty"` - ValidNotAfter xsd.DateTime `xml:"wsdl:ValidNotAfter,omitempty"` + XMLName string `xml:"tds:CreateCertificate"` + CertificateID xsd.Token `xml:"tds:CertificateID,omitempty"` + Subject string `xml:"tds:Subject,omitempty"` + ValidNotBefore xsd.DateTime `xml:"tds:ValidNotBefore,omitempty"` + ValidNotAfter xsd.DateTime `xml:"tds:ValidNotAfter,omitempty"` } @@ -788,7 +788,7 @@ type CreateCertificateResponse struct { type GetCertificates struct { - XMLName string `xml:"wsdl:GetCertificates"` + XMLName string `xml:"tds:GetCertificates"` } @@ -799,7 +799,7 @@ type GetCertificatesResponse struct { type GetCertificatesStatus struct { - XMLName string `xml:"wsdl:GetCertificatesStatus"` + XMLName string `xml:"tds:GetCertificatesStatus"` } @@ -811,8 +811,8 @@ type GetCertificatesStatusResponse struct { type SetCertificatesStatus struct { - XMLName string `xml:"wsdl:SetCertificatesStatus"` - CertificateStatus onvif.CertificateStatus `xml:"wsdl:CertificateStatus"` + XMLName string `xml:"tds:SetCertificatesStatus"` + CertificateStatus onvif.CertificateStatus `xml:"tds:CertificateStatus"` } @@ -823,8 +823,8 @@ type SetCertificatesStatusResponse struct { //TODO: List of CertificateID type DeleteCertificates struct { - XMLName string `xml:"wsdl:DeleteCertificates"` - CertificateID xsd.Token `xml:"wsdl:CertificateID"` + XMLName string `xml:"tds:DeleteCertificates"` + CertificateID xsd.Token `xml:"tds:CertificateID"` } @@ -835,10 +835,10 @@ type DeleteCertificatesResponse struct { //TODO: Откуда onvif:data = cid:21312413412 type GetPkcs10Request struct { - XMLName string `xml:"wsdl:GetPkcs10Request"` - CertificateID xsd.Token `xml:"wsdl:CertificateID"` - Subject xsd.String `xml:"wsdl:Subject"` - Attributes onvif.BinaryData `xml:"wsdl:Attributes"` + XMLName string `xml:"tds:GetPkcs10Request"` + CertificateID xsd.Token `xml:"tds:CertificateID"` + Subject xsd.String `xml:"tds:Subject"` + Attributes onvif.BinaryData `xml:"tds:Attributes"` } @@ -850,8 +850,8 @@ type GetPkcs10RequestResponse struct { //TODO: one or more NTVCertificate type LoadCertificates struct { - XMLName string `xml:"wsdl:LoadCertificates"` - NVTCertificate onvif.Certificate `xml:"wsdl:NVTCertificate"` + XMLName string `xml:"tds:LoadCertificates"` + NVTCertificate onvif.Certificate `xml:"tds:NVTCertificate"` } @@ -862,7 +862,7 @@ type LoadCertificatesResponse struct { type GetClientCertificateMode struct { - XMLName string `xml:"wsdl:GetClientCertificateMode"` + XMLName string `xml:"tds:GetClientCertificateMode"` } @@ -874,8 +874,8 @@ type GetClientCertificateModeResponse struct { type SetClientCertificateMode struct { - XMLName string `xml:"wsdl:SetClientCertificateMode"` - Enabled xsd.Boolean `xml:"wsdl:Enabled"` + XMLName string `xml:"tds:SetClientCertificateMode"` + Enabled xsd.Boolean `xml:"tds:Enabled"` } @@ -886,7 +886,7 @@ type SetClientCertificateModeResponse struct { type GetRelayOutputs struct { - XMLName string `xml:"wsdl:GetRelayOutputs"` + XMLName string `xml:"tds:GetRelayOutputs"` } @@ -898,9 +898,9 @@ type GetRelayOutputsResponse struct { type SetRelayOutputSettings struct { - XMLName string `xml:"wsdl:SetRelayOutputSettings"` - RelayOutputToken onvif.ReferenceToken `xml:"wsdl:RelayOutputToken"` - Properties onvif.RelayOutputSettings `xml:"wsdl:Properties"` + XMLName string `xml:"tds:SetRelayOutputSettings"` + RelayOutputToken onvif.ReferenceToken `xml:"tds:RelayOutputToken"` + Properties onvif.RelayOutputSettings `xml:"tds:Properties"` } @@ -911,9 +911,9 @@ type SetRelayOutputSettingsResponse struct { type SetRelayOutputState struct { - XMLName string `xml:"wsdl:SetRelayOutputState"` - RelayOutputToken onvif.ReferenceToken `xml:"wsdl:RelayOutputToken"` - LogicalState onvif.RelayLogicalState `xml:"wsdl:LogicalState"` + XMLName string `xml:"tds:SetRelayOutputState"` + RelayOutputToken onvif.ReferenceToken `xml:"tds:RelayOutputToken"` + LogicalState onvif.RelayLogicalState `xml:"tds:LogicalState"` } @@ -924,8 +924,8 @@ type SetRelayOutputStateResponse struct { type SendAuxiliaryCommand struct { - XMLName string `xml:"wsdl:SendAuxiliaryCommand"` - AuxiliaryCommand onvif.AuxiliaryData `xml:"wsdl:AuxiliaryCommand"` + XMLName string `xml:"tds:SendAuxiliaryCommand"` + AuxiliaryCommand onvif.AuxiliaryData `xml:"tds:AuxiliaryCommand"` } @@ -937,7 +937,7 @@ type SendAuxiliaryCommandResponse struct { type GetCACertificates struct { - XMLName string `xml:"wsdl:GetCACertificates"` + XMLName string `xml:"tds:GetCACertificates"` } @@ -948,8 +948,8 @@ type GetCACertificatesResponse struct { //TODO: one or more CertificateWithPrivateKey type LoadCertificateWithPrivateKey struct { - XMLName string `xml:"wsdl:LoadCertificateWithPrivateKey"` - CertificateWithPrivateKey onvif.CertificateWithPrivateKey `xml:"wsdl:CertificateWithPrivateKey"` + XMLName string `xml:"tds:LoadCertificateWithPrivateKey"` + CertificateWithPrivateKey onvif.CertificateWithPrivateKey `xml:"tds:CertificateWithPrivateKey"` } @@ -960,8 +960,8 @@ type LoadCertificateWithPrivateKeyResponse struct { type GetCertificateInformation struct { - XMLName string `xml:"wsdl:GetCertificateInformation"` - CertificateID xsd.Token `xml:"wsdl:CertificateID"` + XMLName string `xml:"tds:GetCertificateInformation"` + CertificateID xsd.Token `xml:"tds:CertificateID"` } @@ -973,8 +973,8 @@ type GetCertificateInformationResponse struct { type LoadCACertificates struct { - XMLName string `xml:"wsdl:LoadCACertificates"` - CACertificate onvif.Certificate `xml:"wsdl:CACertificate"` + XMLName string `xml:"tds:LoadCACertificates"` + CACertificate onvif.Certificate `xml:"tds:CACertificate"` } @@ -985,8 +985,8 @@ type LoadCACertificatesResponse struct { type CreateDot1XConfiguration struct { - XMLName string `xml:"wsdl:CreateDot1XConfiguration"` - Dot1XConfiguration onvif.Dot1XConfiguration `xml:"wsdl:Dot1XConfiguration"` + XMLName string `xml:"tds:CreateDot1XConfiguration"` + Dot1XConfiguration onvif.Dot1XConfiguration `xml:"tds:Dot1XConfiguration"` } @@ -997,8 +997,8 @@ type CreateDot1XConfigurationResponse struct { type SetDot1XConfiguration struct { - XMLName string `xml:"wsdl:SetDot1XConfiguration"` - Dot1XConfiguration onvif.Dot1XConfiguration `xml:"wsdl:Dot1XConfiguration"` + XMLName string `xml:"tds:SetDot1XConfiguration"` + Dot1XConfiguration onvif.Dot1XConfiguration `xml:"tds:Dot1XConfiguration"` } @@ -1009,8 +1009,8 @@ type SetDot1XConfigurationResponse struct { type GetDot1XConfiguration struct { - XMLName string `xml:"wsdl:GetDot1XConfiguration"` - Dot1XConfigurationToken onvif.ReferenceToken `xml:"wsdl:Dot1XConfigurationToken"` + XMLName string `xml:"tds:GetDot1XConfiguration"` + Dot1XConfigurationToken onvif.ReferenceToken `xml:"tds:Dot1XConfigurationToken"` } @@ -1022,7 +1022,7 @@ type GetDot1XConfigurationResponse struct { type GetDot1XConfigurations struct { - XMLName string `xml:"wsdl:GetDot1XConfigurations"` + XMLName string `xml:"tds:GetDot1XConfigurations"` } @@ -1034,8 +1034,8 @@ type GetDot1XConfigurationsResponse struct { //TODO: Zero or more Dot1XConfigurationToken type DeleteDot1XConfiguration struct { - XMLName string `xml:"wsdl:DeleteDot1XConfiguration"` - Dot1XConfigurationToken onvif.ReferenceToken `xml:"wsdl:Dot1XConfigurationToken"` + XMLName string `xml:"tds:DeleteDot1XConfiguration"` + Dot1XConfigurationToken onvif.ReferenceToken `xml:"tds:Dot1XConfigurationToken"` } @@ -1046,7 +1046,7 @@ type DeleteDot1XConfigurationResponse struct { type GetDot11Capabilities struct { - XMLName string `xml:"wsdl:GetDot11Capabilities"` + XMLName string `xml:"tds:GetDot11Capabilities"` } @@ -1058,8 +1058,8 @@ type GetDot11CapabilitiesResponse struct { type GetDot11Status struct { - XMLName string `xml:"wsdl:GetDot11Status"` - InterfaceToken onvif.ReferenceToken `xml:"wsdl:InterfaceToken"` + XMLName string `xml:"tds:GetDot11Status"` + InterfaceToken onvif.ReferenceToken `xml:"tds:InterfaceToken"` } @@ -1071,8 +1071,8 @@ type GetDot11StatusResponse struct { type ScanAvailableDot11Networks struct { - XMLName string `xml:"wsdl:ScanAvailableDot11Networks"` - InterfaceToken onvif.ReferenceToken `xml:"wsdl:InterfaceToken"` + XMLName string `xml:"tds:ScanAvailableDot11Networks"` + InterfaceToken onvif.ReferenceToken `xml:"tds:InterfaceToken"` } @@ -1084,7 +1084,7 @@ type ScanAvailableDot11NetworksResponse struct { type GetSystemUris struct { - XMLName string `xml:"wsdl:GetSystemUris"` + XMLName string `xml:"tds:GetSystemUris"` } @@ -1098,7 +1098,7 @@ type GetSystemUrisResponse struct { type StartFirmwareUpgrade struct { - XMLName string `xml:"wsdl:StartFirmwareUpgrade"` + XMLName string `xml:"tds:StartFirmwareUpgrade"` } @@ -1112,7 +1112,7 @@ type StartFirmwareUpgradeResponse struct { type StartSystemRestore struct { - XMLName string `xml:"wsdl:StartSystemRestore"` + XMLName string `xml:"tds:StartSystemRestore"` } @@ -1125,7 +1125,7 @@ type StartSystemRestoreResponse struct { type GetStorageConfigurations struct { - XMLName string `xml:"wsdl:GetStorageConfigurations"` + XMLName string `xml:"tds:GetStorageConfigurations"` } @@ -1137,7 +1137,7 @@ type GetStorageConfigurationsResponse struct { type CreateStorageConfiguration struct { - XMLName string `xml:"wsdl:CreateStorageConfiguration"` + XMLName string `xml:"tds:CreateStorageConfiguration"` StorageConfiguration StorageConfigurationData } @@ -1150,8 +1150,8 @@ type CreateStorageConfigurationResponse struct { type GetStorageConfiguration struct { - XMLName string `xml:"wsdl:GetStorageConfiguration"` - Token onvif.ReferenceToken `xml:"wsdl:Token"` + XMLName string `xml:"tds:GetStorageConfiguration"` + Token onvif.ReferenceToken `xml:"tds:Token"` } @@ -1163,8 +1163,8 @@ type GetStorageConfigurationResponse struct { type SetStorageConfiguration struct { - XMLName string `xml:"wsdl:SetStorageConfiguration"` - StorageConfiguration StorageConfiguration `xml:"wsdl:StorageConfiguration"` + XMLName string `xml:"tds:SetStorageConfiguration"` + StorageConfiguration StorageConfiguration `xml:"tds:StorageConfiguration"` } @@ -1175,8 +1175,8 @@ type SetStorageConfigurationResponse struct { type DeleteStorageConfiguration struct { - XMLName string `xml:"wsdl:DeleteStorageConfiguration"` - Token onvif.ReferenceToken `xml:"wsdl:Token"` + XMLName string `xml:"tds:DeleteStorageConfiguration"` + Token onvif.ReferenceToken `xml:"tds:Token"` } @@ -1187,7 +1187,7 @@ type DeleteStorageConfigurationResponse struct { type GetGeoLocation struct { - XMLName string `xml:"wsdl:GetGeoLocation"` + XMLName string `xml:"tds:GetGeoLocation"` } @@ -1199,8 +1199,8 @@ type GetGeoLocationResponse struct { //TODO: one or more Location type SetGeoLocation struct { - XMLName string `xml:"wsdl:SetGeoLocation"` - Location onvif.LocationEntity `xml:"wsdl:Location"` + XMLName string `xml:"tds:SetGeoLocation"` + Location onvif.LocationEntity `xml:"tds:Location"` } @@ -1211,8 +1211,8 @@ type SetGeoLocationResponse struct { type DeleteGeoLocation struct { - XMLName string `xml:"wsdl:DeleteGeoLocation"` - Location onvif.LocationEntity `xml:"wsdl:Location"` + XMLName string `xml:"tds:DeleteGeoLocation"` + Location onvif.LocationEntity `xml:"tds:Location"` } diff --git a/Event/types.go b/Event/types.go index d669d50..b97f4f8 100644 --- a/Event/types.go +++ b/Event/types.go @@ -4,9 +4,7 @@ import ( "github.com/yakovlevdmv/goonvif/xsd" ) -type FilterType struct { //wsnt http://docs.oasis-open.org/wsn/b-2.xsd - Any string -} +type FilterType xsd.String // type AbsoluteOrRelativeTimeType struct { //wsnt http://docs.oasis-open.org/wsn/b-2.xsd @@ -92,7 +90,7 @@ type TopicExpressionType struct { //wsnt http://docs.oasis-open.org/wsn/b-2.xsd //Event main types type GetServiceCapabilities struct { - + XMLName string `xml:"tev:GetServiceCapabilities"` } @@ -101,11 +99,12 @@ type GetServiceCapabilitiesResponse struct { } - +//BUG(r) Bad AbsoluteOrRelativeTimeType type type CreatePullPointSubscription struct { - Filter FilterType - InitialTerminationTime AbsoluteOrRelativeTimeType - SubscriptionPolicy SubscriptionPolicy + XMLName string `xml:"tev:CreatePullPointSubscription"` + Filter FilterType `xml:"tev:Filter"` + InitialTerminationTime AbsoluteOrRelativeTimeType `xml:"tev:InitialTerminationTime"` + SubscriptionPolicy SubscriptionPolicy `xml:"tev:SubscriptionPolicy"` } @@ -167,7 +166,7 @@ type SubscribeCreationFailedFault struct { type GetEventProperties struct { - + XMLName string `xml:"tev:GetEventProperties"` } @@ -185,8 +184,9 @@ type GetEventPropertiesResponse struct { //Port type PullPointSubscription type PullMessages struct { - Timeout xsd.Duration - MessageLimit xsd.Int + XMLName string `xml:"tev:PullMessages"` + Timeout xsd.Duration `xml:"tev:Timeout"` + MessageLimit xsd.Int `xml:"tev:MessageLimit"` } type PullMessagesResponse struct { @@ -201,8 +201,9 @@ type PullMessagesFaultResponse struct { } type Seek struct { - UtcTime xsd.DateTime - Reverse xsd.Boolean + XMLName string `xml:"tev:Seek"` + UtcTime xsd.DateTime `xml:"tev:UtcTime"` + Reverse xsd.Boolean `xml:"tev:Reverse"` } type SeekResponse struct { @@ -210,7 +211,7 @@ type SeekResponse struct { } type SetSynchronizationPoint struct { - + XMLName string `xml:"tev:SetSynchronizationPoint"` } type SetSynchronizationPointResponse struct { diff --git a/Imaging/types.go b/Imaging/types.go index a9674d9..cf3d18f 100644 --- a/Imaging/types.go +++ b/Imaging/types.go @@ -6,79 +6,79 @@ import ( ) type GetServiceCapabilities struct { - XMLName string `xml:"wsdl:GetServiceCapabilities"` + XMLName string `xml:"timg:GetServiceCapabilities"` } type GetImagingSettings struct { - XMLName string `xml:"wsdl:GetImagingSettings"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"timg:GetImagingSettings"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` } type SetImagingSettings struct { - XMLName string `xml:"wsdl:SetImagingSettings"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` - ImagingSettings onvif.ImagingSettings20 `xml:"wsdl:ImagingSettings"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"timg:SetImagingSettings"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` + ImagingSettings onvif.ImagingSettings20 `xml:"timg:ImagingSettings"` + ForcePersistence xsd.Boolean `xml:"timg:ForcePersistence"` } type GetOptions struct { - XMLName string `xml:"wsdl:GetOptions"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"timg:GetOptions"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` } type Move struct { - XMLName string `xml:"wsdl:Move"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` - Focus onvif.FocusMove `xml:"wsdl:Focus"` + XMLName string `xml:"timg:Move"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` + Focus onvif.FocusMove `xml:"timg:Focus"` } type GetMoveOptions struct { - XMLName string `xml:"wsdl:GetMoveOptions"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"timg:GetMoveOptions"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` } type Stop struct { - XMLName string `xml:"wsdl:Stop"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"timg:Stop"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` } type GetStatus struct { - XMLName string `xml:"wsdl:GetStatus"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"timg:GetStatus"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` } type GetPresets struct { - XMLName string `xml:"wsdl:GetPresets"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"timg:GetPresets"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` } type GetCurrentPreset struct { - XMLName string `xml:"wsdl:GetCurrentPreset"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"timg:GetCurrentPreset"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` } type SetCurrentPreset struct { - XMLName string `xml:"wsdl:SetCurrentPreset"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` - PresetToken onvif.ReferenceToken `xml:"wsdl:PresetToken"` + XMLName string `xml:"timg:SetCurrentPreset"` + VideoSourceToken onvif.ReferenceToken `xml:"timg:VideoSourceToken"` + PresetToken onvif.ReferenceToken `xml:"timg:PresetToken"` } \ No newline at end of file diff --git a/Media/types.go b/Media/types.go index 317f8d8..bd7a2a9 100644 --- a/Media/types.go +++ b/Media/types.go @@ -31,7 +31,7 @@ type StreamingCapabilities struct { //Media main types type GetServiceCapabilities struct { - XMLName string `xml:"wsdl:GetServiceCapabilities"` + XMLName string `xml:"trt:GetServiceCapabilities"` } @@ -42,7 +42,7 @@ type GetServiceCapabilitiesResponse struct { type GetVideoSources struct { - XMLName string `xml:"wsdl:GetVideoSources"` + XMLName string `xml:"trt:GetVideoSources"` } @@ -53,7 +53,7 @@ type GetVideoSourcesResponse struct { type GetAudioSources struct { - XMLName string `xml:"wsdl:GetAudioSources"` + XMLName string `xml:"trt:GetAudioSources"` } @@ -65,7 +65,7 @@ type GetAudioSourcesResponse struct { type GetAudioOutputs struct { - XMLName string `xml:"wsdl:GetAudioOutputs"` + XMLName string `xml:"trt:GetAudioOutputs"` } @@ -76,9 +76,9 @@ type GetAudioOutputsResponse struct { type CreateProfile struct { - XMLName string `xml:"wsdl:CreateProfile"` - Name onvif.Name `xml:"wsdl:Name"` - Token onvif.ReferenceToken `xml:"wsdl:Token"` + XMLName string `xml:"trt:CreateProfile"` + Name onvif.Name `xml:"trt:Name"` + Token onvif.ReferenceToken `xml:"trt:Token"` } @@ -90,8 +90,8 @@ type CreateProfileResponse struct { type GetProfile struct { - XMLName string `xml:"wsdl:GetProfile"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetProfile"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -103,7 +103,7 @@ type GetProfileResponse struct { type GetProfiles struct { - XMLName string `xml:"wsdl:GetProfiles"` + XMLName string `xml:"trt:GetProfiles"` } @@ -114,9 +114,9 @@ type GetProfilesResponse struct { type AddVideoEncoderConfiguration struct { - XMLName string `xml:"wsdl:AddVideoEncoderConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddVideoEncoderConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -126,8 +126,8 @@ type AddVideoEncoderConfigurationResponse struct { type RemoveVideoEncoderConfiguration struct { - XMLName string `xml:"wsdl:RemoveVideoEncoderConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveVideoEncoderConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -137,9 +137,9 @@ type RemoveVideoEncoderConfigurationResponse struct { type AddVideoSourceConfiguration struct { - XMLName string `xml:"wsdl:AddVideoSourceConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddVideoSourceConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -150,8 +150,8 @@ type AddVideoSourceConfigurationResponse struct { type RemoveVideoSourceConfiguration struct { - XMLName string `xml:"wsdl:RemoveVideoSourceConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveVideoSourceConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -161,9 +161,9 @@ type RemoveVideoSourceConfigurationResponse struct { type AddAudioEncoderConfiguration struct { - XMLName string `xml:"wsdl:AddAudioEncoderConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddAudioEncoderConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -174,8 +174,8 @@ type AddAudioEncoderConfigurationResponse struct { type RemoveAudioEncoderConfiguration struct { - XMLName string `xml:"wsdl:RemoveAudioEncoderConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveAudioEncoderConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -185,9 +185,9 @@ type RemoveAudioEncoderConfigurationResponse struct { type AddAudioSourceConfiguration struct { - XMLName string `xml:"wsdl:AddAudioSourceConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddAudioSourceConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -198,8 +198,8 @@ type AddAudioSourceConfigurationResponse struct { type RemoveAudioSourceConfiguration struct { - XMLName string `xml:"wsdl:RemoveAudioSourceConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveAudioSourceConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -209,9 +209,9 @@ type RemoveAudioSourceConfigurationResponse struct { type AddPTZConfiguration struct { - XMLName string `xml:"wsdl:AddPTZConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddPTZConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -221,8 +221,8 @@ type AddPTZConfigurationResponse struct { type RemovePTZConfiguration struct { - XMLName string `xml:"wsdl:RemovePTZConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemovePTZConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -232,9 +232,9 @@ type RemovePTZConfigurationResponse struct { type AddVideoAnalyticsConfiguration struct { - XMLName string `xml:"wsdl:AddVideoAnalyticsConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddVideoAnalyticsConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -245,8 +245,8 @@ type AddVideoAnalyticsConfigurationResponse struct { type RemoveVideoAnalyticsConfiguration struct { - XMLName string `xml:"wsdl:RemoveVideoAnalyticsConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveVideoAnalyticsConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -256,9 +256,9 @@ type RemoveVideoAnalyticsConfigurationResponse struct { type AddMetadataConfiguration struct { - XMLName string `xml:"wsdl:AddMetadataConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddMetadataConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -268,8 +268,8 @@ type AddMetadataConfigurationResponse struct { type RemoveMetadataConfiguration struct { - XMLName string `xml:"wsdl:RemoveMetadataConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveMetadataConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -279,9 +279,9 @@ type RemoveMetadataConfigurationResponse struct { type AddAudioOutputConfiguration struct { - XMLName string `xml:"wsdl:AddAudioOutputConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddAudioOutputConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -292,8 +292,8 @@ type AddAudioOutputConfigurationResponse struct { type RemoveAudioOutputConfiguration struct { - XMLName string `xml:"wsdl:RemoveAudioOutputConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveAudioOutputConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -303,9 +303,9 @@ type RemoveAudioOutputConfigurationResponse struct { type AddAudioDecoderConfiguration struct { - XMLName string `xml:"wsdl:AddAudioDecoderConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:AddAudioDecoderConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -316,8 +316,8 @@ type AddAudioDecoderConfigurationResponse struct { type RemoveAudioDecoderConfiguration struct { - XMLName string `xml:"wsdl:RemoveAudioDecoderConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:RemoveAudioDecoderConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -327,8 +327,8 @@ type RemoveAudioDecoderConfigurationResponse struct { type DeleteProfile struct { - XMLName string `xml:"wsdl:DeleteProfile"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:DeleteProfile"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -339,7 +339,7 @@ type DeleteProfileResponse struct { type GetVideoSourceConfigurations struct { - XMLName string `xml:"wsdl:GetVideoSourceConfigurations"` + XMLName string `xml:"trt:GetVideoSourceConfigurations"` } @@ -350,7 +350,7 @@ type GetVideoSourceConfigurationsResponse struct { type GetVideoEncoderConfigurations struct { - XMLName string `xml:"wsdl:GetVideoEncoderConfigurations"` + XMLName string `xml:"trt:GetVideoEncoderConfigurations"` } @@ -361,7 +361,7 @@ type GetVideoEncoderConfigurationsResponse struct { type GetAudioSourceConfigurations struct { - XMLName string `xml:"wsdl:GetAudioSourceConfigurations"` + XMLName string `xml:"trt:GetAudioSourceConfigurations"` } @@ -372,7 +372,7 @@ type GetAudioSourceConfigurationsResponse struct { type GetAudioEncoderConfigurations struct { - XMLName string `xml:"wsdl:GetAudioEncoderConfigurations"` + XMLName string `xml:"trt:GetAudioEncoderConfigurations"` } @@ -384,7 +384,7 @@ type GetAudioEncoderConfigurationsResponse struct { type GetVideoAnalyticsConfigurations struct { - XMLName string `xml:"wsdl:GetVideoAnalyticsConfigurations"` + XMLName string `xml:"trt:GetVideoAnalyticsConfigurations"` } @@ -395,7 +395,7 @@ type GetVideoAnalyticsConfigurationsResponse struct { type GetMetadataConfigurations struct { - XMLName string `xml:"wsdl:GetMetadataConfigurations"` + XMLName string `xml:"trt:GetMetadataConfigurations"` } @@ -406,7 +406,7 @@ type GetMetadataConfigurationsResponse struct { type GetAudioOutputConfigurations struct { - XMLName string `xml:"wsdl:GetAudioOutputConfigurations"` + XMLName string `xml:"trt:GetAudioOutputConfigurations"` } @@ -417,7 +417,7 @@ type GetAudioOutputConfigurationsResponse struct { type GetAudioDecoderConfigurations struct { - XMLName string `xml:"wsdl:GetAudioDecoderConfigurations"` + XMLName string `xml:"trt:GetAudioDecoderConfigurations"` } @@ -428,8 +428,8 @@ type GetAudioDecoderConfigurationsResponse struct { type GetVideoSourceConfiguration struct { - XMLName string `xml:"wsdl:GetVideoSourceConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetVideoSourceConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -440,8 +440,8 @@ type GetVideoSourceConfigurationResponse struct { type GetVideoEncoderConfiguration struct { - XMLName string `xml:"wsdl:GetVideoEncoderConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetVideoEncoderConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -453,8 +453,8 @@ type GetVideoEncoderConfigurationResponse struct { type GetAudioSourceConfiguration struct { - XMLName string `xml:"wsdl:GetAudioSourceConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioSourceConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -466,8 +466,8 @@ type GetAudioSourceConfigurationResponse struct { type GetAudioEncoderConfiguration struct { - XMLName string `xml:"wsdl:GetAudioEncoderConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioEncoderConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -479,8 +479,8 @@ type GetAudioEncoderConfigurationResponse struct { type GetVideoAnalyticsConfiguration struct { - XMLName string `xml:"wsdl:GetVideoAnalyticsConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetVideoAnalyticsConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -492,8 +492,8 @@ type GetVideoAnalyticsConfigurationResponse struct { type GetMetadataConfiguration struct { - XMLName string `xml:"wsdl:GetMetadataConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetMetadataConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -505,8 +505,8 @@ type GetMetadataConfigurationResponse struct { type GetAudioOutputConfiguration struct { - XMLName string `xml:"wsdl:GetAudioOutputConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioOutputConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -518,8 +518,8 @@ type GetAudioOutputConfigurationResponse struct { type GetAudioDecoderConfiguration struct { - XMLName string `xml:"wsdl:GetAudioDecoderConfiguration"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioDecoderConfiguration"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -531,8 +531,8 @@ type GetAudioDecoderConfigurationResponse struct { type GetCompatibleVideoEncoderConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleVideoEncoderConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleVideoEncoderConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -543,8 +543,8 @@ type GetCompatibleVideoEncoderConfigurationsResponse struct { type GetCompatibleVideoSourceConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleVideoSourceConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleVideoSourceConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -555,8 +555,8 @@ type GetCompatibleVideoSourceConfigurationsResponse struct { type GetCompatibleAudioEncoderConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleAudioEncoderConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleAudioEncoderConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -568,8 +568,8 @@ type GetCompatibleAudioEncoderConfigurationsResponse struct { type GetCompatibleAudioSourceConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleAudioSourceConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleAudioSourceConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -581,8 +581,8 @@ type GetCompatibleAudioSourceConfigurationsResponse struct { type GetCompatibleVideoAnalyticsConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleVideoAnalyticsConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleVideoAnalyticsConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -594,8 +594,8 @@ type GetCompatibleVideoAnalyticsConfigurationsResponse struct { type GetCompatibleMetadataConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleMetadataConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleMetadataConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -607,8 +607,8 @@ type GetCompatibleMetadataConfigurationsResponse struct { type GetCompatibleAudioOutputConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleAudioOutputConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleAudioOutputConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -620,8 +620,8 @@ type GetCompatibleAudioOutputConfigurationsResponse struct { type GetCompatibleAudioDecoderConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleAudioDecoderConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetCompatibleAudioDecoderConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -633,9 +633,9 @@ type GetCompatibleAudioDecoderConfigurationsResponse struct { type SetVideoSourceConfiguration struct { - XMLName string `xml:"wsdl:SetVideoSourceConfiguration"` - Configuration onvif.VideoSourceConfiguration `xml:"wsdl:Configuration"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:SetVideoSourceConfiguration"` + Configuration onvif.VideoSourceConfiguration `xml:"trt:Configuration"` + ForcePersistence xsd.Boolean `xml:"trt:ForcePersistence"` } @@ -646,9 +646,9 @@ type SetVideoSourceConfigurationResponse struct { type SetVideoEncoderConfiguration struct { - XMLName string `xml:"wsdl:SetVideoEncoderConfiguration"` - Configuration onvif.VideoEncoderConfiguration `xml:"wsdl:Configuration"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:SetVideoEncoderConfiguration"` + Configuration onvif.VideoEncoderConfiguration `xml:"trt:Configuration"` + ForcePersistence xsd.Boolean `xml:"trt:ForcePersistence"` } @@ -659,9 +659,9 @@ type SetVideoEncoderConfigurationResponse struct { type SetAudioSourceConfiguration struct { - XMLName string `xml:"wsdl:SetAudioSourceConfiguration"` - Configuration onvif.AudioSourceConfiguration `xml:"wsdl:Configuration"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:SetAudioSourceConfiguration"` + Configuration onvif.AudioSourceConfiguration `xml:"trt:Configuration"` + ForcePersistence xsd.Boolean `xml:"trt:ForcePersistence"` } @@ -672,9 +672,9 @@ type SetAudioSourceConfigurationResponse struct { type SetAudioEncoderConfiguration struct { - XMLName string `xml:"wsdl:SetAudioEncoderConfiguration"` - Configuration onvif.AudioEncoderConfiguration `xml:"wsdl:Configuration"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:SetAudioEncoderConfiguration"` + Configuration onvif.AudioEncoderConfiguration `xml:"trt:Configuration"` + ForcePersistence xsd.Boolean `xml:"trt:ForcePersistence"` } @@ -685,9 +685,9 @@ type SetAudioEncoderConfigurationResponse struct { type SetVideoAnalyticsConfiguration struct { - XMLName string `xml:"wsdl:SetVideoAnalyticsConfiguration"` - Configuration onvif.VideoAnalyticsConfiguration `xml:"wsdl:Configuration"` - ForcePersistence bool `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:SetVideoAnalyticsConfiguration"` + Configuration onvif.VideoAnalyticsConfiguration `xml:"trt:Configuration"` + ForcePersistence bool `xml:"trt:ForcePersistence"` } @@ -698,9 +698,9 @@ type SetVideoAnalyticsConfigurationResponse struct { type SetMetadataConfiguration struct { - XMLName string `xml:"wsdl:GetDeviceInformation"` - Configuration onvif.MetadataConfiguration `xml:"wsdl:Configuration"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:GetDeviceInformation"` + Configuration onvif.MetadataConfiguration `xml:"trt:Configuration"` + ForcePersistence xsd.Boolean `xml:"trt:ForcePersistence"` } @@ -711,9 +711,9 @@ type SetMetadataConfigurationResponse struct { type SetAudioOutputConfiguration struct { - XMLName string `xml:"wsdl:SetAudioOutputConfiguration"` - Configuration onvif.AudioOutputConfiguration `xml:"wsdl:Configuration"` - ForcePersistence bool `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:SetAudioOutputConfiguration"` + Configuration onvif.AudioOutputConfiguration `xml:"trt:Configuration"` + ForcePersistence bool `xml:"trt:ForcePersistence"` } @@ -724,9 +724,9 @@ type SetAudioOutputConfigurationResponse struct { type SetAudioDecoderConfiguration struct { - XMLName string `xml:"wsdl:SetAudioDecoderConfiguration"` - Configuration onvif.AudioDecoderConfiguration `xml:"wsdl:Configuration"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"trt:SetAudioDecoderConfiguration"` + Configuration onvif.AudioDecoderConfiguration `xml:"trt:Configuration"` + ForcePersistence xsd.Boolean `xml:"trt:ForcePersistence"` } @@ -737,9 +737,9 @@ type SetAudioDecoderConfigurationResponse struct { type GetVideoSourceConfigurationOptions struct { - XMLName string `xml:"wsdl:GetVideoSourceConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetVideoSourceConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -751,9 +751,9 @@ type GetVideoSourceConfigurationOptionsResponse struct { type GetVideoEncoderConfigurationOptions struct { - XMLName string `xml:"wsdl:GetVideoEncoderConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetVideoEncoderConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -765,9 +765,9 @@ type GetVideoEncoderConfigurationOptionsResponse struct { type GetAudioSourceConfigurationOptions struct { - XMLName string `xml:"wsdl:GetAudioSourceConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioSourceConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -779,9 +779,9 @@ type GetAudioSourceConfigurationOptionsResponse struct { type GetAudioEncoderConfigurationOptions struct { - XMLName string `xml:"wsdl:GetAudioEncoderConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioEncoderConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -792,9 +792,9 @@ type GetAudioEncoderConfigurationOptionsResponse struct { type GetMetadataConfigurationOptions struct { - XMLName string `xml:"wsdl:GetMetadataConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetMetadataConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -806,9 +806,9 @@ type GetMetadataConfigurationOptionsResponse struct { type GetAudioOutputConfigurationOptions struct { - XMLName string `xml:"wsdl:GetAudioOutputConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioOutputConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -820,9 +820,9 @@ type GetAudioOutputConfigurationOptionsResponse struct { type GetAudioDecoderConfigurationOptions struct { - XMLName string `xml:"wsdl:GetAudioDecoderConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetAudioDecoderConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -834,8 +834,8 @@ type GetAudioDecoderConfigurationOptionsResponse struct { type GetGuaranteedNumberOfVideoEncoderInstances struct { - XMLName string `xml:"wsdl:GetGuaranteedNumberOfVideoEncoderInstances"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetGuaranteedNumberOfVideoEncoderInstances"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -850,9 +850,9 @@ type GetGuaranteedNumberOfVideoEncoderInstancesResponse struct { type GetStreamUri struct { - XMLName string `xml:"wsdl:GetStreamUri"` - StreamSetup onvif.StreamSetup `xml:"wsdl:StreamSetup"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetStreamUri"` + StreamSetup onvif.StreamSetup `xml:"trt:StreamSetup"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -864,8 +864,8 @@ type GetStreamUriResponse struct { type StartMulticastStreaming struct { - XMLName string `xml:"wsdl:StartMulticastStreaming"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:StartMulticastStreaming"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -875,8 +875,8 @@ type StartMulticastStreamingResponse struct { type StopMulticastStreaming struct { - XMLName string `xml:"wsdl:StopMulticastStreaming"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:StopMulticastStreaming"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -886,8 +886,8 @@ type StopMulticastStreamingResponse struct { type SetSynchronizationPoint struct { - XMLName string `xml:"wsdl:SetSynchronizationPoint"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:SetSynchronizationPoint"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -897,8 +897,8 @@ type SetSynchronizationPointResponse struct { type GetSnapshotUri struct { - XMLName string `xml:"wsdl:GetSnapshotUri"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"trt:GetSnapshotUri"` + ProfileToken onvif.ReferenceToken `xml:"trt:ProfileToken"` } @@ -910,8 +910,8 @@ type GetSnapshotUriResponse struct { type GetVideoSourceModes struct { - XMLName string `xml:"wsdl:GetVideoSourceModes"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` + XMLName string `xml:"trt:GetVideoSourceModes"` + VideoSourceToken onvif.ReferenceToken `xml:"trt:VideoSourceToken"` } @@ -923,9 +923,9 @@ type GetVideoSourceModesResponse struct { type SetVideoSourceMode struct { - XMLName string `xml:"wsdl:SetVideoSourceMode"` - VideoSourceToken onvif.ReferenceToken `xml:"wsdl:VideoSourceToken"` - VideoSourceModeToken onvif.ReferenceToken `xml:"wsdl:VideoSourceModeToken"` + XMLName string `xml:"trt:SetVideoSourceMode"` + VideoSourceToken onvif.ReferenceToken `xml:"trt:VideoSourceToken"` + VideoSourceModeToken onvif.ReferenceToken `xml:"trt:VideoSourceModeToken"` } @@ -937,8 +937,8 @@ type SetVideoSourceModeResponse struct { type GetOSDs struct { - XMLName string `xml:"wsdl:GetOSDs"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetOSDs"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -950,8 +950,8 @@ type GetOSDsResponse struct { type GetOSD struct { - XMLName string `xml:"wsdl:GetOSD"` - OSDToken onvif.ReferenceToken `xml:"wsdl:OSDToken"` + XMLName string `xml:"trt:GetOSD"` + OSDToken onvif.ReferenceToken `xml:"trt:OSDToken"` } @@ -963,8 +963,8 @@ type GetOSDResponse struct { type GetOSDOptions struct { - XMLName string `xml:"wsdl:GetOSDOptions"` - ConfigurationToken onvif.ReferenceToken `xml:"wsdl:ConfigurationToken"` + XMLName string `xml:"trt:GetOSDOptions"` + ConfigurationToken onvif.ReferenceToken `xml:"trt:ConfigurationToken"` } @@ -976,8 +976,8 @@ type GetOSDOptionsResponse struct { type SetOSD struct { - XMLName string `xml:"wsdl:SetOSD"` - OSD onvif.OSDConfiguration `xml:"wsdl:OSD"` + XMLName string `xml:"trt:SetOSD"` + OSD onvif.OSDConfiguration `xml:"trt:OSD"` } @@ -988,8 +988,8 @@ type SetOSDResponse struct { type CreateOSD struct { - XMLName string `xml:"wsdl:CreateOSD"` - OSD onvif.OSDConfiguration `xml:"wsdl:OSD"` + XMLName string `xml:"trt:CreateOSD"` + OSD onvif.OSDConfiguration `xml:"trt:OSD"` } @@ -1001,8 +1001,8 @@ type CreateOSDResponse struct { type DeleteOSD struct { - XMLName string `xml:"wsdl:DeleteOSD"` - OSDToken onvif.ReferenceToken `xml:"wsdl:OSDToken"` + XMLName string `xml:"trt:DeleteOSD"` + OSDToken onvif.ReferenceToken `xml:"trt:OSDToken"` } diff --git a/PTZ/types.go b/PTZ/types.go index 3825d07..d281283 100644 --- a/PTZ/types.go +++ b/PTZ/types.go @@ -14,7 +14,7 @@ type Capabilities struct { //PTZ main types type GetServiceCapabilities struct { - XMLName string `xml:"wsdl:GetServiceCapabilities"` + XMLName string `xml:"tptz:GetServiceCapabilities"` } @@ -25,7 +25,7 @@ type GetServiceCapabilitiesResponse struct { type GetNodes struct { - XMLName string `xml:"wsdl:GetNodes"` + XMLName string `xml:"tptz:GetNodes"` } @@ -36,8 +36,8 @@ type GetNodesResponse struct { type GetNode struct { - XMLName string `xml:"wsdl:GetNode"` - NodeToken onvif.ReferenceToken `xml:"wsdl:NodeToken"` + XMLName string `xml:"tptz:GetNode"` + NodeToken onvif.ReferenceToken `xml:"tptz:NodeToken"` } @@ -49,8 +49,8 @@ type GetNodeResponse struct { type GetConfiguration struct { - XMLName string `xml:"wsdl:GetConfiguration"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:GetConfiguration"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } @@ -61,7 +61,7 @@ type GetConfigurationResponse struct { type GetConfigurations struct { - XMLName string `xml:"wsdl:GetConfigurations"` + XMLName string `xml:"tptz:GetConfigurations"` } @@ -72,9 +72,9 @@ type GetConfigurationsResponse struct { type SetConfiguration struct { - XMLName string `xml:"wsdl:SetConfiguration"` - PTZConfiguration onvif.PTZConfiguration `xml:"wsdl:PTZConfiguration"` - ForcePersistence xsd.Boolean `xml:"wsdl:ForcePersistence"` + XMLName string `xml:"tptz:SetConfiguration"` + PTZConfiguration onvif.PTZConfiguration `xml:"tptz:PTZConfiguration"` + ForcePersistence xsd.Boolean `xml:"tptz:ForcePersistence"` } @@ -85,8 +85,8 @@ type SetConfigurationResponse struct { type GetConfigurationOptions struct { - XMLName string `xml:"wsdl:GetConfigurationOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:GetConfigurationOptions"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } @@ -98,9 +98,9 @@ type GetConfigurationOptionsResponse struct { type SendAuxiliaryCommand struct { - XMLName string `xml:"wsdl:SendAuxiliaryCommand"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - AuxiliaryData onvif.AuxiliaryData `xml:"wsdl:AuxiliaryData"` + XMLName string `xml:"tptz:SendAuxiliaryCommand"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + AuxiliaryData onvif.AuxiliaryData `xml:"tptz:AuxiliaryData"` } @@ -112,8 +112,8 @@ type SendAuxiliaryCommandResponse struct { type GetPresets struct { - XMLName string `xml:"wsdl:GetPresets"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:GetPresets"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } @@ -124,10 +124,10 @@ type GetPresetsResponse struct { type SetPreset struct { - XMLName string `xml:"wsdl:SetPreset"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PresetName xsd.String `xml:"wsdl:PresetName"` - PresetToken onvif.ReferenceToken `xml:"wsdl:PresetToken"` + XMLName string `xml:"tptz:SetPreset"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PresetName xsd.String `xml:"tptz:PresetName"` + PresetToken onvif.ReferenceToken `xml:"tptz:PresetToken"` } @@ -138,9 +138,9 @@ type SetPresetResponse struct { type RemovePreset struct { - XMLName string `xml:"wsdl:RemovePreset"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PresetToken onvif.ReferenceToken `xml:"wsdl:PresetToken"` + XMLName string `xml:"tptz:RemovePreset"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PresetToken onvif.ReferenceToken `xml:"tptz:PresetToken"` } @@ -151,10 +151,10 @@ type RemovePresetResponse struct { type GotoPreset struct { - XMLName string `xml:"wsdl:GotoPreset"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PresetToken onvif.ReferenceToken `xml:"wsdl:PresetToken"` - Speed onvif.PTZSpeed `xml:"wsdl:Speed"` + XMLName string `xml:"tptz:GotoPreset"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PresetToken onvif.ReferenceToken `xml:"tptz:PresetToken"` + Speed onvif.PTZSpeed `xml:"tptz:Speed"` } @@ -165,9 +165,9 @@ type GotoPresetResponse struct { type GotoHomePosition struct { - XMLName string `xml:"wsdl:GotoHomePosition"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - Speed onvif.PTZSpeed `xml:"wsdl:Speed"` + XMLName string `xml:"tptz:GotoHomePosition"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + Speed onvif.PTZSpeed `xml:"tptz:Speed"` } @@ -178,8 +178,8 @@ type GotoHomePositionResponse struct { type SetHomePosition struct { - XMLName string `xml:"wsdl:SetHomePosition"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:SetHomePosition"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } @@ -189,10 +189,10 @@ type SetHomePositionResponse struct { type ContinuousMove struct { - XMLName string `xml:"wsdl:ContinuousMove"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - Velocity onvif.PTZSpeed `xml:"wsdl:Velocity"` - Timeout xsd.Duration `xml:"wsdl:Timeout"` + XMLName string `xml:"tptz:ContinuousMove"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + Velocity onvif.PTZSpeed `xml:"tptz:Velocity"` + Timeout xsd.Duration `xml:"tptz:Timeout"` } @@ -203,10 +203,10 @@ type ContinuousMoveResponse struct { type RelativeMove struct { - XMLName string `xml:"wsdl:RelativeMove"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - Translation onvif.PTZVector `xml:"wsdl:Translation"` - Speed onvif.PTZSpeed `xml:"wsdl:Speed"` + XMLName string `xml:"tptz:RelativeMove"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + Translation onvif.PTZVector `xml:"tptz:Translation"` + Speed onvif.PTZSpeed `xml:"tptz:Speed"` } @@ -217,8 +217,8 @@ type RelativeMoveResponse struct { type GetStatus struct { - XMLName string `xml:"wsdl:GetStatus"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:GetStatus"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } @@ -229,10 +229,10 @@ type GetStatusResponse struct { type AbsoluteMove struct { - XMLName string `xml:"wsdl:AbsoluteMove"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - Position onvif.PTZVector `xml:"wsdl:Position"` - Speed onvif.PTZSpeed `xml:"wsdl:Speed"` + XMLName string `xml:"tptz:AbsoluteMove"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + Position onvif.PTZVector `xml:"tptz:Position"` + Speed onvif.PTZSpeed `xml:"tptz:Speed"` } @@ -243,12 +243,12 @@ type AbsoluteMoveResponse struct { type GeoMove struct { - XMLName string `xml:"wsdl:GeoMove"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - Target onvif.GeoLocation `xml:"wsdl:Target"` - Speed onvif.PTZSpeed `xml:"wsdl:Speed"` - AreaHeight xsd.Float `xml:"wsdl:AreaHeight"` - AreaWidth xsd.Float `xml:"wsdl:AreaWidth"` + XMLName string `xml:"tptz:GeoMove"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + Target onvif.GeoLocation `xml:"tptz:Target"` + Speed onvif.PTZSpeed `xml:"tptz:Speed"` + AreaHeight xsd.Float `xml:"tptz:AreaHeight"` + AreaWidth xsd.Float `xml:"tptz:AreaWidth"` } @@ -259,10 +259,10 @@ type GeoMoveResponse struct { type Stop struct { - XMLName string `xml:"wsdl:Stop"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PanTilt xsd.Boolean `xml:"wsdl:PanTilt"` - Zoom xsd.Boolean `xml:"wsdl:Zoom"` + XMLName string `xml:"tptz:Stop"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PanTilt xsd.Boolean `xml:"tptz:PanTilt"` + Zoom xsd.Boolean `xml:"tptz:Zoom"` } @@ -273,8 +273,8 @@ type StopResponse struct { type GetPresetTours struct { - XMLName string `xml:"wsdl:GetPresetTours"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:GetPresetTours"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } @@ -285,9 +285,9 @@ type GetPresetToursResponse struct { type GetPresetTour struct { - XMLName string `xml:"wsdl:GetPresetTour"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PresetTourToken onvif.ReferenceToken `xml:"wsdl:PresetTourToken"` + XMLName string `xml:"tptz:GetPresetTour"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PresetTourToken onvif.ReferenceToken `xml:"tptz:PresetTourToken"` } @@ -299,9 +299,9 @@ type GetPresetTourResponse struct { type GetPresetTourOptions struct { - XMLName string `xml:"wsdl:GetPresetTourOptions"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PresetTourToken onvif.ReferenceToken `xml:"wsdl:PresetTourToken"` + XMLName string `xml:"tptz:GetPresetTourOptions"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PresetTourToken onvif.ReferenceToken `xml:"tptz:PresetTourToken"` } @@ -313,8 +313,8 @@ type GetPresetTourOptionsResponse struct { type CreatePresetTour struct { - XMLName string `xml:"wsdl:CreatePresetTour"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:CreatePresetTour"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } @@ -326,9 +326,9 @@ type CreatePresetTourResponse struct { type ModifyPresetTour struct { - XMLName string `xml:"wsdl:ModifyPresetTour"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PresetTour onvif.PresetTour `xml:"wsdl:PresetTour"` + XMLName string `xml:"tptz:ModifyPresetTour"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PresetTour onvif.PresetTour `xml:"tptz:PresetTour"` } @@ -339,8 +339,8 @@ type ModifyPresetTourResponse struct { type OperatePresetTour struct { - XMLName string `xml:"wsdl:OperatePresetTour"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:OperatePresetTour"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` PresetTourToken onvif.ReferenceToken `xml:"onvif:PresetTourToken"` Operation onvif.PTZPresetTourOperation `xml:"onvif:Operation"` @@ -353,9 +353,9 @@ type OperatePresetTourResponse struct { type RemovePresetTour struct { - XMLName string `xml:"wsdl:RemovePresetTour"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` - PresetTourToken onvif.ReferenceToken `xml:"wsdl:PresetTourToken"` + XMLName string `xml:"tptz:RemovePresetTour"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` + PresetTourToken onvif.ReferenceToken `xml:"tptz:PresetTourToken"` } @@ -366,8 +366,8 @@ type RemovePresetTourResponse struct { type GetCompatibleConfigurations struct { - XMLName string `xml:"wsdl:GetCompatibleConfigurations"` - ProfileToken onvif.ReferenceToken `xml:"wsdl:ProfileToken"` + XMLName string `xml:"tptz:GetCompatibleConfigurations"` + ProfileToken onvif.ReferenceToken `xml:"tptz:ProfileToken"` } diff --git a/networking/networking.go b/networking/networking.go index 8f1cc70..bd1a69d 100644 --- a/networking/networking.go +++ b/networking/networking.go @@ -4,17 +4,19 @@ import ( "net/http" "bytes" "io/ioutil" - "log" ) -func SendSoap(endpoint, message string) string { +func SendSoap(endpoint, message string) (string, error) { httpClient := new(http.Client) - resp, _ := httpClient.Post(endpoint, "application/soap+xml; charset=utf-8", bytes.NewBufferString(message)) + resp, err := httpClient.Post(endpoint, "application/soap+xml; charset=utf-8", bytes.NewBufferString(message)) + if err != nil { + return "", err + } + b, err := ioutil.ReadAll(resp.Body) + if err != nil { + return "", err + } - b, _ := ioutil.ReadAll(resp.Body) - - log.Println(string(b)) - - return string(b) + return string(b),nil }