projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge of r85:88 from branch polarssl into trunk.
[umurmur.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index cce178a1ffe458d90de0efd9fcb64aabc4ce580a..a4c1c12b3182045174f8af9e8ee0c106d6e8bcc9 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-39,6
+39,8
@@
#include <signal.h>
#include <sched.h>
#include <errno.h>
#include <signal.h>
#include <sched.h>
#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
#include "server.h"
#include "ssl.h"
#include "server.h"
#include "ssl.h"
@@
-182,6
+184,7
@@
int main(int argc, char **argv)
signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
signal(SIGTTOU, SIG_IGN);
signal(SIGTTIN, SIG_IGN);
signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
signal(SIGTTOU, SIG_IGN);
signal(SIGTTIN, SIG_IGN);
+ signal(SIGPIPE, SIG_IGN);
signal(SIGHUP, signal_handler); /* catch hangup signal */
signal(SIGTERM, signal_handler); /* catch kill signal */
signal(SIGHUP, signal_handler); /* catch hangup signal */
signal(SIGTERM, signal_handler); /* catch kill signal */
@@
-196,7
+199,7
@@
int main(int argc, char **argv)
}
/* Initializing */
}
/* Initializing */
- SSL_init();
+ SSL
i
_init();
Chan_init();
Client_init();
Chan_init();
Client_init();
@@
-205,7
+208,7
@@
int main(int argc, char **argv)
Server_run();
Server_run();
- SSL_deinit();
+ SSL
i
_deinit();
Chan_free();
Log_free();
Conf_deinit();
Chan_free();
Log_free();
Conf_deinit();