Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ endif()
set(FB_PREFIX ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME})
set(FB_IPC_NAME "FirebirdIPI")
set(FB_LOGFILENAME "firebird.log")
set(FB_PIPE_NAME "interbas")
set(FB_SERVICE_NAME "gds_db")
set(FB_SERVICE_PORT 3050)

Expand Down
15 changes: 1 addition & 14 deletions builds/install/misc/firebird.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@
#
# String
# ------
# Strings are also what they sound like, strings. Examples:
# Strings are also what they sound like, strings. Example:
# RemoteServiceName = gds_db
# RemotePipeName = pipe47
#
# Scopes
# ------
Expand Down Expand Up @@ -1083,18 +1082,6 @@
#
#IpcName = FIREBIRD

#
# The name of the pipe used as a transport channel in NetBEUI protocol.
# Has the same meaning as a port number for TCP/IP. The default value is
# compatible with IB/FB1.
#
# Per-connection configurable.
#
# Type: string
#
#RemotePipeName = interbas


# ============================
# Settings for Unix/Linux platforms
# ============================
Expand Down
10 changes: 0 additions & 10 deletions builds/mac_os_x/CS/CS.pbproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6767,16 +6767,6 @@
path = winvx.cpp;
refType = 4;
};
F616C8C00200B0D001EF0ADE = {
isa = PBXFileReference;
path = wnet.cpp;
refType = 4;
};
F616C8C10200B0D001EF0ADE = {
isa = PBXFileReference;
path = wnet_proto.h;
refType = 4;
};
F616C8C20200B0D001EF0ADE = {
isa = PBXFileReference;
path = xdr.cpp;
Expand Down
2 changes: 0 additions & 2 deletions builds/win32/msvc15/remote.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,13 @@
<ClCompile Include="..\..\..\src\remote\parser.cpp" />
<ClCompile Include="..\..\..\src\remote\protocol.cpp" />
<ClCompile Include="..\..\..\src\remote\remote.cpp" />
<ClCompile Include="..\..\..\src\remote\os\win32\wnet.cpp" />
<ClCompile Include="..\..\..\src\auth\trusted\AuthSspi.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\auth\SecureRemotePassword\Message.h" />
<ClInclude Include="..\..\..\src\auth\SecureRemotePassword\srp.h" />
<ClInclude Include="..\..\..\src\remote\inet_proto.h" />
<ClInclude Include="..\..\..\src\remote\merge_proto.h" />
<ClInclude Include="..\..\..\src\remote\os\win32\wnet_proto.h" />
<ClInclude Include="..\..\..\src\remote\os\win32\xnet.h" />
<ClInclude Include="..\..\..\src\remote\os\win32\xnet_proto.h" />
<ClInclude Include="..\..\..\src\remote\parse_proto.h" />
Expand Down
6 changes: 0 additions & 6 deletions builds/win32/msvc15/remote.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
<ClCompile Include="..\..\..\src\remote\remote.cpp">
<Filter>REMOTE files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\remote\os\win32\wnet.cpp">
<Filter>REMOTE files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\auth\trusted\AuthSspi.cpp">
<Filter>AUTH files</Filter>
</ClCompile>
Expand Down Expand Up @@ -64,9 +61,6 @@
<ClInclude Include="..\..\..\src\remote\remote.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\remote\os\win32\wnet_proto.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\remote\os\win32\xnet.h">
<Filter>Header files</Filter>
</ClInclude>
Expand Down
13 changes: 0 additions & 13 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1222,15 +1222,6 @@ case "$PLATFORM" in
;;

win32)
FB_PIPE_NAME=interbas
AC_ARG_WITH(pipe-name,
[ --with-pipe-name specify wnet pipe name (default=interbas)],
[FB_PIPE_NAME=${withval}])
AH_VERBATIM(FB_PIPE_NAME,
[/* Wnet pipe name */
#define FB_PIPE_NAME "interbas"])
AC_DEFINE_UNQUOTED(FB_PIPE_NAME,"$FB_PIPE_NAME")
AC_SUBST(FB_PIPE_NAME)
XE_PREPEND( -mthreads -lmpr -lversion -lws2_32 -lole32,LIBS)
;;

Expand Down Expand Up @@ -1503,10 +1494,6 @@ esac
echo " Service name : $FB_SERVICE_NAME"
echo " Service port : $FB_SERVICE_PORT"

case "$PLATFORM" in
win32) echo " Pipe name : $FB_PIPE_NAME";;
esac

echo " GPRE modules : c_cxx.cpp$GPRE_LANGUAGE_MODULES"
echo

Expand Down
6 changes: 2 additions & 4 deletions doc/Firebird_conf.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ you only use 0/1

String
------
Strings are also what they sound like, strings. Examples:
Strings are also what they sound like, strings. Example:
RootDirectory = /opt/firebird
RemotePipeName = "pipe47"


Configuration options
Expand Down Expand Up @@ -144,8 +143,7 @@ DeadThreadsCollection integer default 50
PriorityBoost integer default 5
RemoteServiceName string default gds_db
RemoteServicePort integer default 3050 (TCP port number)
RemotePipeName string default "interbas" (Windows only?)
IpcName string default "FirebirdIPI" (Windows only)
IpcName string default "FIREBIRD" (Windows only)

MaxUnflushedWrites integer
# of writes before file writes are forcibly synched.
Expand Down
26 changes: 2 additions & 24 deletions doc/README.connection_strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ For TCP (aka INET) protocol:

<host> [ / <port>] : <file path to database or alias>

For named pipes (aka NetBEUI, aka WNET) protocol:

\\ <host> [ @ <port>] \ <file path to database or alias>

For local connections as simple as:

<file path to database or alias>
Expand Down Expand Up @@ -55,11 +51,6 @@ Examples:
myserver/fb_db:mydb
localhost/fb_db:mydb

Connect via named pipes:

\\myserver\C:\db\mydb.fdb
\\myserver@fb_db\C:\db\mydb.fdb

Local connection:

/db/mydb.fdb
Expand All @@ -71,8 +62,7 @@ connection strings:

[ <protocol> : // [ <host> [ : <port> ] ] ] / <file path to database or alias>

Where protocol is one of: INET (means TCP), WNET (means named pipes) or XNET
(means shared memory).
Where protocol is one of: INET (means TCP) or XNET (means shared memory).

Examples:

Expand Down Expand Up @@ -114,22 +104,12 @@ Examples:
inet4://myserver/mydb
inet6://myserver/mydb

Connect via named pipes:

wnet://myserver/C:\db\mydb.fdb
wnet://myserver:fb_db/C:\db\mydb.fdb

Loopback connection via TCP:

inet:///db/mydb.fdb
inet://C:\db\mydb.fdb
inet://mydb

Loopback connection via named pipes:

wnet://C:\db\mydb.fdb
wnet://mydb

Local connection via shared memory:

xnet://C:\db\mydb.fdb
Expand All @@ -155,9 +135,7 @@ to connect locally using a specific transport protocol, please specify:

inet://<file path to database or alias>
or
wnet://<file path to database or alias>
or
xnet://<file path to database or alias>

Note: WNET (named pipes) and XNET (shared memory) protocols are available on Windows only.
Note: XNET (shared memory) protocol is available on Windows only.

2 changes: 1 addition & 1 deletion doc/sql.extensions/README.context_variables2
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Usage:
Variable name Value
------------------------------------------------------------------------------
NETWORK_PROTOCOL | The network protocol used by client to connect. Currently
| used values: "TCPv4", "TCPv6", "WNET", "XNET" and NULL.
| used values: "TCPv4", "TCPv6", "XNET" and NULL.
|
WIRE_COMPRESSED | Compression status of current connection.
| If connection is compressed - returns "TRUE", if it is
Expand Down
29 changes: 10 additions & 19 deletions src/alice/alice.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,30 +98,21 @@ struct user_action



// String block: used to store a string of constant length.

class alice_str : public pool_alloc_rpt<UCHAR, alice_type_str>
{
public:
USHORT str_length;
UCHAR str_data[2];
};

// Transaction block: used to store info about a multi-database transaction.
// Transaction Description Record

struct tdr : public pool_alloc<alice_type_tdr>
{
tdr* tdr_next; // next sub-transaction
TraNumber tdr_id; // database-specific transaction id
alice_str* tdr_fullpath; // full (possibly) remote pathname
const TEXT* tdr_filename; // filename within full pathname
alice_str* tdr_host_site; // host for transaction
alice_str* tdr_remote_site; // site for remote transaction
FB_API_HANDLE tdr_handle; // reconnected transaction handle
FB_API_HANDLE tdr_db_handle; // re-attached database handle
USHORT tdr_db_caps; // capabilities of database
USHORT tdr_state; // see flags below
tdr* tdr_next; // next sub-transaction
TraNumber tdr_id; // database-specific transaction id
Firebird::string tdr_fullpath; // full (possibly) remote pathname
Firebird::string tdr_filename; // filename
Firebird::string tdr_host_site; // host for transaction
Firebird::string tdr_remote_site; // site for remote transaction
FB_API_HANDLE tdr_handle; // reconnected transaction handle
FB_API_HANDLE tdr_db_handle; // re-attached database handle
USHORT tdr_db_caps; // capabilities of database
USHORT tdr_state; // see flags below
};

// CVC: This information should match Transaction Description Record constants in acl.h
Expand Down
Loading