Browse Source

fix some warnings

release0.1.5
Georg Hopp 12 years ago
parent
commit
a8b362f89d
  1. 2
      configure.ac
  2. 39
      src/server/handle_accept.c
  3. 1
      src/stream/read.c
  4. 1
      src/stream/write.c
  5. 6
      src/taskrambler.c
  6. 7
      src/utils/daemonize.c
  7. 4
      tests/loggerTest.c
  8. 4
      tests/serverTest.c

2
configure.ac

@ -6,7 +6,7 @@ AC_INIT([taskrambler], [0.0.1], [Georg Hopp <georg@steffers.org>])
LT_INIT LT_INIT
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
#AM_INIT_AUTOMAKE([subdir-objects]) #AM_INIT_AUTOMAKE([subdir-objects])
#AM_SILENT_RULES([yes])
AM_SILENT_RULES([yes])
AC_COPYRIGHT([Copyright © 2012 Georg Hopp]) AC_COPYRIGHT([Copyright © 2012 Georg Hopp])
AC_REVISION([$Revision: 0.02 $]) AC_REVISION([$Revision: 0.02 $])
AC_CONFIG_SRCDIR([src/taskrambler.c]) AC_CONFIG_SRCDIR([src/taskrambler.c])

39
src/server/handle_accept.c

@ -46,25 +46,26 @@ serverHandleAccept(Server this, unsigned int i)
acc = socketAccept((0 == i)? this->sock : this->sockSSL, &remoteAddr); acc = socketAccept((0 == i)? this->sock : this->sockSSL, &remoteAddr);
if (-1 != acc->handle) { if (-1 != acc->handle) {
switch(i) {
case 0:
// no SSL
st = new(Stream, STREAM_FD, acc->handle);
break;
case 1:
// SSL
{
SSL * ssl = SSL_new(this->ctx);
SSL_set_fd(ssl, acc->handle);
SSL_accept(ssl);
st = new(Stream, STREAM_SSL, ssl);
}
break;
default:
break;
}
switch(i) {
case 0:
// no SSL
st = new(Stream, STREAM_FD, acc->handle);
break;
case 1:
// SSL
{
SSL * ssl = SSL_new(this->ctx);
SSL_set_fd(ssl, acc->handle);
SSL_accept(ssl);
st = new(Stream, STREAM_SSL, ssl);
}
break;
default:
st = NULL;
break;
}
// save the socket handle // save the socket handle
(this->conns)[acc->handle].sock = acc; (this->conns)[acc->handle].sock = acc;

1
src/stream/read.c

@ -40,6 +40,7 @@ streamRead(Stream this, void * buf, size_t count)
break; break;
default: default:
done = 0;
break; break;
} }

1
src/stream/write.c

@ -40,6 +40,7 @@ streamWrite(Stream this, void * buf, size_t count)
break; break;
default: default:
done = 0;
break; break;
} }

6
src/taskrambler.c

@ -74,8 +74,10 @@ main()
init_signals(); init_signals();
daemonize(); daemonize();
shm = shm_open("/fooshm", O_RDWR|O_CREAT, S_IRWXU);
ftruncate(shm, psize);
shm = shm_open("/fooshm", O_RDWR|O_CREAT, S_IRWXU);
if (-1 == ftruncate(shm, psize)) {
doShutdown = 1;
}
switch((pid = fork())) { switch((pid = fork())) {
case -1: case -1:

7
src/utils/daemonize.c

@ -26,6 +26,7 @@
#include <unistd.h> // for getopt #include <unistd.h> // for getopt
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -56,8 +57,10 @@ void daemonize(void) {
// set umask and change to working directory to / // set umask and change to working directory to /
umask(UMASK); umask(UMASK);
chdir(PWD); // this should root and assets needs to be found
// via some kind of configuration.
if (-1 == chdir(PWD)) { // this should root and assets needs to be found
perror("daemonize"); // via some kind of configuration.
exit(EXIT_FAILURE);
}
// we should close all open filedescriptors now. // we should close all open filedescriptors now.
// But I assume that this function is called at the very start of the // But I assume that this function is called at the very start of the

4
tests/loggerTest.c

@ -80,7 +80,9 @@ testLoggerStderr()
{ {
logger = new(LoggerStderr, LOGGER_ERR); logger = new(LoggerStderr, LOGGER_ERR);
freopen("/dev/null", "w", stderr);
if (NULL == freopen("/dev/null", "w", stderr)) {
return TEST_ERROR;
}
loggerLog(logger, LOGGER_ERR, "foo %d %s", 123, "bar"); loggerLog(logger, LOGGER_ERR, "foo %d %s", 123, "bar");
/** /**

4
tests/serverTest.c

@ -84,7 +84,9 @@ testDummy()
con = new(Sock, logger, TEST_PORT); con = new(Sock, logger, TEST_PORT);
sleep(1); sleep(1);
socketConnect(con, "127.0.0.1", &addr); socketConnect(con, "127.0.0.1", &addr);
write(con->handle, TEST_DATA, strlen(TEST_DATA)+1);
if(-1 == write(con->handle, TEST_DATA, strlen(TEST_DATA)+1)) {
exit(EXIT_FAILURE);
}
sleep(1); sleep(1);
delete(con); delete(con);
__tearDown(); __tearDown();

Loading…
Cancel
Save