ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcrt4: Remove the unused AuthInfo field from the RpcAssoc structure and Used from RpcConnection.

This commit is contained in:
Rob Shearman 2007-06-26 22:26:09 +01:00 committed by Alexandre Julliard
parent 2e2b17f340
commit 680e35643d
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/rpcrt4/rpc_binding.c
View File

@ -302,7 +302,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection,
status = RPCRT4_CreateConnection(&NewConnection, Binding->server, status = RPCRT4_CreateConnection(&NewConnection, Binding->server,
Binding->Protseq, Binding->NetworkAddr, Binding->Protseq, Binding->NetworkAddr,
Binding->Endpoint, Binding->NetworkOptions, Binding->Endpoint, Binding->NetworkOptions,
Binding->AuthInfo, Binding->QOS, Binding); Binding->AuthInfo, Binding->QOS);
if (status != RPC_S_OK) if (status != RPC_S_OK)
return status; return status;

4
dlls/rpcrt4/rpc_binding.h
View File

@ -58,7 +58,6 @@ typedef struct _RpcAssoc
LPSTR NetworkAddr; LPSTR NetworkAddr;
LPSTR Endpoint; LPSTR Endpoint;
LPWSTR NetworkOptions; LPWSTR NetworkOptions;
RpcAuthInfo *AuthInfo;
/* id of this association group */ /* id of this association group */
ULONG assoc_group_id; ULONG assoc_group_id;
@ -72,7 +71,6 @@ struct connection_ops;
typedef struct _RpcConnection typedef struct _RpcConnection
{ {
struct _RpcConnection* Next; struct _RpcConnection* Next;
struct _RpcBinding* Used;
BOOL server; BOOL server;
LPSTR NetworkAddr; LPSTR NetworkAddr;
LPSTR Endpoint; LPSTR Endpoint;
@ -152,7 +150,7 @@ RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDEN
void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection); void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection);
ULONG RpcAssoc_Release(RpcAssoc *assoc); ULONG RpcAssoc_Release(RpcAssoc *assoc);
RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, RpcBinding* Binding); RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS);
RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection);
RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection);
RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection);

14
dlls/rpcrt4/rpc_transport.c
View File

@ -250,7 +250,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq
RpcConnection *Connection; RpcConnection *Connection;
r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL, r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL,
endpoint, NULL, NULL, NULL, NULL); endpoint, NULL, NULL, NULL);
if (r != RPC_S_OK) if (r != RPC_S_OK)
return r; return r;
@ -297,7 +297,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse
RpcConnection *Connection; RpcConnection *Connection;
r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL, r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL,
endpoint, NULL, NULL, NULL, NULL); endpoint, NULL, NULL, NULL);
if (r != RPC_S_OK) if (r != RPC_S_OK)
return r; return r;
@ -857,8 +857,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr
} }
create_status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE, create_status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE,
protseq->Protseq, NULL, protseq->Protseq, NULL,
endpoint, NULL, NULL, NULL, endpoint, NULL, NULL, NULL);
NULL);
if (create_status != RPC_S_OK) if (create_status != RPC_S_OK)
{ {
close(sock); close(sock);
@ -1354,8 +1353,7 @@ RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection)
RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server,
LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint,
LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS)
RpcBinding* Binding)
{ {
const struct connection_ops *ops; const struct connection_ops *ops;
RpcConnection* NewConnection; RpcConnection* NewConnection;
@ -1374,7 +1372,6 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server,
NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr); NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr);
NewConnection->Endpoint = RPCRT4_strdupA(Endpoint); NewConnection->Endpoint = RPCRT4_strdupA(Endpoint);
NewConnection->NetworkOptions = RPCRT4_strdupW(NetworkOptions); NewConnection->NetworkOptions = RPCRT4_strdupW(NetworkOptions);
NewConnection->Used = Binding;
NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE;
memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface)); memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface));
NewConnection->NextCallId = 1; NewConnection->NextCallId = 1;
@ -1518,8 +1515,7 @@ RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* Old
rpcrt4_conn_get_name(OldConnection), rpcrt4_conn_get_name(OldConnection),
OldConnection->NetworkAddr, OldConnection->NetworkAddr,
OldConnection->Endpoint, NULL, OldConnection->Endpoint, NULL,
OldConnection->AuthInfo, OldConnection->QOS, OldConnection->AuthInfo, OldConnection->QOS);
NULL);
if (err == RPC_S_OK) if (err == RPC_S_OK)
rpcrt4_conn_handoff(OldConnection, *Connection); rpcrt4_conn_handoff(OldConnection, *Connection);
return err; return err;