barbieri pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b38681f72524e2265206b6ec1342dc7da3798f23
commit b38681f72524e2265206b6ec1342dc7da3798f23
Author: Gustavo Sverzut Barbieri <barbi...@profusion.mobi>
Date: Wed Dec 7 13:29:49 2016 -0200
ecore_con_client_example: allow more features and protocols to be used.
Instead of a single SSL connection, allow for local, tcp and udp,
optional flush and delete-after-write (--single-message).
Very similar to ecore_ipc_client_example.c
---
src/examples/ecore/ecore_con_client_example.c | 226 ++++++++++++++++++++++----
1 file changed, 190 insertions(+), 36 deletions(-)
diff --git a/src/examples/ecore/ecore_con_client_example.c
b/src/examples/ecore/ecore_con_client_example.c
index 24c0484..c0c10e5 100644
--- a/src/examples/ecore/ecore_con_client_example.c
+++ b/src/examples/ecore/ecore_con_client_example.c
@@ -8,27 +8,56 @@
#include <stdio.h>
#include <Ecore.h>
#include <Ecore_Con.h>
+#include <Ecore_Getopt.h>
/* Ecore_Con client example
* 2010 Mike Blumenkrantz
*/
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
+static Ecore_Con_Server *svr;
+static int retval = EXIT_SUCCESS;
+static Eina_Bool do_flush = EINA_FALSE;
+static Eina_Bool single_message = EINA_FALSE;
-static void
-tls_log_func(int level, const char *str)
+static Eina_Bool
+_on_stdin(void *data EINA_UNUSED, Ecore_Fd_Handler *fdh EINA_UNUSED)
{
- fprintf(stderr, "|<%d>| %s", level, str);
+ char *line = NULL;
+ size_t len = 0;
+ ssize_t r = getline(&line, &len, stdin);
+
+ if (r < 0)
+ {
+ fprintf(stderr, "ERROR: could not read from stdin: %s\n",
strerror(errno));
+ return ECORE_CALLBACK_CANCEL;
+ }
+
+ if (!svr)
+ fputs("WARNING: not connected to server, ignored input.\n", stderr);
+ else
+ {
+ ecore_con_server_send(svr, line, r);
+ printf("INFO: sent %zd bytes to server.\n", r);
+ if (do_flush) ecore_con_server_flush(svr);
+ if (single_message)
+ {
+ ecore_con_server_del(svr);
+ svr = NULL;
+ ecore_main_loop_quit();
+ }
+ }
+
+ free(line);
+
+ return ECORE_CALLBACK_RENEW;
}
-#endif
Eina_Bool
_add(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Add
*ev)
{
printf("Server with ip %s connected!\n",
ecore_con_server_ip_get(ev->server));
- ecore_con_server_send(ev->server, "hello!", 6);
- ecore_con_server_flush(ev->server);
+ ecore_con_server_send(ev->server, "hello!", strlen("hello!"));
+ if (do_flush) ecore_con_server_flush(ev->server);
return ECORE_CALLBACK_RENEW;
}
@@ -37,6 +66,8 @@ Eina_Bool
_del(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Del
*ev)
{
printf("Lost server with ip %s!\n", ecore_con_server_ip_get(ev->server));
+ ecore_con_server_del(svr);
+ svr = NULL;
ecore_main_loop_quit();
return ECORE_CALLBACK_RENEW;
}
@@ -44,51 +75,157 @@ _del(void *data EINA_UNUSED, int type EINA_UNUSED,
Ecore_Con_Event_Server_Del *e
Eina_Bool
_data(void *data EINA_UNUSED, int type EINA_UNUSED,
Ecore_Con_Event_Server_Data *ev)
{
- char fmt[128];
+ printf("Received %i bytes from server:\n"
+ ">>>>>\n"
+ "%.*s\n"
+ ">>>>>\n",
+ ev->size,
+ ev->size, ev->data);
- snprintf(fmt, sizeof(fmt),
- "Received %i bytes from server:\n"
- ">>>>>\n"
- "%%.%is\n"
- ">>>>>\n",
- ev->size, ev->size);
+ return ECORE_CALLBACK_RENEW;
+}
- printf(fmt, ev->data);
+Eina_Bool
+_write(void *data EINA_UNUSED, int type EINA_UNUSED,
Ecore_Con_Event_Server_Write *ev)
+{
+ printf("Sent %d bytes to server\n", ev->size);
return ECORE_CALLBACK_RENEW;
}
+static const char *types_strs[] = {
+ "tcp",
+ "udp",
+ "ssl",
+ "local-user",
+ "local-system",
+ NULL
+};
+
+static const Ecore_Getopt options = {
+ "ecore_con_client_example", /* program name */
+ NULL, /* usage line */
+ "1", /* version */
+ "(C) 2016 Enlightenment Project; 2010 Mike Blumenkrantz", /* copyright */
+ "BSD 2-Clause", /* license */
+ /* long description, may be multiline and contain \n */
+ "Example of ecore_con_server_connect()\n",
+ EINA_FALSE,
+ {
+ ECORE_GETOPT_CHOICE('t', "type", "Server type to use, defaults to 'tcp'",
types_strs),
+ ECORE_GETOPT_STORE_TRUE('P', "no-proxy", "Do not use SOCKS proxy for
remote connections."),
+
+ ECORE_GETOPT_STORE_TRUE('f', "flush", "Force a flush after every send
call."),
+ ECORE_GETOPT_STORE_TRUE('m', "single-message", "Send a single message and
delete the server."),
+
+ ECORE_GETOPT_VERSION('V', "version"),
+ ECORE_GETOPT_COPYRIGHT('C', "copyright"),
+ ECORE_GETOPT_LICENSE('L', "license"),
+ ECORE_GETOPT_HELP('h', "help"),
+
+ ECORE_GETOPT_STORE_METAVAR_STR(0, NULL, "The server name.", "name"),
+ ECORE_GETOPT_STORE_METAVAR_INT(0, NULL, "The server port.", "port"),
+
+ ECORE_GETOPT_SENTINEL
+ }
+};
+
int
-main()
+main(int argc, char *argv[])
{
- Ecore_Con_Server *svr;
- Eina_Iterator *it;
- const char *ca;
+ char *name = NULL;
+ char *type_choice = NULL;
+ Ecore_Con_Type type;
+ int port = -1;
+ Eina_Bool no_proxy = EINA_FALSE;
+ Eina_Bool quit_option = EINA_FALSE;
+ Ecore_Getopt_Value values[] = {
+ ECORE_GETOPT_VALUE_STR(type_choice),
+ ECORE_GETOPT_VALUE_BOOL(no_proxy),
+
+ ECORE_GETOPT_VALUE_BOOL(do_flush),
+ ECORE_GETOPT_VALUE_BOOL(single_message),
+
+ /* standard block to provide version, copyright, license and help */
+ ECORE_GETOPT_VALUE_BOOL(quit_option), /* -V/--version quits */
+ ECORE_GETOPT_VALUE_BOOL(quit_option), /* -C/--copyright quits */
+ ECORE_GETOPT_VALUE_BOOL(quit_option), /* -L/--license quits */
+ ECORE_GETOPT_VALUE_BOOL(quit_option), /* -h/--help quits */
+
+ /* positional argument */
+ ECORE_GETOPT_VALUE_STR(name),
+ ECORE_GETOPT_VALUE_INT(port),
+
+ ECORE_GETOPT_VALUE_NONE /* sentinel */
+ };
+ int args;
eina_init();
ecore_init();
ecore_con_init();
-#ifdef HAVE_GNUTLS
- gnutls_global_set_log_level(9);
- gnutls_global_set_log_function(tls_log_func);
-#endif
+ args = ecore_getopt_parse(&options, values, argc, argv);
+ if (args < 0)
+ {
+ fputs("ERROR: Could not parse command line options.\n", stderr);
+ retval = EXIT_FAILURE;
+ goto end;
+ }
- if (!(it = eina_file_ls("/etc/ssl/certs")))
- exit(1);
+ if (quit_option) goto end;
- if (!(svr = ecore_con_server_connect(ECORE_CON_REMOTE_TCP |
ECORE_CON_USE_MIXED, "www.verisign.com", 443, NULL)))
- exit(1);
+ args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
+ if (args < 0)
+ {
+ fputs("ERROR: Could not parse positional arguments.\n", stderr);
+ retval = EXIT_FAILURE;
+ goto end;
+ }
+
+ if (!type_choice) type_choice = "tcp";
- /* add all the CAs */
- EINA_ITERATOR_FOREACH(it, ca)
+ if (strcmp(type_choice, "tcp") == 0)
+ type = ECORE_CON_REMOTE_TCP;
+ else if (strcmp(type_choice, "udp") == 0)
+ type = ECORE_CON_REMOTE_UDP;
+ else if (strcmp(type_choice, "ssl") == 0)
+ type = ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED | ECORE_CON_LOAD_CERT;
+ else if (strcmp(type_choice, "local-user") == 0)
+ type = ECORE_CON_LOCAL_USER;
+ else if (strcmp(type_choice, "system") == 0)
+ type = ECORE_CON_LOCAL_SYSTEM;
+ else
{
- if (!ecore_con_ssl_server_cafile_add(svr, ca))
- printf("Could not load CA: %s!\n", ca);
- eina_stringshare_del(ca);
+ fprintf(stderr, "ERROR: unsupported --type/-t '%s'\n", type_choice);
+ retval = EXIT_FAILURE;
+ goto end;
}
- eina_iterator_free(it);
- ecore_con_ssl_server_verify(svr);
+ if (no_proxy) type |= ECORE_CON_NO_PROXY;
+
+ svr = ecore_con_server_connect(type, name, port, NULL);
+ if (!svr) goto end;
+
+ if (strcmp(type_choice, "ssl") == 0)
+ {
+ Eina_Iterator *it;
+ const char *ca;
+ if (!(it = eina_file_ls("/etc/ssl/certs")))
+ {
+ retval = EXIT_FAILURE;
+ goto no_mainloop;
+ }
+
+ /* add all the CAs */
+ EINA_ITERATOR_FOREACH(it, ca)
+ {
+ if (!ecore_con_ssl_server_cafile_add(svr, ca))
+ fprintf(stderr, "WARNING: could not load CA: %s!\n", ca);
+ eina_stringshare_del(ca);
+ }
+
+ eina_iterator_free(it);
+ ecore_con_ssl_server_verify(svr);
+ }
/* set event handler for server connect */
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD,
(Ecore_Event_Handler_Cb)_add, NULL);
@@ -96,8 +233,25 @@ main()
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
(Ecore_Event_Handler_Cb)_del, NULL);
/* set event handler for receiving server data */
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
(Ecore_Event_Handler_Cb)_data, NULL);
+/* set event handler that notifies of sent data */
+ ecore_event_handler_add(ECORE_CON_EVENT_SERVER_WRITE,
(Ecore_Event_Handler_Cb)_write, NULL);
+
+ ecore_main_fd_handler_add(STDIN_FILENO, ECORE_FD_READ, _on_stdin, NULL,
NULL, NULL);
/* start client */
ecore_main_loop_begin();
-}
+ no_mainloop:
+ if (svr)
+ {
+ ecore_con_server_del(svr);
+ svr = NULL;
+ }
+
+end:
+ ecore_con_shutdown();
+ ecore_shutdown();
+ eina_shutdown();
+
+ return retval;
+}
--
