From a30213bf512eb2d6dc15404ee1054aa49611fcd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkan=20=C5=9Eahin?= Date: Thu, 12 May 2016 17:33:33 +0300 Subject: [PATCH] registration parameters were extended --- opt/ahenk/base/messaging/Messaging.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opt/ahenk/base/messaging/Messaging.py b/opt/ahenk/base/messaging/Messaging.py index 1e59c44..2949113 100644 --- a/opt/ahenk/base/messaging/Messaging.py +++ b/opt/ahenk/base/messaging/Messaging.py @@ -111,13 +111,16 @@ class Messaging(object): def registration_msg(self): data = {} data['type'] = 'REGISTER' - data['from'] = self.db_service.select_one_result('registration', 'jid', ' 1=1') # str(self.conf_manager.get('REGISTRATION', 'from')) + data['from'] = self.db_service.select_one_result('registration', 'jid', ' 1=1') data['password'] = self.db_service.select_one_result('registration', 'password', ' 1=1') + params = self.db_service.select_one_result('registration', 'params', ' 1=1') + data['parameters'] = json.loads(str(params)) json_params = json.loads(str(params)) data['macAddresses'] = json_params['macAddresses'] data['ipAddresses'] = json_params['ipAddresses'] data['hostname'] = json_params['hostname'] + data['timestamp'] = self.db_service.select_one_result('registration', 'timestamp', ' 1=1') json_data = json.dumps(data) self.logger.debug('[Messaging] Registration message was created')