now works with the latest gnunet-java again, added example service and corresponding client

12 files changed, 228 insertions, 3 deletions

diff --git a/bin/gnunet-ext b/bin/gnunet-ext
index e0146f6..8b9a826 100755
--- a/bin/gnunet-ext
+++ b/bin/gnunet-ext
@@ -5,6 +5,7 @@
 BASEDIR=`dirname $0`/..
 
 source $BASEDIR/envcfg
+CP="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*"
 
-java -ea -cp "$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" org.gnunet.ext.MyExt "$@"
+java -ea -cp "$CP" org.gnunet.ext.MyExt "$@"
 
diff --git a/bin/gnunet-greeting b/bin/gnunet-greeting
new file mode 100755
index 0000000..b814b53
--- /dev/null
+++ b/bin/gnunet-greeting
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Template for a gnunet-java extension. Modify to fit your needs.
+
+BASEDIR=`dirname $0`/..
+
+source $BASEDIR/envcfg
+
+java -ea -cp "$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" org.gnunet.ext.GreetingClient "$@"
+
diff --git a/bin/gnunet-service-greeting b/bin/gnunet-service-greeting
new file mode 100755
index 0000000..7b2dede
--- /dev/null
+++ b/bin/gnunet-service-greeting
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Template for a gnunet-java extension. Modify to fit your needs.
+
+BASEDIR=`dirname $0`/..
+
+source $BASEDIR/envcfg
+
+java -ea -cp "$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" org.gnunet.ext.GreetingService "$@"
+
diff --git a/config/greeting.conf b/config/greeting.conf
new file mode 100644
index 0000000..d4a01c5
--- /dev/null
+++ b/config/greeting.conf
@@ -0,0 +1,12 @@
+[greeting]
+PORT = 3001
+HOSTNAME = localhost
+ACCEPT_FROM = 127.0.0.1
+# names that the greeting service won't greet!
+BANNED = "dold;Florian Dold"
+# message for banned entities
+BAN_MESSAGE = "%s, you are not welcome here!"
+BINARY = gnunet-service-greeting
+CONFIG = $DEFAULTCONFIG
+PIPECONTROL = YES
+OPTIONS = -LDEBUG
diff --git a/envcfg b/envcfg
index d982fc9..ae5e782 100755
--- a/envcfg
+++ b/envcfg
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # location the the gnunet-java-jar
-GNUNET_JAVA_CLASSPATH=      # e.g. /home/<your-name>/gnunet-java/gnunet-java.jar
+#GNUNET_JAVA_CLASSPATH=      # e.g. /home/<your-name>/gnunet-java/gnunet-java.jar
+GNUNET_JAVA_CLASSPATH="/home/dold/svn/gnunet-java/gnunet-java.jar"
 
 # location of gnunet-java's lib directory
