Remove spurious spaces from between req/resp struct members in generated code.

This commit is contained in:
John Beisley 2017-11-05 13:50:25 +00:00
parent 8087be8632
commit 29fc54a4c0
4 changed files with 461 additions and 942 deletions

File diff suppressed because it is too large Load Diff

View File

@ -390,7 +390,6 @@ func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, Ne
// Request structure. // Request structure.
request := &struct { request := &struct {
NewMinAddress string NewMinAddress string
NewMaxAddress string NewMaxAddress string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -427,7 +426,6 @@ func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string,
// Response structure. // Response structure.
response := &struct { response := &struct {
NewMinAddress string NewMinAddress string
NewMaxAddress string NewMaxAddress string
}{} }{}
@ -792,8 +790,7 @@ func (client *WANCableLinkConfig1) GetCableLinkConfigInfo() (NewCableLinkConfigS
// Response structure. // Response structure.
response := &struct { response := &struct {
NewCableLinkConfigState string NewCableLinkConfigState string
NewLinkType string
NewLinkType string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -1182,13 +1179,10 @@ func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccess
// Response structure. // Response structure.
response := &struct { response := &struct {
NewWANAccessType string NewWANAccessType string
NewLayer1UpstreamMaxBitRate string
NewLayer1UpstreamMaxBitRate string
NewLayer1DownstreamMaxBitRate string NewLayer1DownstreamMaxBitRate string
NewPhysicalLinkStatus string
NewPhysicalLinkStatus string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -1389,7 +1383,6 @@ func (client *WANCommonInterfaceConfig1) GetActiveConnection(NewActiveConnection
// Response structure. // Response structure.
response := &struct { response := &struct {
NewActiveConnDeviceContainer string NewActiveConnDeviceContainer string
NewActiveConnectionServiceID string NewActiveConnectionServiceID string
}{} }{}
@ -1509,8 +1502,7 @@ func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkSt
// Response structure. // Response structure.
response := &struct { response := &struct {
NewLinkType string NewLinkType string
NewLinkStatus string NewLinkStatus string
}{} }{}
@ -1928,8 +1920,7 @@ func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType strin
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionType string NewConnectionType string
NewPossibleConnectionTypes string NewPossibleConnectionTypes string
}{} }{}
@ -2106,11 +2097,9 @@ func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, New
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionStatus string NewConnectionStatus string
NewLastConnectionError string NewLastConnectionError string
NewUptime string
NewUptime string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2221,8 +2210,7 @@ func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRSIPAvailable string NewRSIPAvailable string
NewNATEnabled string
NewNATEnabled string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2260,21 +2248,14 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2320,11 +2301,9 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) { func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -2341,15 +2320,11 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
// Response structure. // Response structure.
response := &struct { response := &struct {
NewInternalPort string NewInternalPort string
NewInternalClient string
NewInternalClient string NewEnabled string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2386,21 +2361,14 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) { func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -2452,11 +2420,9 @@ func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternal
func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) { func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -2580,10 +2546,8 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
// Request structure. // Request structure.
request := &struct { request := &struct {
NewISPPhoneNumber string NewISPPhoneNumber string
NewISPInfo string
NewISPInfo string NewLinkType string
NewLinkType string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -2615,8 +2579,7 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, NewDelayBetweenRetries uint32) (err error) { func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, NewDelayBetweenRetries uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewNumberOfRetries string NewNumberOfRetries string
NewDelayBetweenRetries string NewDelayBetweenRetries string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -2657,10 +2620,8 @@ func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISP
// Response structure. // Response structure.
response := &struct { response := &struct {
NewISPPhoneNumber string NewISPPhoneNumber string
NewISPInfo string
NewISPInfo string NewLinkType string
NewLinkType string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2692,8 +2653,7 @@ func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32,
// Response structure. // Response structure.
response := &struct { response := &struct {
NewNumberOfRetries string NewNumberOfRetries string
NewDelayBetweenRetries string NewDelayBetweenRetries string
}{} }{}
@ -2943,8 +2903,7 @@ func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType stri
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionType string NewConnectionType string
NewPossibleConnectionTypes string NewPossibleConnectionTypes string
}{} }{}
@ -2969,7 +2928,6 @@ func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPass
// Request structure. // Request structure.
request := &struct { request := &struct {
NewUserName string NewUserName string
NewPassword string NewPassword string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3152,11 +3110,9 @@ func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, Ne
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionStatus string NewConnectionStatus string
NewLastConnectionError string NewLastConnectionError string
NewUptime string
NewUptime string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3188,8 +3144,7 @@ func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRat
// Response structure. // Response structure.
response := &struct { response := &struct {
NewUpstreamMaxBitRate string NewUpstreamMaxBitRate string
NewDownstreamMaxBitRate string NewDownstreamMaxBitRate string
}{} }{}
@ -3428,8 +3383,7 @@ func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewN
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRSIPAvailable string NewRSIPAvailable string
NewNATEnabled string
NewNATEnabled string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3467,21 +3421,14 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3527,11 +3474,9 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) { func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3548,15 +3493,11 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
// Response structure. // Response structure.
response := &struct { response := &struct {
NewInternalPort string NewInternalPort string
NewInternalClient string
NewInternalClient string NewEnabled string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3593,21 +3534,14 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) { func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3659,11 +3593,9 @@ func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExterna
func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) { func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.

View File

@ -109,8 +109,7 @@ func (client *DeviceProtection1) SendSetupMessage(ProtocolType string, InMessage
// Request structure. // Request structure.
request := &struct { request := &struct {
ProtocolType string ProtocolType string
InMessage string
InMessage string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -196,10 +195,8 @@ func (client *DeviceProtection1) GetAssignedRoles() (RoleList string, err error)
func (client *DeviceProtection1) GetRolesForAction(DeviceUDN string, ServiceId string, ActionName string) (RoleList string, RestrictedRoleList string, err error) { func (client *DeviceProtection1) GetRolesForAction(DeviceUDN string, ServiceId string, ActionName string) (RoleList string, RestrictedRoleList string, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
DeviceUDN string DeviceUDN string
ServiceId string
ServiceId string
ActionName string ActionName string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -217,8 +214,7 @@ func (client *DeviceProtection1) GetRolesForAction(DeviceUDN string, ServiceId s
// Response structure. // Response structure.
response := &struct { response := &struct {
RoleList string RoleList string
RestrictedRoleList string RestrictedRoleList string
}{} }{}
@ -243,8 +239,7 @@ func (client *DeviceProtection1) GetUserLoginChallenge(ProtocolType string, Name
// Request structure. // Request structure.
request := &struct { request := &struct {
ProtocolType string ProtocolType string
Name string
Name string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -258,8 +253,7 @@ func (client *DeviceProtection1) GetUserLoginChallenge(ProtocolType string, Name
// Response structure. // Response structure.
response := &struct { response := &struct {
Salt string Salt string
Challenge string Challenge string
}{} }{}
@ -283,10 +277,8 @@ func (client *DeviceProtection1) GetUserLoginChallenge(ProtocolType string, Name
func (client *DeviceProtection1) UserLogin(ProtocolType string, Challenge []byte, Authenticator []byte) (err error) { func (client *DeviceProtection1) UserLogin(ProtocolType string, Challenge []byte, Authenticator []byte) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
ProtocolType string ProtocolType string
Challenge string
Challenge string
Authenticator string Authenticator string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -424,12 +416,9 @@ func (client *DeviceProtection1) SetUserLoginPassword(ProtocolType string, Name
// Request structure. // Request structure.
request := &struct { request := &struct {
ProtocolType string ProtocolType string
Name string
Name string Stored string
Salt string
Stored string
Salt string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -465,7 +454,6 @@ func (client *DeviceProtection1) AddRolesForIdentity(Identity string, RoleList s
// Request structure. // Request structure.
request := &struct { request := &struct {
Identity string Identity string
RoleList string RoleList string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -496,7 +484,6 @@ func (client *DeviceProtection1) RemoveRolesForIdentity(Identity string, RoleLis
// Request structure. // Request structure.
request := &struct { request := &struct {
Identity string Identity string
RoleList string RoleList string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -873,7 +860,6 @@ func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, Ne
// Request structure. // Request structure.
request := &struct { request := &struct {
NewMinAddress string NewMinAddress string
NewMaxAddress string NewMaxAddress string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -910,7 +896,6 @@ func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string,
// Response structure. // Response structure.
response := &struct { response := &struct {
NewMinAddress string NewMinAddress string
NewMaxAddress string NewMaxAddress string
}{} }{}
@ -1275,8 +1260,7 @@ func (client *WANCableLinkConfig1) GetCableLinkConfigInfo() (NewCableLinkConfigS
// Response structure. // Response structure.
response := &struct { response := &struct {
NewCableLinkConfigState string NewCableLinkConfigState string
NewLinkType string
NewLinkType string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -1665,13 +1649,10 @@ func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccess
// Response structure. // Response structure.
response := &struct { response := &struct {
NewWANAccessType string NewWANAccessType string
NewLayer1UpstreamMaxBitRate string
NewLayer1UpstreamMaxBitRate string
NewLayer1DownstreamMaxBitRate string NewLayer1DownstreamMaxBitRate string
NewPhysicalLinkStatus string
NewPhysicalLinkStatus string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -1872,7 +1853,6 @@ func (client *WANCommonInterfaceConfig1) GetActiveConnection(NewActiveConnection
// Response structure. // Response structure.
response := &struct { response := &struct {
NewActiveConnDeviceContainer string NewActiveConnDeviceContainer string
NewActiveConnectionServiceID string NewActiveConnectionServiceID string
}{} }{}
@ -1992,8 +1972,7 @@ func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkSt
// Response structure. // Response structure.
response := &struct { response := &struct {
NewLinkType string NewLinkType string
NewLinkStatus string NewLinkStatus string
}{} }{}
@ -2411,8 +2390,7 @@ func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType strin
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionType string NewConnectionType string
NewPossibleConnectionTypes string NewPossibleConnectionTypes string
}{} }{}
@ -2589,11 +2567,9 @@ func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, New
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionStatus string NewConnectionStatus string
NewLastConnectionError string NewLastConnectionError string
NewUptime string
NewUptime string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2704,8 +2680,7 @@ func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRSIPAvailable string NewRSIPAvailable string
NewNATEnabled string
NewNATEnabled string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2743,21 +2718,14 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2803,11 +2771,9 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) { func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -2824,15 +2790,11 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
// Response structure. // Response structure.
response := &struct { response := &struct {
NewInternalPort string NewInternalPort string
NewInternalClient string
NewInternalClient string NewEnabled string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -2869,21 +2831,14 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) { func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -2935,11 +2890,9 @@ func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternal
func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) { func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3089,8 +3042,7 @@ func (client *WANIPConnection2) GetConnectionTypeInfo() (NewConnectionType strin
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionType string NewConnectionType string
NewPossibleConnectionTypes string NewPossibleConnectionTypes string
}{} }{}
@ -3267,11 +3219,9 @@ func (client *WANIPConnection2) GetStatusInfo() (NewConnectionStatus string, New
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionStatus string NewConnectionStatus string
NewLastConnectionError string NewLastConnectionError string
NewUptime string
NewUptime string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3382,8 +3332,7 @@ func (client *WANIPConnection2) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRSIPAvailable string NewRSIPAvailable string
NewNATEnabled string
NewNATEnabled string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3421,21 +3370,14 @@ func (client *WANIPConnection2) GetGenericPortMappingEntry(NewPortMappingIndex u
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3481,11 +3423,9 @@ func (client *WANIPConnection2) GetGenericPortMappingEntry(NewPortMappingIndex u
func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) { func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3502,15 +3442,11 @@ func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string
// Response structure. // Response structure.
response := &struct { response := &struct {
NewInternalPort string NewInternalPort string
NewInternalClient string
NewInternalClient string NewEnabled string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -3547,21 +3483,14 @@ func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string
func (client *WANIPConnection2) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) { func (client *WANIPConnection2) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3613,11 +3542,9 @@ func (client *WANIPConnection2) AddPortMapping(NewRemoteHost string, NewExternal
func (client *WANIPConnection2) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) { func (client *WANIPConnection2) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3655,12 +3582,9 @@ func (client *WANIPConnection2) DeletePortMappingRange(NewStartPort uint16, NewE
// Request structure. // Request structure.
request := &struct { request := &struct {
NewStartPort string NewStartPort string
NewEndPort string
NewEndPort string NewProtocol string
NewManage string
NewProtocol string
NewManage string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3726,14 +3650,10 @@ func (client *WANIPConnection2) GetExternalIPAddress() (NewExternalIPAddress str
func (client *WANIPConnection2) GetListOfPortMappings(NewStartPort uint16, NewEndPort uint16, NewProtocol string, NewManage bool, NewNumberOfPorts uint16) (NewPortListing string, err error) { func (client *WANIPConnection2) GetListOfPortMappings(NewStartPort uint16, NewEndPort uint16, NewProtocol string, NewManage bool, NewNumberOfPorts uint16) (NewPortListing string, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewStartPort string NewStartPort string
NewEndPort string
NewEndPort string NewProtocol string
NewManage string
NewProtocol string
NewManage string
NewNumberOfPorts string NewNumberOfPorts string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3782,21 +3702,14 @@ func (client *WANIPConnection2) GetListOfPortMappings(NewStartPort uint16, NewEn
func (client *WANIPConnection2) AddAnyPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (NewReservedPort uint16, err error) { func (client *WANIPConnection2) AddAnyPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (NewReservedPort uint16, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3914,8 +3827,7 @@ func (client *WANIPv6FirewallControl1) GetFirewallStatus() (FirewallEnabled bool
// Response structure. // Response structure.
response := &struct { response := &struct {
FirewallEnabled string FirewallEnabled string
InboundPinholeAllowed string InboundPinholeAllowed string
}{} }{}
@ -3939,15 +3851,11 @@ func (client *WANIPv6FirewallControl1) GetFirewallStatus() (FirewallEnabled bool
func (client *WANIPv6FirewallControl1) GetOutboundPinholeTimeout(RemoteHost string, RemotePort uint16, InternalClient string, InternalPort uint16, Protocol uint16) (OutboundPinholeTimeout uint32, err error) { func (client *WANIPv6FirewallControl1) GetOutboundPinholeTimeout(RemoteHost string, RemotePort uint16, InternalClient string, InternalPort uint16, Protocol uint16) (OutboundPinholeTimeout uint32, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
RemoteHost string RemoteHost string
RemotePort string
RemotePort string
InternalClient string InternalClient string
InternalPort string
InternalPort string Protocol string
Protocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -3995,17 +3903,12 @@ func (client *WANIPv6FirewallControl1) GetOutboundPinholeTimeout(RemoteHost stri
func (client *WANIPv6FirewallControl1) AddPinhole(RemoteHost string, RemotePort uint16, InternalClient string, InternalPort uint16, Protocol uint16, LeaseTime uint32) (UniqueID uint16, err error) { func (client *WANIPv6FirewallControl1) AddPinhole(RemoteHost string, RemotePort uint16, InternalClient string, InternalPort uint16, Protocol uint16, LeaseTime uint32) (UniqueID uint16, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
RemoteHost string RemoteHost string
RemotePort string
RemotePort string
InternalClient string InternalClient string
InternalPort string
InternalPort string Protocol string
LeaseTime string
Protocol string
LeaseTime string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -4056,8 +3959,7 @@ func (client *WANIPv6FirewallControl1) AddPinhole(RemoteHost string, RemotePort
func (client *WANIPv6FirewallControl1) UpdatePinhole(UniqueID uint16, NewLeaseTime uint32) (err error) { func (client *WANIPv6FirewallControl1) UpdatePinhole(UniqueID uint16, NewLeaseTime uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
UniqueID string UniqueID string
NewLeaseTime string NewLeaseTime string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -4241,10 +4143,8 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
// Request structure. // Request structure.
request := &struct { request := &struct {
NewISPPhoneNumber string NewISPPhoneNumber string
NewISPInfo string
NewISPInfo string NewLinkType string
NewLinkType string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -4276,8 +4176,7 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, NewDelayBetweenRetries uint32) (err error) { func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, NewDelayBetweenRetries uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewNumberOfRetries string NewNumberOfRetries string
NewDelayBetweenRetries string NewDelayBetweenRetries string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -4318,10 +4217,8 @@ func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISP
// Response structure. // Response structure.
response := &struct { response := &struct {
NewISPPhoneNumber string NewISPPhoneNumber string
NewISPInfo string
NewISPInfo string NewLinkType string
NewLinkType string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -4353,8 +4250,7 @@ func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32,
// Response structure. // Response structure.
response := &struct { response := &struct {
NewNumberOfRetries string NewNumberOfRetries string
NewDelayBetweenRetries string NewDelayBetweenRetries string
}{} }{}
@ -4604,8 +4500,7 @@ func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType stri
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionType string NewConnectionType string
NewPossibleConnectionTypes string NewPossibleConnectionTypes string
}{} }{}
@ -4630,7 +4525,6 @@ func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPass
// Request structure. // Request structure.
request := &struct { request := &struct {
NewUserName string NewUserName string
NewPassword string NewPassword string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -4813,11 +4707,9 @@ func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, Ne
// Response structure. // Response structure.
response := &struct { response := &struct {
NewConnectionStatus string NewConnectionStatus string
NewLastConnectionError string NewLastConnectionError string
NewUptime string
NewUptime string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -4849,8 +4741,7 @@ func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRat
// Response structure. // Response structure.
response := &struct { response := &struct {
NewUpstreamMaxBitRate string NewUpstreamMaxBitRate string
NewDownstreamMaxBitRate string NewDownstreamMaxBitRate string
}{} }{}
@ -5089,8 +4980,7 @@ func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewN
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRSIPAvailable string NewRSIPAvailable string
NewNATEnabled string
NewNATEnabled string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -5128,21 +5018,14 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
// Response structure. // Response structure.
response := &struct { response := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -5188,11 +5071,9 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) { func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -5209,15 +5090,11 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
// Response structure. // Response structure.
response := &struct { response := &struct {
NewInternalPort string NewInternalPort string
NewInternalClient string
NewInternalClient string NewEnabled string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// Perform the SOAP call. // Perform the SOAP call.
@ -5254,21 +5131,14 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) { func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string
NewExternalPort string NewProtocol string
NewInternalPort string
NewProtocol string NewInternalClient string
NewEnabled string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string NewPortMappingDescription string
NewLeaseDuration string
NewLeaseDuration string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.
@ -5320,11 +5190,9 @@ func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExterna
func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) { func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
// Request structure. // Request structure.
request := &struct { request := &struct {
NewRemoteHost string NewRemoteHost string
NewExternalPort string NewExternalPort string
NewProtocol string
NewProtocol string
}{} }{}
// BEGIN Marshal arguments into request. // BEGIN Marshal arguments into request.

View File

@ -620,7 +620,7 @@ func (client *{{$srvIdent}}) {{.Name}}({{range $winargs -}}
{{end}} {{end}}
{{end}} {{end}}
{{define "argstruct"}}struct {{"{"}}{{range .}} {{define "argstruct"}}struct {{"{"}}
{{.Name}} string {{range .}}{{.Name}} string
{{end}}{{"}"}}{{end}} {{end}}{{"}"}}{{end}}
`)) `))