svc.h (Firebird-3.0.2.32703-0.tar.bz2) | : | svc.h (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 310 | skipping to change at line 310 | |||
char* svc_arg_ptr; | char* svc_arg_ptr; | |||
Firebird::string svc_username; | Firebird::string svc_username; | |||
Firebird::string svc_sql_role; | Firebird::string svc_sql_role; | |||
Firebird::AuthReader::AuthBlock svc_auth_block; | Firebird::AuthReader::AuthBlock svc_auth_block; | |||
Firebird::PathName svc_expected_db; | Firebird::PathName svc_expected_db; | |||
bool svc_trusted_role; | bool svc_trusted_role; | |||
bool svc_utf8; | bool svc_utf8; | |||
Firebird::string svc_switches; // Full set of switches | Firebird::string svc_switches; // Full set of switches | |||
Firebird::string svc_perm_sw; // Switches, taken from services table and/or passed using spb_command_line | Firebird::string svc_perm_sw; // Switches, taken from services table and/or passed using spb_command_line | |||
Firebird::string svc_address_path; | Firebird::UCharBuffer svc_address_path; | |||
Firebird::string svc_command_line; | Firebird::string svc_command_line; | |||
Firebird::string svc_network_protocol; | Firebird::string svc_network_protocol; | |||
Firebird::string svc_remote_address; | Firebird::string svc_remote_address; | |||
Firebird::string svc_remote_process; | Firebird::string svc_remote_process; | |||
SLONG svc_remote_pid; | SLONG svc_remote_pid; | |||
TraceManager* svc_trace_manager; | TraceManager* svc_trace_manager; | |||
Firebird::ICryptKeyCallback* svc_crypt_callback; | Firebird::ICryptKeyCallback* svc_crypt_callback; | |||
skipping to change at line 394 | skipping to change at line 394 | |||
UCHAR* svc_stdin_buffer; | UCHAR* svc_stdin_buffer; | |||
// Size of data, preloaded by user (set in put, reset in getBytes) | // Size of data, preloaded by user (set in put, reset in getBytes) | |||
ULONG svc_stdin_size_preload; | ULONG svc_stdin_size_preload; | |||
// Buffer for datam preloaded by user | // Buffer for datam preloaded by user | |||
Firebird::AutoPtr<UCHAR> svc_stdin_preload; | Firebird::AutoPtr<UCHAR> svc_stdin_preload; | |||
// Size of data, requested from user to preload (set in getBytes) | // Size of data, requested from user to preload (set in getBytes) | |||
ULONG svc_stdin_preload_requested; | ULONG svc_stdin_preload_requested; | |||
// Size of data, placed into svc_stdin_buffer (set in put) | // Size of data, placed into svc_stdin_buffer (set in put) | |||
ULONG svc_stdin_user_size; | ULONG svc_stdin_user_size; | |||
static const ULONG PRELOAD_BUFFER_SIZE = SVC_IO_BUFFER_SIZE; | static const ULONG PRELOAD_BUFFER_SIZE = SVC_IO_BUFFER_SIZE; | |||
// Handle of a thread to wait for when closing | ||||
Thread::Handle svc_thread; | ||||
#ifdef DEV_BUILD | #ifdef DEV_BUILD | |||
bool svc_debug; | bool svc_debug; | |||
#endif | #endif | |||
}; | }; | |||
} //namespace Jrd | } //namespace Jrd | |||
#endif // JRD_SVC_H | #endif // JRD_SVC_H | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 3 lines changed or added |