Changeset 4617

Timestamp:

Jul 26, 2005, 5:48:00 PM (21 years ago)

Author:

jhoblitt

Message:

add endpoint paremeter to nebServerAlloc()

Location:

trunk/Nebulous/nebclient/src

Files:

• nebclient.c (modified) (7 diffs)
• nebclient.h (modified) (2 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.25 2005-07-09 02:06:17 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.26 2005-07-27 03:48:00 jhoblitt Exp $
  */
 
@@ -35 +35 @@
 static bool nebNukeFile(nebServer *server, const char *filename);
 
-nebServer *nebServerAlloc(void)
+nebServer *nebServerAlloc(const char *endpoint)
 {
     nebServer       *server;
 
     server          = xmalloc(sizeof(nebServer));
+
+    if (endpoint) {
+        server->endpoint = xmalloc(strlen(endpoint) + 1);
+        strcpy(server->endpoint, endpoint);
+    } else {
+        server->endpoint = NULL;
+    }
+
     server->soap    = xmalloc(sizeof(struct soap));
     server->err_buf = xmalloc(ERRBUF_SIZE);
@@ -54 +62 @@
     soap_done(server->soap); // detach the gSOAP environment
 
+    nebFree(server->endpoint);
     nebFree(server->soap);
     nebFree(server->err_buf);
@@ -71 +80 @@
     }
 
-    if (soap_call_ns1__create_USCOREobject(server->soap, NULL, NULL, 
+    if (soap_call_ns1__create_USCOREobject(server->soap, server->endpoint, NULL,
             (char *)key, class, (char *)volume, (char *)comment, 
             (char **)&response) != SOAP_OK) {
@@ -110 +119 @@
     int             sourceFH, destFH;
 
-    if (soap_call_ns1__replicate_USCOREobject(server->soap, NULL, NULL,
-            (char *)key, (char *)volume, (char **)&response) != SOAP_OK) {
+    if (soap_call_ns1__replicate_USCOREobject(server->soap, server->endpoint,
+            NULL, (char *)key, (char *)volume, (char **)&response) != SOAP_OK) {
         nebSetServerErr(server);
 
@@ -209 +218 @@
 
     // FIXME is this leaking memory when response goes out of scope?
-    if (soap_call_ns1__find_USCOREinstances(server->soap, NULL, NULL,
-            (char *)key, (char *)volume, &response) != SOAP_OK) {
+    if (soap_call_ns1__find_USCOREinstances(server->soap, server->endpoint,
+            NULL, (char *)key, (char *)volume, &response) != SOAP_OK) {
         nebSetServerErr(server);
         return -1;
@@ -378 +387 @@
     }
 
-    if (soap_call_ns1__delete_USCOREinstance(server->soap, NULL, NULL, (char *)URI, &response) != SOAP_OK) {
+    if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint,
+            NULL, (char *)URI, &response) != SOAP_OK) {
         nebFree(filename);
 

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.19 2005-07-08 21:32:18 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.20 2005-07-27 03:48:00 jhoblitt Exp $
  */
 
@@ -19 +19 @@
     char            *err_buf;
     size_t          err_buf_size;
+    char            *endpoint;
 } nebServer;
 
-nebServer *nebServerAlloc(void);
+nebServer *nebServerAlloc(const char *endpoint);
 
 void nebServerCleanup(nebServer *server);