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

rpcrt4: Use RPCRT4_Receive rather than accessing the transport directly.

This commit is contained in:
Mike McCormack 2006-05-15 22:51:30 +09:00 committed by Alexandre Julliard
parent 9b3d8a3527
commit f20cfdfa84
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/rpcrt4/rpc_binding.c
View File

@ -267,9 +267,8 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection,
/* we need to send a binding packet if we are client. */ /* we need to send a binding packet if we are client. */
if (!(*Connection)->server) { if (!(*Connection)->server) {
RpcPktHdr *hdr; RpcPktHdr *hdr;
LONG count;
BYTE *response;
RpcPktHdr *response_hdr; RpcPktHdr *response_hdr;
RPC_MESSAGE msg;
TRACE("sending bind request to server\n"); TRACE("sending bind request to server\n");
@ -284,35 +283,17 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection,
return status; return status;
} }
response = HeapAlloc(GetProcessHeap(), 0, RPC_MAX_PACKET_SIZE); status = RPCRT4_Receive(NewConnection, &response_hdr, &msg);
if (response == NULL) { if (status != RPC_S_OK) {
WARN("Can't allocate memory for binding response\n"); ERR("receive failed\n");
RPCRT4_DestroyConnection(*Connection); RPCRT4_DestroyConnection(*Connection);
return E_OUTOFMEMORY; return status;
} }
count = rpcrt4_conn_read(NewConnection, response, RPC_MAX_PACKET_SIZE); if (response_hdr->common.ptype != PKT_BIND_ACK ||
if (count < sizeof(response_hdr->common)) { response_hdr->bind_ack.max_tsize < RPC_MIN_PACKET_SIZE) {
WARN("received invalid header\n"); ERR("failed to bind\n");
HeapFree(GetProcessHeap(), 0, response); RPCRT4_FreeHeader(response_hdr);
RPCRT4_DestroyConnection(*Connection);
return RPC_S_PROTOCOL_ERROR;
}
response_hdr = (RpcPktHdr*)response;
if (response_hdr->common.rpc_ver != RPC_VER_MAJOR ||
response_hdr->common.rpc_ver_minor != RPC_VER_MINOR ||
response_hdr->common.ptype != PKT_BIND_ACK) {
WARN("invalid protocol version or rejection packet\n");
HeapFree(GetProcessHeap(), 0, response);
RPCRT4_DestroyConnection(*Connection);
return RPC_S_PROTOCOL_ERROR;
}
if (response_hdr->bind_ack.max_tsize < RPC_MIN_PACKET_SIZE) {
WARN("server doesn't allow large enough packets\n");
HeapFree(GetProcessHeap(), 0, response);
RPCRT4_DestroyConnection(*Connection); RPCRT4_DestroyConnection(*Connection);
return RPC_S_PROTOCOL_ERROR; return RPC_S_PROTOCOL_ERROR;
} }
@ -321,7 +302,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection,
(*Connection)->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; (*Connection)->MaxTransmissionSize = response_hdr->bind_ack.max_tsize;
(*Connection)->ActiveInterface = *InterfaceId; (*Connection)->ActiveInterface = *InterfaceId;
HeapFree(GetProcessHeap(), 0, response); RPCRT4_FreeHeader(response_hdr);
} }
Binding->FromConn = *Connection; Binding->FromConn = *Connection;