From 87a68494c171b1c2c08387a6997ae2c0c3d3d439 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Wed, 10 Apr 2019 13:26:09 +0200
Subject: [PATCH] fix: [server] fix type 2/254 error handler and stats

---
 server/server.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/server/server.py b/server/server.py
index fd33764..de8a095 100755
--- a/server/server.py
+++ b/server/server.py
@@ -239,21 +239,8 @@ class D4_Server(Protocol, TimeoutMixin):
                             return 1
                         else:
                             #self.version = None
-                            # check if type change
-                            if self.data_saved:
-                                # type change detected
-                                if self.type != data_header['type']:
-                                    # Meta types
-                                    if self.type == 2 and data_header['type'] == 254:
-                                        self.update_stream_type = True
-                                    # Type Error
-                                    else:
-                                        logger.warning('Unexpected type change, type={} new type={}, ip={} uuid={} session_uuid={}'.format(ip, data_header['uuid_header'], data_header['type'], self.session_uuid))
-                                        redis_server_metadata.hset('metadata_uuid:{}'.format(data_header['uuid_header']), 'Error', 'Error: Unexpected type change type={}, new type={}'.format(self.type, data_header['type']))
-                                        self.transport.abortConnection()
-                                        return 1
                             # type 254, check if previous type 2 saved
-                            elif data_header['type'] == 254:
+                            if data_header['type'] == 254:
                                 logger.warning('a type 2 packet must be sent, ip={} uuid={} type={} session_uuid={}'.format(ip, data_header['uuid_header'], data_header['type'], self.session_uuid))
                                 redis_server_metadata.hset('metadata_uuid:{}'.format(data_header['uuid_header']), 'Error', 'Error: a type 2 packet must be sent, type={}'.format(data_header['type']))
                                 self.transport.abortConnection()
@@ -266,6 +253,21 @@ class D4_Server(Protocol, TimeoutMixin):
                             # map session_uuid/uuid
                             redis_server_stream.sadd('map:active_connection-uuid-session_uuid:{}'.format(self.uuid), self.session_uuid)
 
+                    # check if type change
+                    if self.data_saved:
+                        # type change detected
+                        if self.type != data_header['type']:
+                            # Meta types
+                            if self.type == 2 and data_header['type'] == 254:
+                                self.update_stream_type = True
+                                self.type = data_header['type']
+                            # Type Error
+                            else:
+                                logger.warning('Unexpected type change, type={} new type={}, ip={} uuid={} session_uuid={}'.format(ip, data_header['uuid_header'], data_header['type'], self.session_uuid))
+                                redis_server_metadata.hset('metadata_uuid:{}'.format(data_header['uuid_header']), 'Error', 'Error: Unexpected type change type={}, new type={}'.format(self.type, data_header['type']))
+                                self.transport.abortConnection()
+                                return 1
+
                     # check if the uuid is the same
                     if self.uuid != data_header['uuid_header']:
                         logger.warning('The uuid change during the connection, ip={} uuid={} type={} session_uuid={} new_uuid={}'.format(ip, self.uuid, data_header['type'], self.session_uuid, data_header['uuid_header']))