Merge pull request #120 from nakagami/issue118

mask accept_type

Author: nakagami

firebirdsql/aio/fbcore.py

@@ -72,7 +72,7 @@ def __init__(self, trans):
 
     def _allocate_stmt(self):
         self.trans.connection._op_allocate_statement()
-        if self.trans.connection.accept_type == ptype_lazy_send:
+        if (self.trans.connection.accept_type & ptype_MASK) == ptype_lazy_send:
             self.trans.connection.lazy_response_count += 1
             self.handle = -1
         else:
@@ -114,7 +114,7 @@ async def close(self):
         DEBUG_OUTPUT("AsyncStatement::close()", self.handle)
         if self.stmt_type == isc_info_sql_stmt_select and self._is_open:
             self.trans.connection._op_free_statement(self.handle, DSQL_close)
-            if self.trans.connection.accept_type == ptype_lazy_send:
+            if (self.trans.connection.accept_type & ptype_MASK) == ptype_lazy_send:
                 self.trans.connection.lazy_response_count += 1
             else:
                 (h, oid, buf) = await self.trans.connection._async_op_response()
@@ -124,7 +124,7 @@ async def drop(self):
         DEBUG_OUTPUT("AsyncStatement::drop()", self.handle)
         if self.handle != -1 and self._is_open:
             self.trans.connection._op_free_statement(self.handle, DSQL_drop)
-            if self.trans.connection.accept_type == ptype_lazy_send:
+            if (self.trans.connection.accept_type & ptype_MASK) == ptype_lazy_send:
                 self.trans.connection.lazy_response_count += 1
             else:
                 (h, oid, buf) = await self.trans.connection._async_op_response()

firebirdsql/consts.py

@@ -534,6 +534,9 @@
 ptype_batch_send = 3    # Batch sends, no asynchrony
 ptype_out_of_band = 4   # Batch sends w/ out of band notification
 ptype_lazy_send = 5     # Deferred packets delivery
+ptype_MASK = 0xFF
+pflag_compress = 0x100
+pflag_win_sspi_nego = 0x200
 
 PROTOCOL_VERSION10 = 10
 PROTOCOL_VERSION11 = 11

firebirdsql/fbcore.py

@@ -72,7 +72,7 @@ def __init__(self, trans):
 
     def _allocate_stmt(self):
         self.trans.connection._op_allocate_statement()
-        if self.trans.connection.accept_type == ptype_lazy_send:
+        if (self.trans.connection.accept_type & ptype_MASK) == ptype_lazy_send:
             self.trans.connection.lazy_response_count += 1
             self.handle = -1
         else:
@@ -107,7 +107,7 @@ def fetch_generator(self):
                                 v += buf[2:ln+2]
                                 buf = buf[ln+2:]
                         connection._op_close_blob(h)
-                        if connection.accept_type == ptype_lazy_send:
+                        if (connection.accept_type & ptype_MASK)== ptype_lazy_send:
                             connection.lazy_response_count += 1
                         else:
                             (h, oid, buf) = connection._op_response()
@@ -151,7 +151,7 @@ def close(self):
         DEBUG_OUTPUT("Statement::close()", self.handle)
         if self.stmt_type == isc_info_sql_stmt_select and self._is_open:
             self.trans.connection._op_free_statement(self.handle, DSQL_close)
-            if self.trans.connection.accept_type == ptype_lazy_send:
+            if (self.trans.connection.accept_type & ptype_MASK)== ptype_lazy_send:
                 self.trans.connection.lazy_response_count += 1
             else:
                 (h, oid, buf) = self.trans.connection._op_response()
@@ -161,7 +161,7 @@ def drop(self):
         DEBUG_OUTPUT("Statement::drop()", self.handle)
         if self.handle != -1 and self._is_open:
             self.trans.connection._op_free_statement(self.handle, DSQL_drop)
-            if self.trans.connection.accept_type == ptype_lazy_send:
+            if (self.trans.connection.accept_type & ptype_MASK) == ptype_lazy_send:
                 self.trans.connection.lazy_response_count += 1
             else:
                 (h, oid, buf) = self.trans.connection._op_response()

misc/fbproxy.py

@@ -2427,7 +2427,7 @@ def process_wire(client_socket, server_name, server_port):
             continue
         # ptype_lazy_send
         if (
-            accept_type == 5 and op_req_name in (
+            (accept_type & 0xFF) == 5 and op_req_name in (
                 'op_allocate_statement', 'op_free_statement',
                 'op_close_blob', 'op_cancel_blob', 'op_release')
         ):