[GNUnet-SVN] r8952 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2009-09-05 15:54:42 -0600 (Sat, 05 Sep 2009)
New Revision: 8952

Added:
   gnunet/src/fs/gnunet-download.c
   gnunet/src/fs/gnunet-search.c
   gnunet/src/fs/gnunet-unindex.c
Modified:
   gnunet/src/fs/Makefile.am
Log:
work on fs binaries

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2009-09-05 21:39:13 UTC (rev 8951)
+++ gnunet/src/fs/Makefile.am   2009-09-05 21:54:42 UTC (rev 8952)
@@ -39,12 +39,12 @@
 
 
 bin_PROGRAMS = \
-  gnunet-publish 
+  gnunet-download \
+  gnunet-publish \
+  gnunet-search \
+  gnunet-unindex 
 # gnunet-directory 
-# gnunet-download 
 # gnunet-pseudonym 
-# gnunet-search
-# gnunet-unindex 
 
 #gnunet_directory_SOURCES = 
 # gnunet-directory.c         
@@ -53,6 +53,12 @@
 #  $(top_builddir)/src/util/libgnunetutil.la 
 #  $(GN_LIBINTL)
 
+gnunet_download_SOURCES =  \
+ gnunet-download.c         
+gnunet_download_LDADD =  \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
 
 gnunet_publish_SOURCES =  \
  gnunet-publish.c         
@@ -61,7 +67,23 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
 
+gnunet_search_SOURCES = \
+ gnunet-search.c         
+gnunet_search_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
+gnunet_unindex_SOURCES = \
+ gnunet-unindex.c         
+gnunet_unindex_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+
+
+
 check_PROGRAMS = \
  test_fs_collection \
  test_fs_directory \

Added: gnunet/src/fs/gnunet-download.c
===================================================================
--- gnunet/src/fs/gnunet-download.c                             (rev 0)
+++ gnunet/src/fs/gnunet-download.c     2009-09-05 21:54:42 UTC (rev 8952)
@@ -0,0 +1,134 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and 
other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file fs/gnunet-download.c
+ * @brief downloading for files on GNUnet
+ * @author Christian Grothoff
+ * @author Krista Bennett
+ * @author James Blackwell
+ * @author Igor Wronsky
+ *
+ * TODO:
+ * - all
+ */
+#include "platform.h"
+#include "gnunet_fs_service.h"
+
+static int ret;
+
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+static struct GNUNET_FS_Handle *ctx;
+
+static struct GNUNET_TIME_Absolute start_time;
+
+static unsigned int anonymity = 1;
+
+
+/**
+ * Called by FS client to give information about the progress of an 
+ * operation.
+ *
+ * @param cls closure
+ * @param info details about the event, specifying the event type
+ *        and various bits about the event
+ * @return client-context (for the next progress call
+ *         for this operation; should be set to NULL for
+ *         SUSPEND and STOPPED events).  The value returned
+ *         will be passed to future callbacks in the respective
+ *         field in the GNUNET_FS_ProgressInfo struct.
+ */
+static void *
+progress_cb (void *cls,
+            const struct GNUNET_FS_ProgressInfo *info)
+{
+  return NULL;
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param sched the scheduler to use
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be 
NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls,
+     struct GNUNET_SCHEDULER_Handle *sched,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  /* FIXME: check arguments */
+  cfg = c;
+  ctx = GNUNET_FS_start (sched,
+                        cfg,
+                        "gnunet-download",
+                        &progress_cb,
+                        NULL);
+  if (NULL == ctx)
+    {
+      fprintf (stderr,
+              _("Could not initialize `%s' subsystem.\n"),
+              "FS");
+      ret = 1;
+      return;
+    }
+  start_time = GNUNET_TIME_absolute_get ();
+  // FIXME: start download
+}
+
+
+/**
+ * gnunet-download command line options
+ */
+static struct GNUNET_GETOPT_CommandLineOption options[] = {
+  {'a', "anonymity", "LEVEL",
+   gettext_noop ("set the desired LEVEL of receiver-anonymity"),
+   1, &GNUNET_GETOPT_set_uint, &anonymity},
+  // FIXME: options!
+  GNUNET_GETOPT_OPTION_END
+};
+
+
+/**
+ * The main function to download GNUnet.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  return (GNUNET_OK ==
+          GNUNET_PROGRAM_run (argc,
+                              argv,
+                              "gnunet-download",
+                              gettext_noop
+                              ("Download files from GNUnet."),
+                              options, &run, NULL)) ? ret : 1;
+}
+
+/* end of gnunet-download.c */
+

