X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=bbed183fdf4fc8367d63d4630fdc96da2d2891dd;hb=1a6ec3ee76a2e33d6c86ad81d00922dabe426f50;hp=4c8f84f42308ea61c131089d4d35cc8d9b670720;hpb=183451cff566ac49ab872821e458e57b90e72710;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index 4c8f84f..bbed183 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,22 +11,36 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
#ifdef WIN32
#include "win32_compat.h"
-#else
+#endif
+
+#define _GNU_SOURCE
+
+#ifdef HAVE_UNISTD_H
#include
+#endif
+
+#ifdef HAVE_STRINGS_H
#include
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
#include
#include
#include
#include
-#include
-#include
+#include
+#include
#include "slist.h"
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
@@ -34,6 +48,8 @@
struct rpc_context *rpc_init_context(void)
{
struct rpc_context *rpc;
+ static uint32_t salt = 0;
+ unsigned int i;
rpc = malloc(sizeof(struct rpc_context));
if (rpc == NULL) {
@@ -41,25 +57,36 @@ struct rpc_context *rpc_init_context(void)
}
memset(rpc, 0, sizeof(struct rpc_context));
- rpc->encodebuflen = 65536;
+ rpc->magic = RPC_CONTEXT_MAGIC;
+
+ /* Allow 1M of data (for writes) and some */
+ rpc->encodebuflen = 1024 * 1024 + 4096;
rpc->encodebuf = malloc(rpc->encodebuflen);
if (rpc->encodebuf == NULL) {
free(rpc);
return NULL;
}
-#if defined(WIN32)
- rpc->auth = authunix_create("LibNFS", 65535, 65535, 0, NULL);
-#else
rpc->auth = authunix_create_default();
-#endif
if (rpc->auth == NULL) {
free(rpc->encodebuf);
free(rpc);
return NULL;
}
- rpc->xid = 1;
+ rpc->xid = salt + time(NULL) + getpid() << 16;
+ salt += 0x01000000;
rpc->fd = -1;
+ rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
+#if defined(WIN32) || defined(ANDROID)
+ rpc->uid = 65534;
+ rpc->gid = 65534;
+#else
+ rpc->uid = getuid();
+ rpc->gid = getgid();
+#endif
+ rpc_reset_queue(&rpc->outqueue);
+ for (i = 0; i < HASHES; i++)
+ rpc_reset_queue(&rpc->waitpdu[i]);
return rpc;
}
@@ -77,46 +104,82 @@ struct rpc_context *rpc_init_udp_context(void)
return rpc;
}
-void rpc_set_auth(struct rpc_context *rpc, AUTH *auth)
+void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->auth != NULL) {
auth_destroy(rpc->auth);
}
rpc->auth = auth;
}
+static void rpc_set_uid_gid(struct rpc_context *rpc, int uid, int gid) {
+ if (uid != rpc->uid || gid != rpc->gid) {
+ struct AUTH *auth = libnfs_authunix_create("libnfs", uid, gid, 0, NULL);
+ if (auth != NULL) {
+ rpc_set_auth(rpc, auth);
+ rpc->uid = uid;
+ rpc->gid = gid;
+ }
+ }
+}
+
+void rpc_set_uid(struct rpc_context *rpc, int uid) {
+ rpc_set_uid_gid(rpc, uid, rpc->gid);
+}
+
+void rpc_set_gid(struct rpc_context *rpc, int gid) {
+ rpc_set_uid_gid(rpc, rpc->uid, gid);
+}
void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
{
va_list ap;
+ char *old_error_string = rpc->error_string;
+
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
- if (rpc->error_string != NULL) {
- free(rpc->error_string);
- }
va_start(ap, error_string);
rpc->error_string = malloc(1024);
vsnprintf(rpc->error_string, 1024, error_string, ap);
va_end(ap);
+
+ if (old_error_string != NULL) {
+ free(old_error_string);
+ }
}
char *rpc_get_error(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
return rpc->error_string;
}
void rpc_error_all_pdus(struct rpc_context *rpc, char *error)
{
- struct rpc_pdu *pdu;
+ struct rpc_pdu *pdu, *next;
+ unsigned int i;
- while((pdu = rpc->outqueue) != NULL) {
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+ while ((pdu = rpc->outqueue.head) != NULL) {
pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data);
- SLIST_REMOVE(&rpc->outqueue, pdu);
+ rpc->outqueue.head = pdu->next;
rpc_free_pdu(rpc, pdu);
}
- while((pdu = rpc->waitpdu) != NULL) {
- pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data);
- SLIST_REMOVE(&rpc->waitpdu, pdu);
- rpc_free_pdu(rpc, pdu);
+ rpc->outqueue.tail = NULL;
+
+ for (i = 0; i < HASHES; i++) {
+ struct rpc_queue *q = &rpc->waitpdu[i];
+
+ while((pdu = q->head) != NULL) {
+ pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data);
+ q->head = pdu->next;
+ rpc_free_pdu(rpc, pdu);
+ }
+ q->tail = NULL;
}
}
@@ -130,10 +193,12 @@ static void rpc_free_fragment(struct rpc_fragment *fragment)
void rpc_free_all_fragments(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
while (rpc->fragments != NULL) {
struct rpc_fragment *fragment = rpc->fragments;
- SLIST_REMOVE(&rpc->fragments, fragment);
+ rpc->fragments = fragment->next;
rpc_free_fragment(fragment);
}
}
@@ -142,6 +207,8 @@ int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size)
{
struct rpc_fragment *fragment;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
fragment = malloc(sizeof(struct rpc_fragment));
if (fragment == NULL) {
return -1;
@@ -155,23 +222,31 @@ int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size)
}
memcpy(fragment->data, data, fragment->size);
- SLIST_ADD_END(&rpc->fragments, fragment);
+ LIBNFS_LIST_ADD_END(&rpc->fragments, fragment);
return 0;
}
void rpc_destroy_context(struct rpc_context *rpc)
{
struct rpc_pdu *pdu;
+ unsigned int i;
+
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
- while((pdu = rpc->outqueue) != NULL) {
+ while((pdu = rpc->outqueue.head) != NULL) {
pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
- SLIST_REMOVE(&rpc->outqueue, pdu);
+ LIBNFS_LIST_REMOVE(&rpc->outqueue.head, pdu);
rpc_free_pdu(rpc, pdu);
}
- while((pdu = rpc->waitpdu) != NULL) {
- pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
- SLIST_REMOVE(&rpc->waitpdu, pdu);
- rpc_free_pdu(rpc, pdu);
+
+ for (i = 0; i < HASHES; i++) {
+ struct rpc_queue *q = &rpc->waitpdu[i];
+
+ while((pdu = q->head) != NULL) {
+ pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
+ LIBNFS_LIST_REMOVE(&q->head, pdu);
+ rpc_free_pdu(rpc, pdu);
+ }
}
rpc_free_all_fragments(rpc);
@@ -180,11 +255,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
rpc->auth =NULL;
if (rpc->fd != -1) {
-#if defined(WIN32)
- closesocket(rpc->fd);
-#else
close(rpc->fd);
-#endif
}
if (rpc->encodebuf != NULL) {
@@ -202,6 +273,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
rpc->udp_dest = NULL;
}
+ rpc->magic = 0;
free(rpc);
}