Changeset 2521

Timestamp:

09/11/07 01:58:48 (1 year ago)

Author:

gcobb

Message:

Create new configuration file syntax

Files:

• plugins/gpe/src/gpe-sync (modified) (2 diffs)
• plugins/gpe/src/gpe_sync.c (modified) (1 diff)
• plugins/gpe/src/gpe_sync.h (modified) (2 diffs)
• plugins/gpe/src/gpe_xml.c (modified) (3 diffs)
• plugins/gpe/src/gpesync_client.c (modified) (7 diffs)
• plugins/gpe/src/gpesync_client.h (modified) (2 diffs)

plugins/gpe/src/gpe-sync

@@ -3 +3 @@
-        
-        1) You can use gpesyncd locally (if opensync is running
-:
+ the <local>...</local> option.
-
-<use_local>1</use_local
-<use_ssh>0</use_ssh>
+In this case you can specify <command>shell command</command
+to change the shell command which is invoked.
-
-In this case, no other tags are us
+Specifying the <command> tag is not recommend
-
-
+
+
-
-
-
-
-
+
+
-
-        Note that the handheld_ip can be a name or an address and may be
@@ -24 +23 @@
-        should be specified as "user".
-
-3) You can connect to a running gpesyncd daemon by specifying:
+Specifying the <command> tag is not recommended.
-
-<use_local>0</use_local>
-use_ssh>0</use_ssh>
+3) You can connect to a running gpesyncd daemon by specifying the
+remote>...</remote> option.
-
-        In this case, the <handheld_ip> and <handheld_port> tags are used.
-
+  Either use the <ssh> configuration shown below or remove it and uncomment
+  one of the other sections.  Each section is configured to show the default values
+  used if the tags are not specified. 
-  -->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</config>

plugins/gpe/src/gpe_sync.c

@@ -39 +39 @@
-          char *client_err;
-          if (env->use_local) {
-
+env->command, 
-          }
-          else if (env->use_ssh)
-            {
-              gchar *path = g_strdup_printf ("%s@%s", env->username, env->device_addr);
-
+env->command, 
-            }
-          else

plugins/gpe/src/gpe_sync.h

@@ -39 +39 @@
-// this is needed for gpe_xml.c:
-#include <libxml/parser.h>
+#include <libxml/xpath.h>
-
-#include "gpesync_client.h"
@@ -62 +63 @@
-        char *device_addr; // the ip of the handheld;
-        char *username; // The user on the handheld
+        char *command; // Command to run
-        int device_port;
-        int use_ssh;
-        int use_local;
+        int use_remote;
-        
-        int debuglevel;

plugins/gpe/src/gpe_xml.c

@@ -2 +2 @@
- * gpe-sync - A plugin for the opensync framework
- * Copyright (C) 2005  Martin Felis <martin@silef.de>
+ * Copyright (C) 2007  Graham R. Cobb <g+opensync@cobb.uk.net>
- * 
- * This library is free software; you can redistribute it and/or
@@ -24 +25 @@
-osync_bool gpe_parse_settings(gpe_environment *env, const char *data)
-{
-
-
+
+
+
+
-
-        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p)", __func__, env, data);
-
-        // Set the defaults
-
-
+
-        env->device_port = 6446;
-
-
-
+
+
+
+
+
+
+
+
-
-        doc = xmlParseMemory(data, strlen(data)+1);
@@ -43 +50 @@
-          return FALSE;
-        }
-        
-        cur = xmlDocGetRootElement(doc);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
+        if (obj) xmlXPathFreeObject(obj);
+        obj = xmlXPathEval("//command/text()", ctx);
+        if (obj && obj->nodesetval && obj->nodesetval->nodeNr) {
+          if (!(env->use_local || env->use_ssh)) {
+            osync_trace(TRACE_ERROR, "GPE-SYNC %s: <command> should only be specified in <local> or <ssh> sections", __func__);
+          }
+          g_free(env->username);
+          xmlChar *str=xmlXPathCastToString(obj);
+          env->command = g_strdup(str);
+          xmlFree(str);
+          osync_trace(TRACE_INTERNAL, "GPE-SYNC %s: <command> = %s", __func__, env->command);
+        }
+
+        if (obj) xmlXPathFreeObject(obj);
+        obj = xmlXPathEval("//handheld_port/text()", ctx);
+        if (obj && obj->nodesetval && obj->nodesetval->nodeNr) {
+          if (!(env->use_remote)) {
+            osync_trace(TRACE_ERROR, "GPE-SYNC %s: <handheld_port> should only be specified in <remote> section", __func__);
+          }
+          xmlChar *str=xmlXPathCastToString(obj);
+          env->device_port = atoi(str);
+          xmlFree(str);
+          osync_trace(TRACE_INTERNAL, "GPE-SYNC %s: <handheld_port> = %d", __func__, env->device_port);
+        }
+
+        if (obj) xmlXPathFreeObject(obj);
+        obj = xmlXPathEval("//debug/text()", ctx);
+        if (obj && obj->nodesetval && obj->nodesetval->nodeNr) {
+          xmlChar *str=xmlXPathCastToString(obj);
+          env->debuglevel = atoi(str);
+          xmlFree(str);
+          osync_trace(TRACE_INTERNAL, "GPE-SYNC %s: <debug> = %d", __func__, env->debuglevel);
+        }
+
+        if (obj) xmlXPathFreeObject(obj);
+        xmlXPathFreeContext(ctx);
-        xmlFreeDoc(doc);
+        xmlCleanupParser();
-        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);
-        return TRUE;
+ error:
+        if (obj) xmlXPathFreeObject(obj);
+        if (ctx) xmlXPathFreeContext(ctx);
+        if (doc) xmlFreeDoc(doc);
+        xmlCleanupParser();
+        return FALSE;
-}

