From 9ab98fb29cffdb6d9ff7b4cf988705b291423114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 7 Apr 2010 14:27:36 +0000 Subject: new receiver callback: chunk2list has to be handled by client svn path=/trunk/externals/iem/iemnet/; revision=13391 --- tcpserver.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tcpserver.c') diff --git a/tcpserver.c b/tcpserver.c index fef0c65..b1b5042 100644 --- a/tcpserver.c +++ b/tcpserver.c @@ -63,10 +63,10 @@ typedef struct _tcpserver t_int x_port; int x_defaulttarget; /* the default connection to send to; 0=broadcast; >0 use this client; <0 exclude this client */ - t_iemnet_floatlist*x_floatlist; + t_iemnet_floatlist *x_floatlist; } t_tcpserver; -static void tcpserver_receive_callback(void*x, t_iemnet_chunk*,int argc, t_atom*argv); +static void tcpserver_receive_callback(void*x, t_iemnet_chunk*); static t_tcpserver_socketreceiver *tcpserver_socketreceiver_new(t_tcpserver *owner, int sockfd, struct sockaddr_in*addr) { @@ -460,16 +460,14 @@ static void tcpserver_disconnect_all(t_tcpserver *x) /* ---------------- main tcpserver (receive) stuff --------------------- */ static void tcpserver_receive_callback(void *y0, - t_iemnet_chunk*c, - int argc, t_atom*argv) { + t_iemnet_chunk*c) { t_tcpserver_socketreceiver *y=(t_tcpserver_socketreceiver*)y0; t_tcpserver*x=NULL; if(NULL==y || NULL==(x=y->sr_owner))return; - if(argc) { + if(c) { tcpserver_info_connection(x, y); - x->x_floatlist=iemnet__chunk2list(c, x->x_floatlist); - + x->x_floatlist=iemnet__chunk2list(c, x->x_floatlist); // get's destroyed in the dtor iemnet__streamout(x->x_msgout, x->x_floatlist->argc, x->x_floatlist->argv); } else { // disconnected @@ -624,7 +622,7 @@ static void tcpserver_free(t_tcpserver *x) sys_rmpollfn(x->x_connectsocket); sys_closesocket(x->x_connectsocket); } - if(x->x_floatlist)iemnet__floatlist_destroy(x->x_floatlist); + if(x->x_floatlist)iemnet__floatlist_destroy(x->x_floatlist);x->x_floatlist=NULL; } IEMNET_EXTERN void tcpserver_setup(void) -- cgit v1.2.1