Some more configure checks for headers

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index 93c3745db446ae57483466401e8ba4ba4b32c647..62a8f81ac96fffa8d2e55f9e76dd2ae2683cd9d5 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 */
+#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 <unistd.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
+#include <assert.h>
+#include <time.h>
 #include "slist.h"
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -34,6 +48,7 @@
 struct rpc_context *rpc_init_context(void)
 {
        struct rpc_context *rpc;
+       static uint32_t salt = 0;
 
        rpc = malloc(sizeof(struct rpc_context));
        if (rpc == NULL) {
@@ -41,6 +56,7 @@ struct rpc_context *rpc_init_context(void)
        }
        memset(rpc, 0, sizeof(struct rpc_context));
 
+       rpc->magic = RPC_CONTEXT_MAGIC;
        rpc->encodebuflen = 65536;
        rpc->encodebuf = malloc(rpc->encodebuflen);
        if (rpc->encodebuf == NULL) {
@@ -48,17 +64,14 @@ struct rpc_context *rpc_init_context(void)
                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);
+       salt += 0x01000000;
        rpc->fd = -1;
 
        return rpc;
@@ -79,10 +92,12 @@ struct rpc_context *rpc_init_udp_context(void)
 
 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 *)auth;
+       rpc->auth = auth;
 }
 
 
@@ -90,6 +105,8 @@ void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 {
         va_list ap;
 
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
        if (rpc->error_string != NULL) {
                free(rpc->error_string);
        }
@@ -101,6 +118,8 @@ void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 
 char *rpc_get_error(struct rpc_context *rpc)
 {
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
        return rpc->error_string;
 }
 
@@ -108,6 +127,8 @@ void rpc_error_all_pdus(struct rpc_context *rpc, char *error)
 {
        struct rpc_pdu *pdu;
 
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
        while((pdu = rpc->outqueue) != NULL) {
                pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data);
                SLIST_REMOVE(&rpc->outqueue, pdu);
@@ -130,6 +151,8 @@ 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;
 
@@ -138,10 +161,12 @@ void rpc_free_all_fragments(struct rpc_context *rpc)
        }
 }
 
-int rpc_add_fragment(struct rpc_context *rpc, char *data, size_t size)
+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;
@@ -163,6 +188,8 @@ void rpc_destroy_context(struct rpc_context *rpc)
 {
        struct rpc_pdu *pdu;
 
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
        while((pdu = rpc->outqueue) != NULL) {
                pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
                SLIST_REMOVE(&rpc->outqueue, pdu);
@@ -180,11 +207,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 +225,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
                rpc->udp_dest = NULL;
        }
 
+       rpc->magic = 0;
        free(rpc);
 }