Added: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c                               (rev 0)
+++ gnunet/src/fs/gnunet-search.c       2009-09-05 21:54:42 UTC (rev 8952)
@@ -0,0 +1,134 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and 
other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file fs/gnunet-search.c
+ * @brief searching for files on GNUnet
+ * @author Christian Grothoff
+ * @author Krista Bennett
+ * @author James Blackwell
+ * @author Igor Wronsky
+ *
+ * TODO:
+ * - all
+ */
+#include "platform.h"
+#include "gnunet_fs_service.h"
+
+static int ret;
+
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+static struct GNUNET_FS_Handle *ctx;
+
+static struct GNUNET_TIME_Absolute start_time;
+
+static unsigned int anonymity = 1;
+
+
+/**
+ * Called by FS client to give information about the progress of an 
+ * operation.
+ *
+ * @param cls closure
+ * @param info details about the event, specifying the event type
+ *        and various bits about the event
+ * @return client-context (for the next progress call
+ *         for this operation; should be set to NULL for
+ *         SUSPEND and STOPPED events).  The value returned
+ *         will be passed to future callbacks in the respective
+ *         field in the GNUNET_FS_ProgressInfo struct.
+ */
+static void *
+progress_cb (void *cls,
+            const struct GNUNET_FS_ProgressInfo *info)
+{
+  return NULL;
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param sched the scheduler to use
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be 
NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls,
+     struct GNUNET_SCHEDULER_Handle *sched,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  /* FIXME: check arguments */
+  cfg = c;
+  ctx = GNUNET_FS_start (sched,
+                        cfg,
+                        "gnunet-search",
+                        &progress_cb,
+                        NULL);
+  if (NULL == ctx)
+    {
+      fprintf (stderr,
+              _("Could not initialize `%s' subsystem.\n"),
+              "FS");
+      ret = 1;
+      return;
+    }
+  start_time = GNUNET_TIME_absolute_get ();
+  // FIXME: start search
+}
+
+
+/**
+ * gnunet-search command line options
+ */
+static struct GNUNET_GETOPT_CommandLineOption options[] = {
+  {'a', "anonymity", "LEVEL",
+   gettext_noop ("set the desired LEVEL of receiver-anonymity"),
+   1, &GNUNET_GETOPT_set_uint, &anonymity},
+  // FIXME: options!
+  GNUNET_GETOPT_OPTION_END
+};
+
+
+/**
+ * The main function to search GNUnet.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  return (GNUNET_OK ==
+          GNUNET_PROGRAM_run (argc,
+                              argv,
+                              "gnunet-search",
+                              gettext_noop
+                              ("Search GNUnet."),
+                              options, &run, NULL)) ? ret : 1;
+}
+
+/* end of gnunet-search.c */
+

Added: gnunet/src/fs/gnunet-unindex.c
===================================================================
--- gnunet/src/fs/gnunet-unindex.c                              (rev 0)
+++ gnunet/src/fs/gnunet-unindex.c      2009-09-05 21:54:42 UTC (rev 8952)
@@ -0,0 +1,138 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and 
other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file fs/gnunet-unindex.c
+ * @brief unindex files published on GNUnet
+ * @author Christian Grothoff
+ * @author Krista Bennett
+ * @author James Blackwell
+ * @author Igor Wronsky
+ *
+ * TODO:
+ * - progress callback
+ * - error checking
+ */
+#include "platform.h"
+#include "gnunet_fs_service.h"
+
+static int ret;
+
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+static struct GNUNET_FS_Handle *ctx;
+
+static struct GNUNET_FS_UnindexContext *uc;
+
+static struct GNUNET_TIME_Absolute start_time;
+
+
+/**
+ * Called by FS client to give information about the progress of an 
+ * operation.
+ *
+ * @param cls closure
+ * @param info details about the event, specifying the event type
+ *        and various bits about the event
+ * @return client-context (for the next progress call
+ *         for this operation; should be set to NULL for
+ *         SUSPEND and STOPPED events).  The value returned
+ *         will be passed to future callbacks in the respective
+ *         field in the GNUNET_FS_ProgressInfo struct.
+ */
+static void *
+progress_cb (void *cls,
+            const struct GNUNET_FS_ProgressInfo *info)
+{
+  return NULL;
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param sched the scheduler to use
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be 
NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls,
+     struct GNUNET_SCHEDULER_Handle *sched,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  /* check arguments */
+  if ( (args[0] == NULL) || (args[1] != NULL) ) 
+    {
+      printf (_
+              ("You must specify one and only one filename for 
unindexing.\n"));
+      ret = -1;
+      return;
+    }
+  cfg = c;
+  ctx = GNUNET_FS_start (sched,
+                        cfg,
+                        "gnunet-unindex",
+                        &progress_cb,
+                        NULL);
+  if (NULL == ctx)
+    {
+      fprintf (stderr,
+              _("Could not initialize `%s' subsystem.\n"),
+              "FS");
+      ret = 1;
+      return;
+    }
+  start_time = GNUNET_TIME_absolute_get ();
+  uc = GNUNET_FS_unindex (ctx,
+                         args[0]);
+}
+
+
+/**
+ * gnunet-unindex command line options
+ */
+static struct GNUNET_GETOPT_CommandLineOption options[] = {
+  GNUNET_GETOPT_OPTION_END
+};
+
+
+/**
+ * The main function to unindex content.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  return (GNUNET_OK ==
+          GNUNET_PROGRAM_run (argc,
+                              argv,
+                              "gnunet-unindex",
+                              gettext_noop
+                              ("Unindex files."),
+                              options, &run, NULL)) ? ret : 1;
+}
+
+/* end of gnunet-unindex.c */