diff options
| author | Florian Dold <florian.dold@gmail.com> | 2014-04-09 14:24:05 +0000 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2014-04-09 14:24:05 +0000 |
| commit | bf70109eeeb1515ffdf34deb0551700b3b6d203f (patch) | |
| tree | e85771af80663cb5c3971a5fcb4157d563642473 | |
| parent | 9cc1f4261d7bf6f8209b1bf747f7059d4bf52c3d (diff) | |
| download | gnunet-java-ext-bf70109eeeb1515ffdf34deb0551700b3b6d203f.tar.gz gnunet-java-ext-bf70109eeeb1515ffdf34deb0551700b3b6d203f.zip | |
resolve message type clash
| -rw-r--r-- | src/main/java/org/gnunet/ext/GreetingRequestMessage.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/gnunet/ext/GreetingResponseMessage.java | 2 | ||||
| -rw-r--r-- | src/main/resources/org/gnunet/construct/MsgMap.txt | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/gnunet/ext/GreetingRequestMessage.java b/src/main/java/org/gnunet/ext/GreetingRequestMessage.java index eac18d5..2356639 100644 --- a/src/main/java/org/gnunet/ext/GreetingRequestMessage.java +++ b/src/main/java/org/gnunet/ext/GreetingRequestMessage.java | |||
| @@ -10,7 +10,7 @@ import org.gnunet.util.GnunetMessage; | |||
| 10 | * | 10 | * |
| 11 | * @author Florian Dold | 11 | * @author Florian Dold |
| 12 | */ | 12 | */ |
| 13 | @UnionCase(42001) | 13 | @UnionCase(43001) |
| 14 | public class GreetingRequestMessage implements GnunetMessage.Body { | 14 | public class GreetingRequestMessage implements GnunetMessage.Body { |
| 15 | @ZeroTerminatedString | 15 | @ZeroTerminatedString |
| 16 | public String name; | 16 | public String name; |
diff --git a/src/main/java/org/gnunet/ext/GreetingResponseMessage.java b/src/main/java/org/gnunet/ext/GreetingResponseMessage.java index 89c463d..837fef9 100644 --- a/src/main/java/org/gnunet/ext/GreetingResponseMessage.java +++ b/src/main/java/org/gnunet/ext/GreetingResponseMessage.java | |||
| @@ -9,7 +9,7 @@ import org.gnunet.util.GnunetMessage; | |||
| 9 | * | 9 | * |
| 10 | * @author Florian Dold | 10 | * @author Florian Dold |
| 11 | */ | 11 | */ |
| 12 | @UnionCase(42002) | 12 | @UnionCase(43002) |
| 13 | public class GreetingResponseMessage implements GnunetMessage.Body { | 13 | public class GreetingResponseMessage implements GnunetMessage.Body { |
| 14 | @ZeroTerminatedString | 14 | @ZeroTerminatedString |
| 15 | public String greeting; | 15 | public String greeting; |
diff --git a/src/main/resources/org/gnunet/construct/MsgMap.txt b/src/main/resources/org/gnunet/construct/MsgMap.txt index 9bd0911..3c7b423 100644 --- a/src/main/resources/org/gnunet/construct/MsgMap.txt +++ b/src/main/resources/org/gnunet/construct/MsgMap.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | org.gnunet.util.GnunetMessage$Body|42001=org.gnunet.ext.GreetingRequestMessage | 1 | org.gnunet.util.GnunetMessage$Body|43002=org.gnunet.ext.GreetingResponseMessage |
| 2 | org.gnunet.util.GnunetMessage$Body|42003=org.gnunet.ext.GreetingBannedMessage | 2 | org.gnunet.util.GnunetMessage$Body|42003=org.gnunet.ext.GreetingBannedMessage |
| 3 | org.gnunet.util.GnunetMessage$Body|42002=org.gnunet.ext.GreetingResponseMessage | 3 | org.gnunet.util.GnunetMessage$Body|43001=org.gnunet.ext.GreetingRequestMessage |
| 4 | # generated 2014/04/09 16:18:53 | 4 | # generated 2014/04/09 16:23:55 |