Server now functions the same as before, using default preset

This commit is contained in:
frekky 2016-01-09 15:26:03 +08:00
parent 4c3e546b57
commit f4d1d1634c
2 changed files with 6 additions and 1 deletions

View File

@ -299,6 +299,11 @@ main(int argc, char **argv)
__progname++; __progname++;
#endif #endif
// Load default values from preset
memcpy(&server, &preset_default, sizeof(struct server_instance));
server.running = 1;
while ((choice = getopt(argc, argv, "46vcsfhDu:t:d:m:l:L:p:n:b:P:z:F:i:")) != -1) { while ((choice = getopt(argc, argv, "46vcsfhDu:t:d:m:l:L:p:n:b:P:z:F:i:")) != -1) {
switch(choice) { switch(choice) {
case '4': case '4':

View File

@ -705,7 +705,7 @@ server_tunnel()
time_t last_action = time(NULL); time_t last_action = time(NULL);
if (server.debug >= 5) if (server.debug >= 5)
window_debug = server.debug - 3; window_debug = server.debug - 4;
while (server.running) { while (server.running) {
int maxfd; int maxfd;