plugins/gpe/src/gpesync_client.c

@@ -1 +1 @@
-/*
- * Copyright (C) 2005 Martin Felis <martin@silef.de>
+ * Copyright (C) 2007  Graham R. Cobb <g+opensync@cobb.uk.net>
- *
- * This program is free software; you can redistribute it and/or
@@ -223 +224 @@
-
-gpesync_client *
-
+const char * command, 
-{
-  gpesync_client *ctx;
-  gchar *hostname = NULL;
-  gchar *username = NULL;
-
+, *str2
-  gchar *p;
+#define MAXARGS 20
+  char *argv[MAXARGS+1];
+  int i;
-
-  int in_fds[2], out_fds[2];
@@ -251 +255 @@
-  if (username == NULL)
-    username = (gchar *) g_get_user_name ();
+
+  /* Assemble argument list for exec */
+  str2 = g_strdup(command);
+  argv[0] = "ssh";
+  argv[1] = "-l";
+  argv[2] = username;
+  argv[3] = hostname;
+  i=3; p=str2;
+  while (i++ < MAXARGS && p && *p != 0) {
+    argv[i] = p;
+    /* Look for the next space */
+    p = strchr(p, ' ');
+    if (!p) break;
+    p[0]=0; // Null terminate argument
+    while (*++p==' ') ; // Skip blanks
+  }
+  argv[i] = NULL;
-
-  ctx = g_malloc0 (sizeof (gpesync_client));
@@ -268 +289 @@
-      close (in_fds[0]);
-      if (verbose)
-
-
-
+
+
-      perror ("exec");
-    }
@@ -284 +304 @@
- 
-  g_free (str);
-
+
+
-  return ctx;
-}
-
-gpesync_client *
-
+const char * command, 
-{
-  gpesync_client *ctx;
+  gchar *str2, *p;
+  char *argv[MAXARGS+1];
+  int i;
-
-  int in_fds[2], out_fds[2];
-  pid_t pid;
+
+  /* Assemble argument list for exec */
+  str2 = g_strdup(command);
+  i=-1; p=str2;
+  while (i++ < MAXARGS && p && *p != 0) {
+    argv[i] = p;
+    /* Look for the next space */
+    p = strchr(p, ' ');
+    if (!p) {i++; break;}
+    p[0]=0; // Null terminate argument
+    while (*++p==' ') ; // Skip blanks
+  }
+  argv[i] = NULL;
-
-  ctx = g_malloc0 (sizeof (gpesync_client));
@@ -313 +350 @@
-      if (verbose)
-        fprintf (stderr, "connecting to gpesyncd locally");
-
-
+
-      perror ("exec");
-    }
@@ -320 +356 @@
-  close (out_fds[0]);
-  close (in_fds[1]);
+
+  g_free (str2);
-
-  ctx->outfd = out_fds[1];

plugins/gpe/src/gpesync_client.h

@@ -1 +1 @@
-/*
- * Copyright (C) 2005 Martin Felis <martin@silef.de>
+ * Copyright (C) 2007  Graham R. Cobb <g+opensync@cobb.uk.net>
- *
- * This program is free software; you can redistribute it and/or
@@ -47 +48 @@
- *
- */
-
-
+onst char * command, c
+onst char * command, c
-gpesync_client *gpesync_client_open(const char *addr, int port,  char **errmsg);
-