along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdio.h>
+#if defined(WIN32)
+#include <winsock2.h>
+#define MSG_DONTWAIT 0
+#else
#include <strings.h>
+#endif
+
+#include <stdio.h>
#include <stdlib.h>
+#include <errno.h>
#include <rpc/rpc.h>
#include <rpc/xdr.h>
#include <rpc/rpc_msg.h>
rpc_set_error(rpc, "Out of memory: Failed to allocate pdu structure");
return NULL;
}
- bzero(pdu, sizeof(struct rpc_pdu));
+ bzero((char *)pdu, sizeof(struct rpc_pdu));
pdu->xid = rpc->xid++;
pdu->cb = cb;
pdu->private_data = private_data;
xdr_setpos(&pdu->xdr, 4); /* skip past the record marker */
}
- bzero(&msg, sizeof(struct rpc_msg));
+ bzero((char *)&msg, sizeof(struct rpc_msg));
msg.rm_xid = pdu->xid;
msg.rm_direction = CALL;
msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
size = xdr_getpos(&pdu->xdr);
+ /* for udp we dont queue, we just send it straight away */
+ if (rpc->is_udp != 0) {
+ if (sendto(rpc->fd, rpc->encodebuf, size, MSG_DONTWAIT, rpc->udp_dest, sizeof(struct sockaddr_in)) < 0) {
+ rpc_set_error(rpc, "Sendto failed with errno %s", strerror(errno));
+ rpc_free_pdu(rpc, pdu);
+ return -1;
+ }
+ SLIST_ADD_END(&rpc->waitpdu, pdu);
+ return 0;
+ }
+
/* write recordmarker */
xdr_setpos(&pdu->xdr, 0);
recordmarker = (size - 4) | 0x80000000;
{
struct rpc_msg msg;
- bzero(&msg, sizeof(struct rpc_msg));
+ bzero((char *)&msg, sizeof(struct rpc_msg));
msg.acpted_rply.ar_verf = _null_auth;
if (pdu->xdr_decode_bufsize > 0) {
+ if (pdu->xdr_decode_buf != NULL) {
+ free(pdu->xdr_decode_buf);
+ }
pdu->xdr_decode_buf = malloc(pdu->xdr_decode_bufsize);
if (pdu->xdr_decode_buf == NULL) {
rpc_set_error(rpc, "xdr_replymsg failed in portmap_getport_reply");
pdu->cb(rpc, RPC_STATUS_ERROR, "Failed to allocate buffer for decoding of XDR reply", pdu->private_data);
return 0;
}
- bzero(pdu->xdr_decode_buf, pdu->xdr_decode_bufsize);
+ bzero((char *)pdu->xdr_decode_buf, pdu->xdr_decode_bufsize);
}
msg.acpted_rply.ar_results.where = pdu->xdr_decode_buf;
msg.acpted_rply.ar_results.proc = pdu->xdr_decode_fn;
int pos, recordmarker;
unsigned int xid;
- bzero(&xdr, sizeof(XDR));
+ bzero((char *)&xdr, sizeof(XDR));
xdrmem_create(&xdr, buf, size, XDR_DECODE);
- if (xdr_int(&xdr, &recordmarker) == 0) {
- rpc_set_error(rpc, "xdr_int reading recordmarker failed");
- xdr_destroy(&xdr);
- return -1;
+ if (rpc->is_udp == 0) {
+ if (xdr_int(&xdr, &recordmarker) == 0) {
+ rpc_set_error(rpc, "xdr_int reading recordmarker failed");
+ xdr_destroy(&xdr);
+ return -1;
+ }
}
pos = xdr_getpos(&xdr);
if (xdr_int(&xdr, (int *)&xid) == 0) {
if (pdu->xid != xid) {
continue;
}
- SLIST_REMOVE(&rpc->waitpdu, pdu);
+ if (rpc->is_udp == 0 || rpc->is_broadcast == 0) {
+ SLIST_REMOVE(&rpc->waitpdu, pdu);
+ }
if (rpc_process_reply(rpc, pdu, &xdr) != 0) {
rpc_set_error(rpc, "rpc_procdess_reply failed");
}
xdr_destroy(&xdr);
- rpc_free_pdu(rpc, pdu);
+ if (rpc->is_udp == 0 || rpc->is_broadcast == 0) {
+ rpc_free_pdu(rpc, pdu);
+ }
return 0;
}
rpc_set_error(rpc, "No matching pdu found for xid:%d", xid);