diff --git a/main.c b/main.c index ab145a2..52d6f35 100644 --- a/main.c +++ b/main.c @@ -84,12 +84,13 @@ sStartListener(); while (1) { - sGetConnections(&readset); + if (sGetConnections(&readset) != 0x0) { + writeLog(0,"Error: sGetConnections Failed\nShuttown Down\n"); + exit(0x0); + } readSocks = select(highSock+1,&readset,0x0,0x0,&timeout); - writeLog(3,"readSocks: [%i]\n",readSocks); - if (readSocks < 0) { perror("select failed"); exit(0x1); @@ -131,4 +132,4 @@ va_end(ap); return(ret); - } + } /* End writeLog(); */ diff --git a/socket.c b/socket.c index 574bf27..693e074 100644 --- a/socket.c +++ b/socket.c @@ -245,15 +245,23 @@ return(0x0); } /* End sSendPing() */ -int sSendData(myConnections_t *con,char const *data) { +int sSendData(myConnections_t *con,char const * __restrict fmt, ...) { + char data[2048]; + va_list ap; - if (con == 0x0) + if (con == 0x0) { writeLog(1,"Error Sending Data"); + return(0x1); + } else if (con->userInfo.status == -1) { writeLog(3,"User: %s Socket Not Avail\n",con->userInfo.username); return(0x1); } + va_start(ap,fmt); + vsnprintf(&data,2048,fmt,ap); + va_end(ap); + send(con->fd,data,strlen(data),MSG_NOSIGNAL); return(0x0); } diff --git a/tuved.h b/tuved.h index afdde6d..25368e9 100644 --- a/tuved.h +++ b/tuved.h @@ -124,7 +124,7 @@ int sProcessConnections(fd_set *); int sSendPing(time_t); int sCleanConnections(); -int sSendData(myConnections_t *con,char const *data); +int sSendData(myConnections_t *con,char const * __restrict fmt, ...); /* Podz Fucntions */ int podzGetData(myConnections_t *);