-GNUNET_JAVA_DEPS=      # e.g. /home/<your-name>/gnunet-java/lib/
+#GNUNET_JAVA_DEPS=      # e.g. /home/<your-name>/gnunet-java/lib/
+GNUNET_JAVA_DEPS="/home/dold/svn/gnunet-java/lib/"
diff --git a/src/org/gnunet/construct/MsgMap.txt b/src/org/gnunet/construct/MsgMap.txt
new file mode 100644
index 0000000..0a8e7dc
--- /dev/null
+++ b/src/org/gnunet/construct/MsgMap.txt
@@ -0,0 +1,4 @@
+org.gnunet.util.GnunetMessage$Body|42003=org.gnunet.ext.GreetingBannedMessage
+org.gnunet.util.GnunetMessage$Body|42002=org.gnunet.ext.GreetingResponseMessage
+org.gnunet.util.GnunetMessage$Body|42001=org.gnunet.ext.GreetingRequestMessage
+# generated 2012/08/29 02:16:37
diff --git a/src/org/gnunet/ext/GreetingBannedMessage.java b/src/org/gnunet/ext/GreetingBannedMessage.java
new file mode 100644
index 0000000..06a5289
--- /dev/null
+++ b/src/org/gnunet/ext/GreetingBannedMessage.java
@@ -0,0 +1,16 @@
+package org.gnunet.ext;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Message sent by the server when the requested name for the greeting is banned.
+ *
+ * @author Florian Dold
+ */
+@UnionCase(42003)
+public class GreetingBannedMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String banText;
+}
diff --git a/src/org/gnunet/ext/GreetingClient.java b/src/org/gnunet/ext/GreetingClient.java
new file mode 100644
index 0000000..c390b0f
--- /dev/null
+++ b/src/org/gnunet/ext/GreetingClient.java
@@ -0,0 +1,59 @@
+package org.gnunet.ext;
+
+import org.gnunet.util.*;
+import org.gnunet.util.getopt.Argument;
+import org.gnunet.util.getopt.ArgumentAction;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class GreetingClient {
+    public static void main(String[] args) {
+        new Program(args) {
+            @Argument(
+                    action = ArgumentAction.STORE_STRING,
+                    argumentName = "name",
+                    description = "name to greet",
+                    shortname = "n",
+                    longname = "name")
+            String name;
+
+            public void run() {
+                if (name == null) {
+                    System.out.println("no name given");
+                    System.exit(2);
+                }
+                final Client client = new Client("greeting", getConfiguration());
+                GreetingRequestMessage m = new GreetingRequestMessage();
+                m.name = name;
+                client.transmitWhenReady(RelativeTime.SECOND, m, new Continuation() {
+                    @Override
+                    public void cont(boolean success) {
+                        if (success) {
+                            client.receive(RelativeTime.SECOND, new RunaboutMessageReceiver() {
+                                public void visit(GreetingResponseMessage m) {
+                                    System.out.println("you were greeted:");
+                                    System.out.println(m.greeting);
+                                }
+                                public void visit(GreetingBannedMessage m) {
+                                    System.out.println("you are banned:");
+                                    System.out.println(m.banText);
+                                }
+                                @Override
+                                public void handleError() {
+                                    System.out.println("could not receive from service");
+                                    System.exit(1);
+                                }
+                            });
+                        } else {
+                            System.out.println("could not send to service");
+                            System.exit(1);
+                        }
+                    }
+                });
+            }
+        }.start();
+    }
+}
diff --git a/src/org/gnunet/ext/GreetingRequestMessage.java b/src/org/gnunet/ext/GreetingRequestMessage.java
new file mode 100644
index 0000000..eac18d5
--- /dev/null
+++ b/src/org/gnunet/ext/GreetingRequestMessage.java
@@ -0,0 +1,17 @@
+package org.gnunet.ext;
+
+import org.gnunet.construct.Union;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Message to request a greeting from the greeting server.
+ *
+ * @author Florian Dold
+ */
+@UnionCase(42001)
+public class GreetingRequestMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String name;
+}
diff --git a/src/org/gnunet/ext/GreetingResponseMessage.java b/src/org/gnunet/ext/GreetingResponseMessage.java
new file mode 100644
index 0000000..89c463d
--- /dev/null
+++ b/src/org/gnunet/ext/GreetingResponseMessage.java
@@ -0,0 +1,16 @@
+package org.gnunet.ext;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Response to a greeting request from a client, sent by the server if name is not banned.
+ *
+ * @author Florian Dold
+ */
+@UnionCase(42002)
+public class GreetingResponseMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String greeting;
+}
diff --git a/src/org/gnunet/ext/GreetingService.java b/src/org/gnunet/ext/GreetingService.java
new file mode 100644
index 0000000..4c917e6
--- /dev/null
+++ b/src/org/gnunet/ext/GreetingService.java
@@ -0,0 +1,58 @@
+package org.gnunet.ext;
+
+import org.gnunet.util.RelativeTime;
+import org.gnunet.util.Server;
+import org.gnunet.util.Service;
+import org.gnunet.util.getopt.Argument;
+import org.gnunet.util.getopt.ArgumentAction;
+
+import javax.swing.*;
+import java.util.*;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class GreetingService {
+
+    public static void main(String... argv) {
+        new Service("greeting", RelativeTime.FOREVER, true, argv) {
+            @Argument(
+                action = ArgumentAction.STORE_STRING,
+                argumentName = "GREETING_TEMPLATE",
+                description = "Template for the greeting, '%s' is substituted for the name!",
+                shortname = "g",
+                longname = "greeting")
+            String greetingTemplate = "Hello, %s";
+
+            @Override
+            public void run() {
+                final String bannedStr = getConfiguration().getValueString("greeting", "BANNED");
+                final String banMessage = getConfiguration().getValueString("greeting", "BAN_MESSAGE");
+                final List<String> banned;
+                if (bannedStr != null) {
+                    banned = Arrays.asList(bannedStr.split(";"));
+                } else {
+                    banned = Collections.emptyList();
+                }
+
+                getServer().setHandler(new Server.MessageRunabout() {
+                    public void visit(GreetingRequestMessage rm) {
+                        if (banned.contains(rm.name.trim())) {
+                            GreetingBannedMessage m = new GreetingBannedMessage();
+                            m.banText = banMessage == null ? "" : banMessage.replace("%s", rm.name);
+                            getSender().transmitWhenReady(RelativeTime.FOREVER, m, null);
+                        } else {
+                            GreetingResponseMessage m = new GreetingResponseMessage();
+                            m.greeting = greetingTemplate.replace("%s", rm.name);
+                            getSender().transmitWhenReady(RelativeTime.FOREVER, m, null);
+                        }
+                    }
+                });
+
+            }
+        }.start();
+
+    }
+}
diff --git a/tools/update-msgtypes b/tools/update-msgtypes
new file mode 100755
index 0000000..a294ce5
--- /dev/null
+++ b/tools/update-msgtypes
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+SOURCES=$( mktemp "/tmp/gnunet-java-sources-XXX" )
+
+source $BASEDIR/envcfg
+
+CP="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*"
+
+# collect all source files
+find $BASEDIR/src/ $BASEDIR/test/ -name "*.java" > $SOURCES
+
+# run annotation processor
+javac -cp $CP -processor org.gnunet.construct.MessageIdAnnotationProcessor -proc:only -s src @$SOURCES
+
+if [ $? ] ; then
+    rm $SOURCES
+else
+    exit 1
+fi