version 1.18, 2013/08/23 13:53:15
|
version 1.19.6.2, 2013/11/15 09:18:38
|
Line 303 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
Line 303 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
if (type == SOCK_STREAM) |
if (type == SOCK_STREAM) |
ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen); |
ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen); |
else |
else |
ret = rpc_Read(sock, type, 0, sa, buf, AIT_LEN(pkt)); | ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen); |
if (ret < 1) { | if (ret < 1) |
LOGERR; | |
return -1; |
return -1; |
} |
|
|
|
/* check for response from known address */ |
/* check for response from known address */ |
if (type == SOCK_STREAM && !estlen) { | if (!estlen) { |
/* 1st read for RPC header */ |
/* 1st read for RPC header */ |
if (ret < sizeof(struct tagRPCCall)) { |
if (ret < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); |
Line 332 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
Line 330 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
break; |
break; |
} while (42); |
} while (42); |
|
|
if (ret < sizeof(struct tagRPCCall)) { | if (ret < sizeof(struct tagRPCCall) || estlen != ret) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); | rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", |
| estlen, ret); |
return -1; |
return -1; |
} |
} |
|
|
Line 380 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
|
Line 379 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
|
rpc->call_argc = htons(array_Size(vars)); |
rpc->call_argc = htons(array_Size(vars)); |
|
|
/* set reply */ |
/* set reply */ |
rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; | rpc->call_req.flags = (uint64_t) htonl(noreply ? RPC_NOREPLY : RPC_REPLY); |
|
|
if (array_Size(vars)) { |
if (array_Size(vars)) { |
/* marshaling variables */ |
/* marshaling variables */ |