repositories
/
deb_libnfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a9b2416
)
add support for sending and receiving udp pdu
author
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Sun, 26 Jun 2011 08:24:24 +0000
(18:24 +1000)
committer
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Sun, 26 Jun 2011 08:24:24 +0000
(18:24 +1000)
lib/pdu.c
patch
|
blob
|
blame
|
history
diff --git
a/lib/pdu.c
b/lib/pdu.c
index a12d30b2501e342a9d76fa91102521b973b668c7..601f11023778a28bb71d83b5d1844fce49c19f22 100644
(file)
--- a/
lib/pdu.c
+++ b/
lib/pdu.c
@@
-18,6
+18,7
@@
#include <stdio.h>
#include <strings.h>
#include <stdlib.h>
#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>
#include <rpc/rpc.h>
#include <rpc/xdr.h>
#include <rpc/rpc_msg.h>
@@
-97,6
+98,17
@@
int rpc_queue_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu)
size = xdr_getpos(&pdu->xdr);
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;
/* write recordmarker */
xdr_setpos(&pdu->xdr, 0);
recordmarker = (size - 4) | 0x80000000;
@@
-198,10
+210,12
@@
int rpc_process_pdu(struct rpc_context *rpc, char *buf, int size)
bzero(&xdr, sizeof(XDR));
xdrmem_create(&xdr, buf, size, XDR_DECODE);
bzero(&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) {
}
pos = xdr_getpos(&xdr);
if (xdr_int(&xdr, (int *)&xid) == 0) {
@@
-215,12
+229,16
@@
int rpc_process_pdu(struct rpc_context *rpc, char *buf, int size)
if (pdu->xid != xid) {
continue;
}
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);
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);
return 0;
}
rpc_set_error(rpc, "No matching pdu found for xid:%d", xid);