Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/common
Modified Files:
evfs_event_helper.c evfs_io.c
Log Message:
* Total rework of server architecture. Few rough edges still, but it passed
the torture test. Server now instantiates a new worker process for each
client. Cleaner, more secure, and certain elements that shall remain nameless
(*cough* samba) - need it for auth.
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_event_helper.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- evfs_event_helper.c 17 Jul 2006 05:45:38 -0000 1.29
+++ evfs_event_helper.c 11 Aug 2007 10:39:02 -0000 1.30
@@ -74,6 +74,11 @@
}
void
+evfs_auth_failure_event_create(evfs_client * client, evfs_command * command)
+{
+}
+
+void
evfs_file_progress_event_create(evfs_client * client,
evfs_filereference* file_from,
evfs_filereference* file_to,
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_io.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- evfs_io.c 25 Jul 2007 17:00:53 -0000 1.69
+++ evfs_io.c 11 Aug 2007 10:39:02 -0000 1.70
@@ -244,7 +244,7 @@
/*Write "From" file */
data = eet_data_descriptor_encode(_evfs_filemonitor_edd,
&event->file_monitor, &size_ret);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_FILE_MONITOR,
client->id, 0, 0,
@@ -255,7 +255,7 @@
void
evfs_write_stat_event(evfs_client * client, evfs_event * event)
{
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_STAT_SIZE,
client->id, 0, 0,
@@ -280,7 +280,7 @@
data =
eet_data_descriptor_encode(_evfs_filereference_edd, ref, &size_ret);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_FILE_REFERENCE,
client->id,
0,
@@ -301,7 +301,7 @@
for (l = event->misc.string_list; l; ) {
g = l->data;
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_CHAR_PTR,
client->id,
0,
@@ -315,7 +315,7 @@
void
evfs_write_file_read_event(evfs_client * client, evfs_event * event)
{
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_DATA,
client->id, 0, 0,
@@ -332,7 +332,7 @@
eet_data_descriptor_encode(_evfs_metalist_edd, event->meta,
&size_ret);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_METALIST,
client->id, 0, 0,
@@ -353,7 +353,7 @@
eet_data_descriptor_encode(_evfs_progress_event_edd, event->progress,
&size_ret);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_PROGRESS,
client->id, 0, 0,
@@ -365,7 +365,7 @@
ref = ecore_list_first_remove(event->file_list.list);
data = eet_data_descriptor_encode(_evfs_filereference_edd, ref, &size_ret);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_FILE_REFERENCE,
client->id, 0, 0,
@@ -376,7 +376,7 @@
ref = ecore_list_first_remove(event->file_list.list);
data = eet_data_descriptor_encode(_evfs_filereference_edd, ref, &size_ret);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_FILE_REFERENCE,
client->id, 0, 0,
@@ -393,7 +393,7 @@
char *data =
eet_data_descriptor_encode(_evfs_operation_edd, event->op, &size_ret);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_OPERATION,
client->id, 0, 0,
@@ -407,7 +407,7 @@
evfs_event * event)
{
//printf("Sending event type '%d'\n", event->type);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_TYPE,
client->id, 0, 0,
@@ -455,12 +455,15 @@
evfs_write_metadata_groups_event(client,event);
break;
+ case EVFS_EV_AUTH_REQUIRED:
+ break;
+
default:
printf("Event type not handled in switch\n");
break;
}
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_EV_REPLY,
EVFS_EV_PART_END,
client->id, 0, 0,
@@ -721,7 +724,7 @@
{
/*Write the command type structure */
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_COMMAND,
EVFS_COMMAND_TYPE,
client->id, 0, 0,
@@ -729,7 +732,7 @@
sizeof
(evfs_command_type)));
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_COMMAND,
EVFS_COMMAND_EXTRA,
client->id, 0, 0,
@@ -737,7 +740,7 @@
file_command.extra,
sizeof(int)));
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_COMMAND,
EVFS_COMMAND_CLIENTID,
client->id, 0, 0,
@@ -777,6 +780,7 @@
/*Send a final */
evfs_write_command_end_client(client);
+
}
void
@@ -791,7 +795,7 @@
void
evfs_write_command_end_client(evfs_client * client)
{
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_COMMAND,
EVFS_COMMAND_END,
client->id, 0, 0,
@@ -861,7 +865,7 @@
data = eet_data_descriptor_encode(_evfs_filereference_edd, ref, &size);
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_COMMAND,
EVFS_FILE_REFERENCE,
client->id,
0,
@@ -874,7 +878,7 @@
/*If there's a string ref, write it*/
if (command->file_command.ref) {
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->master,
ecore_ipc_message_new(EVFS_COMMAND,
EVFS_COMMAND_PART_FILECOMMAND_REF1,
client->id,0,0,command->file_command.ref,
@@ -882,7 +886,7 @@
}
if (command->file_command.ref2) {
- evfs_write_ecore_ipc_client_message(client->client,
+ evfs_write_ecore_ipc_server_message(client->server,
ecore_ipc_message_new(EVFS_COMMAND,
EVFS_COMMAND_PART_FILECOMMAND_REF2,
client->id,0,0,command->file_command.ref2,
@@ -988,7 +992,7 @@
break;
default:
- printf("Unknown incoming command part\n");
+ printf("Unknown incoming command part - %d\n", message->minor );
break;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
