Changeset 4504

Timestamp:

Jul 7, 2005, 11:41:15 AM (21 years ago)

Author:

jhoblitt

Message:

rework nebServer struct
rename nebServerInit() -> nebServerAlloc()

Location:

trunk/Nebulous/nebclient/src

Files:

• nebclient.c (modified) (10 diffs)
• nebclient.h (modified) (2 diffs)
• test.c (modified) (6 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.10 2005-07-07 02:08:12 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.11 2005-07-07 21:41:15 jhoblitt Exp $
  */
 
@@ -22 +22 @@
 #include "nebclient.h"
 
-#define ERRBUF_SIZE 255
+#define ERRBUF_SIZE 2048
 
 static off_t nebCopyFile(char *source, char *dest);
@@ -29 +29 @@
 static bool nebNukeFile(const char *filename);
 
-void nebServerInit(nebServer *server)
-{
-    soap_init(server);
+nebServer *nebServerAlloc(void)
+{
+    nebServer       *server;
+
+    server          = xmalloc(sizeof(nebServer));
+    server->soap    = xmalloc(sizeof(struct soap));
+    server->err_msg = xmalloc(ERRBUF_SIZE);
+
+    soap_init(server->soap);
+
+    return server;
 }
 
@@ -40 +48 @@
     const char      **string;
 
-    code   = soap_faultcode(server);
-    string = soap_faultstring(server);
+    code   = soap_faultcode(server->soap);
+    string = soap_faultstring(server->soap);
 
     fault = xmalloc(strlen(*code) + 3 + strlen(*string) + 1);
@@ -51 +59 @@
 void nebServerCleanup(nebServer *server)
 {
-    soap_end(server); // remove deserialized data and clean up
-    soap_done(server); // detach the gSOAP environment
+    soap_end(server->soap); // remove deserialized data and clean up
+    soap_done(server->soap); // detach the gSOAP environment
+
+    nebFree(server->soap);
+    nebFree(server->err_msg);
+    nebFree(server);
 }
 
@@ -61 +73 @@
     int             file;
 
-    if (soap_call_ns1__create_USCOREobject(server, NULL, NULL, key, class, volume, comment, (char **)&response) == SOAP_OK) {
+    if (soap_call_ns1__create_USCOREobject(server->soap, NULL, NULL, key, class, volume, comment, (char **)&response) == SOAP_OK) {
         *URI = xmalloc(strlen((char *)response.result));
         strcpy(*URI, (char *)response.result);
@@ -91 +103 @@
     int             sourceFH, destFH;
 
-    if (soap_call_ns1__replicate_USCOREobject(server, NULL, NULL, (char *)key, (char *)volume, (char **)&response) != SOAP_OK) {
+    if (soap_call_ns1__replicate_USCOREobject(server->soap, NULL, NULL, (char *)key, (char *)volume, (char **)&response) != SOAP_OK) {
         // server error
         return false;
@@ -188 +200 @@
 
     // FIXME is this leaking memory when response goes out of scope?
-    if (soap_call_ns1__find_USCOREinstances(server, NULL, NULL, key, volume, &response) == SOAP_OK) {
+    if (soap_call_ns1__find_USCOREinstances(server->soap, NULL, NULL, key, volume, &response) == SOAP_OK) {
 
         resultElements = response.result->__size;
@@ -261 +273 @@
     if (n < 0) {
         fprintf(stderr, "no instances found\n");
-        nebFree(locations);
 
         return false;
@@ -305 +316 @@
     }
 
-    if (soap_call_ns1__delete_USCOREinstance(server, NULL, NULL, (char *)URI, &response) != SOAP_OK) {
+    if (soap_call_ns1__delete_USCOREinstance(server->soap, NULL, 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.12 2005-07-07 02:08:12 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.13 2005-07-07 21:41:15 jhoblitt Exp $
  */
 
@@ -14 +14 @@
 
 typedef enum { NEB_READ, NEB_WRITE } rw;
-typedef struct soap nebServer;
+typedef struct {
+    struct soap     *soap;
+    char            *err_msg;
+}nebServer;
 
-void nebServerInit(nebServer *server);
+//void nebServerInit(nebServer *server);
+nebServer *nebServerAlloc(void);
 
 char *nebServerErr(nebServer *server);

trunk/Nebulous/nebclient/src/test.c

@@ -4 +4 @@
 
 int main (int argc, char **argv) {
-    nebServer     server;
+    nebServer       *server;
     char            *URI;
     int             fh;
@@ -10 +10 @@
     char            **foo;
 
-    nebServerInit(&server);
+    server = nebServerAlloc();
 
-    fh = nebCreate(&server, argv[1], 0, NULL, NULL, &URI);
+    fh = nebCreate(server, argv[1], 0, NULL, NULL, &URI);
 
     if (fh > 0) {
@@ -25 +25 @@
         printf( "local error\n" );
     } else {
-        printf( "server error: %s\n", nebServerErr(&server) );
+        printf( "server error: %s\n", nebServerErr(server) );
     }
 
-    if (!nebReplicate(&server, argv[1], NULL, NULL)) {
+    if (!nebReplicate(server, argv[1], NULL, NULL)) {
         printf( "replication failed\n" );
     } else {
@@ -34 +34 @@
     }
 
-    if (!nebCull(&server, argv[1])) {
+    if (!nebCull(server, argv[1])) {
         printf( "cull failed\n" );
     } else {
@@ -40 +40 @@
     }
 
-    n = nebFindInstances(&server, argv[1], NULL, &foo);
+    n = nebFindInstances(server, argv[1], NULL, &foo);
     printf( "found %d instances\n", n );
 
-    if (!nebDelete(&server, argv[1])) {
+    if (!nebDelete(server, argv[1])) {
         printf( "delete failed\n" );
     } else {
@@ -49 +49 @@
     }
 
-    n = nebFindInstances(&server, argv[1], NULL, &foo);
+    n = nebFindInstances(server, argv[1], NULL, &foo);
     printf( "found %d instances\n", n );
 
-    nebServerCleanup(&server);
+    nebServerCleanup(server);
 
     exit(0);