diff options
author | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-05-03 20:04:26 +0000 |
---|---|---|
committer | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-05-03 20:04:26 +0000 |
commit | 4b7fe4b4a5a456cfb6d85021326cb2c1b2665a08 (patch) | |
tree | 463b331b78981974c304fd52516f726a62cde154 /src/social/gnunet-social.c | |
parent | 99806e9c27e62bc4880acfc74ca62cacaaa7db47 (diff) | |
download | gnunet-4b7fe4b4a5a456cfb6d85021326cb2c1b2665a08.tar.gz gnunet-4b7fe4b4a5a456cfb6d85021326cb2c1b2665a08.zip |
make gnunet-social.c build: resolve listen() collision
Diffstat (limited to 'src/social/gnunet-social.c')
-rw-r--r-- | src/social/gnunet-social.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c index 295049fee..e9a5a13b7 100644 --- a/src/social/gnunet-social.c +++ b/src/social/gnunet-social.c | |||
@@ -62,7 +62,7 @@ static char *op_history_replay_latest; | |||
62 | static char *place; | 62 | static char *place; |
63 | 63 | ||
64 | /** --listen */ | 64 | /** --listen */ |
65 | static int listen; | 65 | static int flag_listen; |
66 | 66 | ||
67 | /** --method */ | 67 | /** --method */ |
68 | static char *method; | 68 | static char *method; |
@@ -117,7 +117,7 @@ main (int argc, char *const *argv) | |||
117 | 117 | ||
118 | {'l', "listen", NULL, | 118 | {'l', "listen", NULL, |
119 | gettext_noop ("listen for incoming messages"), | 119 | gettext_noop ("listen for incoming messages"), |
120 | GNUNET_NO, &GNUNET_GETOPT_set_one, &listen}, | 120 | GNUNET_NO, &GNUNET_GETOPT_set_one, &flag_listen}, |
121 | 121 | ||
122 | {'m', "method", "METHOD_NAME", | 122 | {'m', "method", "METHOD_NAME", |
123 | gettext_noop ("method name to transmit"), | 123 | gettext_noop ("method name to transmit"), |
@@ -125,11 +125,11 @@ main (int argc, char *const *argv) | |||
125 | 125 | ||
126 | {'d', "data", "DATA", | 126 | {'d', "data", "DATA", |
127 | gettext_noop ("message body to transmit"), | 127 | gettext_noop ("message body to transmit"), |
128 | GNUNET_YES, &GNUNET_GETOPT_set_string, &method}, | 128 | GNUNET_YES, &GNUNET_GETOPT_set_string, &data}, |
129 | 129 | ||
130 | {'p', "prefix", "METHOD_PREFIX", | 130 | {'p', "prefix", "METHOD_PREFIX", |
131 | gettext_noop ("method prefix filter for history replay"), | 131 | gettext_noop ("method prefix filter for history replay"), |
132 | GNUNET_YES, &GNUNET_GETOPT_set_string, &method}, | 132 | GNUNET_YES, &GNUNET_GETOPT_set_string, &prefix}, |
133 | 133 | ||
134 | {'s', "start", NULL, | 134 | {'s', "start", NULL, |
135 | gettext_noop ("start message ID for history replay"), | 135 | gettext_noop ("start message ID for history replay"), |
@@ -141,7 +141,19 @@ main (int argc, char *const *argv) | |||
141 | 141 | ||
142 | {'n', "limit", NULL, | 142 | {'n', "limit", NULL, |
143 | gettext_noop ("number of messages to replay from history"), | 143 | gettext_noop ("number of messages to replay from history"), |
144 | GNUNET_NO, &GNUNET_GETOPT_set_ulong, &end}, | 144 | GNUNET_NO, &GNUNET_GETOPT_set_ulong, &limit}, |
145 | |||
146 | {'C', "host-enter", NULL, | ||
147 | gettext_noop ("create a place for nyms to join"), | ||
148 | GNUNET_NO, &GNUNET_GETOPT_set_one, &op_host_enter}, | ||
149 | |||
150 | /** --host-leave */ | ||
151 | /** --host-announce */ | ||
152 | /** --guest-enter */ | ||
153 | /** --guest-leave */ | ||
154 | /** --guest-talk */ | ||
155 | /** --history-replay */ | ||
156 | /** --history-replay-latest */ | ||
145 | 157 | ||
146 | GNUNET_GETOPT_OPTION_END | 158 | GNUNET_GETOPT_OPTION_END |
147 | }; | 159 | }; |
@@ -152,7 +164,7 @@ main (int argc, char *const *argv) | |||
152 | const char *help = | 164 | const char *help = |
153 | "enter/leave and send/receive messages in places of the social service"; | 165 | "enter/leave and send/receive messages in places of the social service"; |
154 | const char *usage = | 166 | const char *usage = |
155 | "gnunet-social --place <pubkey> --host-enter [--listen]\n" | 167 | "gnunet-social --host-enter [--listen]\n" |
156 | "gnunet-social --place <pubkey> --host-leave\n" | 168 | "gnunet-social --place <pubkey> --host-leave\n" |
157 | "gnunet-social --place <pubkey> --host-announce --method <method_name> --data <message_body>\n" | 169 | "gnunet-social --place <pubkey> --host-announce --method <method_name> --data <message_body>\n" |
158 | "\n" | 170 | "\n" |