#include <stdio.h>
#include <strings.h>
#include <stdlib.h>
+#include <errno.h>
#include <rpc/rpc.h>
#include <rpc/xdr.h>
#include <rpc/rpc_msg.h>
struct rpc_msg msg;
if (rpc == NULL) {
- printf("trying to allocate rpc pdu on NULL context\n");
return NULL;
}
pdu = malloc(sizeof(struct rpc_pdu));
if (pdu == NULL) {
- printf("Failed to allocate pdu structure\n");
+ rpc_set_error(rpc, "Out of memory: Failed to allocate pdu structure");
return NULL;
}
bzero(pdu, sizeof(struct rpc_pdu));
pdu->xdr_decode_bufsize = xdr_decode_bufsize;
xdrmem_create(&pdu->xdr, rpc->encodebuf, rpc->encodebuflen, XDR_ENCODE);
- xdr_setpos(&pdu->xdr, 4); /* skip past the record marker */
+ if (rpc->is_udp == 0) {
+ xdr_setpos(&pdu->xdr, 4); /* skip past the record marker */
+ }
bzero(&msg, sizeof(struct rpc_msg));
msg.rm_xid = pdu->xid;
msg.rm_call.cb_verf = rpc->auth->ah_verf;
if (xdr_callmsg(&pdu->xdr, &msg) == 0) {
- printf("xdr_callmsg failed\n");
+ rpc_set_error(rpc, "xdr_callmsg failed");
xdr_destroy(&pdu->xdr);
free(pdu);
return NULL;
}
xdr_destroy(&pdu->xdr);
+
free(pdu);
}
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;
size = ntohl(*(uint32_t *)buf);
if ((size & 0x80000000) == 0) {
- printf("cant handle oncrpc fragments\n");
+ /* cant handle oncrpc fragments */
return -1;
}
if (pdu->xdr_decode_bufsize > 0) {
pdu->xdr_decode_buf = malloc(pdu->xdr_decode_bufsize);
if (pdu->xdr_decode_buf == NULL) {
- printf("xdr_replymsg failed in portmap_getport_reply\n");
+ 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;
}
msg.acpted_rply.ar_results.proc = pdu->xdr_decode_fn;
if (xdr_replymsg(xdr, &msg) == 0) {
- printf("xdr_replymsg failed in portmap_getport_reply\n");
+ rpc_set_error(rpc, "xdr_replymsg failed in portmap_getport_reply");
pdu->cb(rpc, RPC_STATUS_ERROR, "Message rejected by server", pdu->private_data);
if (pdu->xdr_decode_buf != NULL) {
free(pdu->xdr_decode_buf);
bzero(&xdr, sizeof(XDR));
xdrmem_create(&xdr, buf, size, XDR_DECODE);
- if (xdr_int(&xdr, &recordmarker) == 0) {
- printf("xdr_int reading recordmarker failed\n");
- 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) {
- printf("xdr_int reading xid failed\n");
+ rpc_set_error(rpc, "xdr_int reading xid failed");
xdr_destroy(&xdr);
return -1;
}
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) {
- printf("rpc_procdess_reply failed\n");
+ 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;
}
- printf("No matching pdu found for xid:%d\n", xid);
+ rpc_set_error(rpc, "No matching pdu found for xid:%d", xid);
xdr_destroy(&xdr);
return -1;
}