Merge branch 'master' into develop

3 files changed, 85 insertions, 0 deletions

diff --git a/sleekxmpp/plugins/xep_0279/__init__.py b/sleekxmpp/plugins/xep_0279/__init__.py
new file mode 100644
index 00000000..93db9e7c
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0279/__init__.py
@@ -0,0 +1,16 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp.plugins.base import register_plugin
+
+from sleekxmpp.plugins.xep_0279 import stanza
+from sleekxmpp.plugins.xep_0279.stanza import IPCheck
+from sleekxmpp.plugins.xep_0279.ipcheck import XEP_0279
+
+
+register_plugin(XEP_0279)
diff --git a/sleekxmpp/plugins/xep_0279/ipcheck.py b/sleekxmpp/plugins/xep_0279/ipcheck.py
new file mode 100644
index 00000000..f8c167c7
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0279/ipcheck.py
@@ -0,0 +1,39 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+
+import logging
+
+from sleekxmpp import Iq
+from sleekxmpp.plugins import BasePlugin
+from sleekxmpp.xmlstream import register_stanza_plugin
+from sleekxmpp.plugins.xep_0279 import stanza, IPCheck
+
+
+class XEP_0279(BasePlugin):
+
+    name = 'xep_0279'
+    description = 'XEP-0279: Server IP Check'
+    dependencies = set(['xep_0030'])
+    stanza = stanza
+
+    def plugin_init(self):
+        register_stanza_plugin(Iq, IPCheck)
+
+    def session_bind(self, jid):
+        self.xmpp['xep_0030'].add_feature('urn:xmpp:sic:0')
+
+    def plugin_end(self):
+        self.xmpp['xep_0030'].del_feature(feature='urn:xmpp:sic:0')
+
+    def check_ip(self, ifrom=None, block=True, timeout=None, callback=None):
+        iq = self.xmpp.Iq()
+        iq['type'] = 'get'
+        iq['from'] = ifrom
+        iq.enable('ip_check')
+        return iq.send(block=block, timeout=timeout, callback=callback)
diff --git a/sleekxmpp/plugins/xep_0279/stanza.py b/sleekxmpp/plugins/xep_0279/stanza.py
new file mode 100644
index 00000000..181b5957
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0279/stanza.py
@@ -0,0 +1,30 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp.xmlstream import ElementBase
+
+
+class IPCheck(ElementBase):
+
+    name = 'ip'
+    namespace = 'urn:xmpp:sic:0'
+    plugin_attrib = 'ip_check'
+    interfaces = set(['ip_check'])
+    is_extension = True
+
+    def get_ip_check(self):
+        return self.xml.text
+
+    def set_ip_check(self, value):
+        if value:
+            self.xml.text = value
+        else:
+            self.xml.text = ''
+
+    def del_ip_check(self):
+        self.xml.text = ''