diff --git a/y_socket_t/Makefile b/y_socket_t/Makefile index bd246b8..50c15ac 100644 --- a/y_socket_t/Makefile +++ b/y_socket_t/Makefile @@ -20,6 +20,9 @@ YSOCKSRC_O=$(YSOCKSRC:.c=.o) YNODESRC=$(PWD)/src/y_socket_t/y_node_t.c YNODESRC_O=$(YNODESRC:.c=.o) +YFILEHANDLERSRC=$(PWD)/src/y_socket_t/y_file_handler.c +YFILEHANDLERSRC_O=$(YFILEHANDLERSRC:.c=.o) + YLISTSRC=$(YLISTDIR)/src/list_t/list_t.c YLISTSRC_O=$(YLISTSRC:.c=.o) @@ -33,7 +36,7 @@ TOPTARGETS := all clean DEPS:=$(YLISTDIR) $(YWORKDIR) -OBJ=$(YSOCKSRC_O) $(YNODESRC_O) $(YLISTSRC_O) $(WORKSRC_0) $(YTASKSRC_0) +OBJ=$(YSOCKSRC_O) $(YNODESRC_O) $(YLISTSRC_O) $(WORKSRC_0) $(YTASKSRC_0) $(YFILEHANDLERSRC_O) $(TOPTARGETS): $(DEPS) @@ -49,12 +52,14 @@ $(PROJECT_LIB): $(OBJ) $(CC) -shared -o $@ $^ $(CFLAGS) -$(YSOCKSRC_O): $(YSOCKSRC) $(YNODESRC_O) +$(YSOCKSRC_O): $(YSOCKSRC) $(YNODESRC_O) $(YFILEHANDLERSRC_O) $(CC) -o $@ -c $< $(CFLAGS) $(YNODESRC_O): $(YNODESRC) $(YLISTSRC_O) $(CC) -o $@ -c $< $(CFLAGS) +$(YFILEHANDLERSRC_O): $(YFILEHANDLERSRC) $(YSOCKSRC_O) + $(CC) -o $@ -c $< $(CFLAGS) $(DEPS): $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/y_socket_t/include/y_socket_t/y_file_handler.h b/y_socket_t/include/y_socket_t/y_file_handler.h index 4ece6f3..4ea9bab 100644 --- a/y_socket_t/include/y_socket_t/y_file_handler.h +++ b/y_socket_t/include/y_socket_t/y_file_handler.h @@ -12,5 +12,7 @@ struct arg_send_file{ }; void* y_socket_send_file_for_all_nodes(void* arg); +void receve_from_node(struct pollfd *fds, char *msg, size_t count); + #endif /*Y_FILE_HANDLER_T_H__C*/ diff --git a/y_socket_t/include/y_socket_t/y_socket_t.h b/y_socket_t/include/y_socket_t/y_socket_t.h index c3994bc..a5f9203 100644 --- a/y_socket_t/include/y_socket_t/y_socket_t.h +++ b/y_socket_t/include/y_socket_t/y_socket_t.h @@ -23,6 +23,7 @@ #include #include "y_socket_t/y_node_t.h" +#include "y_socket_t/y_file_handler.h" #include "y_worker_t/y_worker_t.h" #include "y_worker_t/y_task_t.h" diff --git a/y_socket_t/src/y_socket_t/y_socket_t.c b/y_socket_t/src/y_socket_t/y_socket_t.c index f13390b..f986909 100644 --- a/y_socket_t/src/y_socket_t/y_socket_t.c +++ b/y_socket_t/src/y_socket_t/y_socket_t.c @@ -1,5 +1,4 @@ #include "y_socket_t/y_socket_t.h" -#include "y_socket_t/y_file_handler.h" const int af_array[nbIpVersion]={AF_INET, AF_INET6};