From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Jun 2014 09:55:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/variomedia.de'
X-Git-Tag: 001~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ec90b9325b1561f7783b28323e25dd65cadb000;p=ddns.git

Merge remote-tracking branch 'stevee/variomedia.de'

Conflicts:
	src/ddns/__init__.py
	src/ddns/providers.py
---

4ec90b9325b1561f7783b28323e25dd65cadb000
diff --cc src/ddns/__init__.py
index ddc995e,d91d9f0..f731887
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -99,7 -98,7 +99,8 @@@ class DDNSCore(object)
  			DDNSProviderNOIP,
  			DDNSProviderLightningWireLabs,
  			DDNSProviderSelfhost,
 +			DDNSProviderSPDNS,
+ 			DDNSProviderVariomedia,
  		):
  			self.register_provider(provider)
  
diff --cc src/ddns/providers.py
index 3422cd0,2ac3caf..c831b44
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -528,20 -490,25 +528,44 @@@ class DDNSProviderSelfhost(DDNSProvider
  		if not match:
  			raise DDNSUpdateError
  
 +
 +class DDNSProviderSPDNS(DDNSProviderDynDNS):
 +	INFO = {
 +		"handle"    : "spdns.org",
 +		"name"      : "SPDNS",
 +		"website"   : "http://spdns.org/",
 +		"protocols" : ["ipv4",]
 +	}
 +
 +	# Detailed information about request and response codes are provided
 +	# by the vendor. They are using almost the same mechanism and status
 +	# codes as dyndns.org so we can inherit all those stuff.
 +	#
 +	# http://wiki.securepoint.de/index.php/SPDNS_FAQ
 +	# http://wiki.securepoint.de/index.php/SPDNS_Update-Tokens
 +
 +	url = "https://update.spdns.de/nic/update"
++
++
+ class DDNSProviderVariomedia(DDNSProviderDynDNS):
+ 	INFO = {
+ 		"handle"   : "variomedia.de",
+ 		"name"     : "Variomedia",
+ 		"website"  : "http://www.variomedia.de/",
+ 		"protocols" : ["ipv6", "ipv4",]
+ 	}
+ 
+ 	# Detailed information about the request can be found here
+ 	# https://dyndns.variomedia.de/
+ 
+ 	url = "https://dyndns.variomedia.de/nic/update"
+ 
+ 	@property
+ 	def proto(self):
+ 		return self.get("proto")
+ 
+ 	def _prepare_request_data(self):
+ 		data = {
+ 			"hostname" : self.hostname,
+ 			"myip"     : self.get_address(self.proto)
+ 		}