update examples to new api

SVN revision: 52847
This commit is contained in:
Mike Blumenkrantz 2010-09-28 09:41:20 +00:00
parent 7b3b888471
commit 1bda1d90af
2 changed files with 11 additions and 17 deletions

View File

@ -49,6 +49,7 @@ _data(void *data, int type, Ecore_Con_Event_Server_Data *ev)
} }
int main() int main()
{ {
Ecore_Con_Server *svr;
eina_init(); eina_init();
ecore_init(); ecore_init();
ecore_con_init(); ecore_con_init();
@ -58,17 +59,11 @@ int main()
gnutls_global_set_log_function(tls_log_func); gnutls_global_set_log_function(tls_log_func);
/* to use a PEM certificate with TLS and SSL3, uncomment the lines below */
/*
if ((!ecore_con_server_ssl_cert_add("server.pem")))
printf("Error loading certificate!\n");
ecore_con_server_connect(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS | ECORE_CON_USE_SSL3 | ECORE_CON_LOAD_CERT, "127.0.0.1", 8080, NULL); if (!(svr = ecore_con_server_connect(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED, "localhost", 8080, NULL)))
*/
/* to use simple tcp with ssl/tls, use this line */
if (!ecore_con_server_connect(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED, "127.0.0.1", 8080, NULL))
exit(1); exit(1);
ecore_con_ssl_server_cafile_add(svr, "/etc/ssl/certs/vsign2.pem");
ecore_con_ssl_server_verify(svr);
/* set event handler for server connect */ /* set event handler for server connect */
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, (Ecore_Event_Handler_Cb)_add, NULL); ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, (Ecore_Event_Handler_Cb)_add, NULL);

View File

@ -18,7 +18,7 @@ _add(void *data, int type, Ecore_Con_Event_Client_Add *ev)
{ {
printf("Client with ip %s connected!\n", ecore_con_client_ip_get(ev->client)); printf("Client with ip %s connected!\n", ecore_con_client_ip_get(ev->client));
ecore_con_client_send(ev->client, "hello!", 6); ecore_con_client_send(ev->client, "hello!", 6);
ecore_con_client_flush(ev->client); // ecore_con_client_flush(ev->client);
ecore_con_client_timeout_set(ev->client, 5); ecore_con_client_timeout_set(ev->client, 5);
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -50,6 +50,7 @@ _data(void *data, int type, Ecore_Con_Event_Client_Data *ev)
} }
int main() int main()
{ {
Ecore_Con_Server *svr;
eina_init(); eina_init();
ecore_init(); ecore_init();
ecore_con_init(); ecore_con_init();
@ -60,16 +61,14 @@ int main()
/* to use a PEM certificate with TLS and SSL3, uncomment the lines below */ /* to use a PEM certificate with TLS and SSL3, uncomment the lines below */
/* if (!(svr = ecore_con_server_add(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS | ECORE_CON_USE_SSL3 | ECORE_CON_LOAD_CERT, "127.0.0.1", 8080, NULL)))
if ((!ecore_con_client_ssl_cert_add("server.pem", NULL, "server.pem")))
printf("Error loading certificate!\n");
ecore_con_server_add(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS | ECORE_CON_USE_SSL3 | ECORE_CON_LOAD_CERT, "127.0.0.1", 8080, NULL);
*/
/* to use simple tcp with ssl/tls, use this line */ /* to use simple tcp with ssl/tls, use this line */
if (!ecore_con_server_add(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_SSL3, "127.0.0.1", 8080, NULL)) // if (!ecore_con_server_add(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_SSL3, "127.0.0.1", 8080, NULL))
exit(1); exit(1);
ecore_con_ssl_server_cert_add(svr, "server.pem");
ecore_con_ssl_server_privkey_add(svr, "server.pem");
/* set event handler for client connect */ /* set event handler for client connect */
ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD, (Ecore_Event_Handler_Cb)_add, NULL); ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD, (Ecore_Event_Handler_Cb)_add, NULL);
/* set event handler for client disconnect */ /* set event handler for client disconnect */