X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Flibnfs-private.h;h=07ce9a8f96b2b9d3edf355cbbc56cb0a4994cee5;hb=10a7a32bb3f4a1f2a8762b70481f3626b5b34e72;hp=b1fe13480dac57570d5c39c17f62706a0926cf45;hpb=ea9082f2001b5b0e321cd44733343f021e2bc313;p=deb_libnfs.git
diff --git a/include/libnfs-private.h b/include/libnfs-private.h
index b1fe134..07ce9a8 100644
--- a/include/libnfs-private.h
+++ b/include/libnfs-private.h
@@ -14,8 +14,47 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
-#include
-#include
+
+#ifndef _LIBNFS_PRIVATE_H_
+#define _LIBNFS_PRIVATE_H_
+
+#ifdef HAVE_CONFIG_H
+#include "config.h" /* HAVE_SOCKADDR_STORAGE ? */
+#endif
+
+#ifndef WIN32
+#include /* struct sockaddr_storage */
+#endif
+
+#include "libnfs-zdr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(HAVE_SOCKADDR_STORAGE) && !defined(WIN32)
+/*
+ * RFC 2553: protocol-independent placeholder for socket addresses
+ */
+#define _SS_MAXSIZE 128
+#define _SS_ALIGNSIZE (sizeof(double))
+#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
+#define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
+ _SS_PAD1SIZE - _SS_ALIGNSIZE)
+
+struct sockaddr_storage {
+#ifdef HAVE_SOCKADDR_LEN
+ unsigned char ss_len; /* address length */
+ unsigned char ss_family; /* address family */
+#else
+ unsigned short ss_family;
+#endif
+ char __ss_pad1[_SS_PAD1SIZE];
+ double __ss_align; /* force desired structure storage alignment */
+ char __ss_pad2[_SS_PAD2SIZE];
+};
+#endif
+
struct rpc_fragment {
struct rpc_fragment *next;
@@ -23,7 +62,11 @@ struct rpc_fragment {
char *data;
};
+#define RPC_CONTEXT_MAGIC 0xc6e46435
+#define RPC_PARAM_UNDEFINED -1
+
struct rpc_context {
+ uint32_t magic;
int fd;
int is_connected;
@@ -32,63 +75,76 @@ struct rpc_context {
rpc_cb connect_cb;
void *connect_data;
- AUTH *auth;
- unsigned long xid;
+ struct AUTH *auth;
+ uint32_t xid;
- /* buffer used for encoding RPC PDU */
- char *encodebuf;
- int encodebuflen;
+ /* buffer used for encoding RPC PDU */
+ char *encodebuf;
+ int encodebuflen;
- struct rpc_pdu *outqueue;
- struct sockaddr_storage udp_src;
- struct rpc_pdu *waitpdu;
+ struct rpc_pdu *outqueue;
+ struct sockaddr_storage udp_src;
+ struct rpc_pdu *waitpdu;
- int inpos;
- int insize;
- char *inbuf;
+ uint32_t inpos;
+ uint32_t insize;
+ char *inbuf;
- /* special fields for UDP, which can sometimes be BROADCASTed */
- int is_udp;
- struct sockaddr *udp_dest;
- int is_broadcast;
+ /* special fields for UDP, which can sometimes be BROADCASTed */
+ int is_udp;
+ struct sockaddr *udp_dest;
+ int is_broadcast;
- /* track the address we connect to so we can auto-reconnect on session failure */
- struct sockaddr_storage s;
- int auto_reconnect;
+ /* track the address we connect to so we can auto-reconnect on session failure */
+ struct sockaddr_storage s;
+ int auto_reconnect;
/* fragment reassembly */
struct rpc_fragment *fragments;
+
+ /* parameters passable via URL */
+ int tcp_syncnt;
+ int uid;
+ int gid;
};
struct rpc_pdu {
struct rpc_pdu *next;
- unsigned long xid;
- XDR xdr;
+ uint32_t xid;
+ ZDR zdr;
- int written;
+ uint32_t written;
struct rpc_data outdata;
rpc_cb cb;
void *private_data;
- /* function to decode the xdr reply data and buffer to decode into */
- xdrproc_t xdr_decode_fn;
- caddr_t xdr_decode_buf;
- int xdr_decode_bufsize;
+ /* function to decode the zdr reply data and buffer to decode into */
+ zdrproc_t zdr_decode_fn;
+ caddr_t zdr_decode_buf;
+ uint32_t zdr_decode_bufsize;
};
-struct rpc_pdu *rpc_allocate_pdu(struct rpc_context *rpc, int program, int version, int procedure, rpc_cb cb, void *private_data, xdrproc_t xdr_decode_fn, int xdr_bufsize);
+struct rpc_pdu *rpc_allocate_pdu(struct rpc_context *rpc, int program, int version, int procedure, rpc_cb cb, void *private_data, zdrproc_t zdr_decode_fn, int zdr_bufsize);
void rpc_free_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu);
int rpc_queue_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu);
int rpc_get_pdu_size(char *buf);
int rpc_process_pdu(struct rpc_context *rpc, char *buf, int size);
void rpc_error_all_pdus(struct rpc_context *rpc, char *error);
-void rpc_set_error(struct rpc_context *rpc, char *error_string, ...);
-void nfs_set_error(struct nfs_context *nfs, char *error_string, ...);
+void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
+#ifdef __GNUC__
+ __attribute__((format(printf, 2, 3)))
+#endif
+;
+
+void nfs_set_error(struct nfs_context *nfs, char *error_string, ...)
+#ifdef __GNUC__
+ __attribute__((format(printf, 2, 3)))
+#endif
+;
-struct rpc_context *nfs_get_rpc_context(struct nfs_context *nfs);
const char *nfs_get_server(struct nfs_context *nfs);
const char *nfs_get_export(struct nfs_context *nfs);
@@ -101,6 +157,17 @@ struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc);
void rpc_set_autoreconnect(struct rpc_context *rpc);
void rpc_unset_autoreconnect(struct rpc_context *rpc);
+void rpc_set_tcp_syncnt(struct rpc_context *rpc, int v);
+void rpc_set_uid(struct rpc_context *rpc, int uid);
+void rpc_set_gid(struct rpc_context *rpc, int gid);
+
int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size);
void rpc_free_all_fragments(struct rpc_context *rpc);
+const struct nfs_fh3 *nfs_get_rootfh(struct nfs_context *nfs);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !_LIBNFS_PRIVATE_H_ */