netd.c (ziproxy-3.3.1) | : | netd.c (ziproxy-3.3.2.tar.bz2) | ||
---|---|---|---|---|
/* netd.c | /* netd.c | |||
* Core daemon routines. | * Core daemon routines. | |||
* | * | |||
* Ziproxy - the HTTP acceleration proxy | * Ziproxy - the HTTP acceleration proxy | |||
* This code is under the following conditions: | * This code is under the following conditions: | |||
* | * | |||
* --------------------------------------------------------------------- | * --------------------------------------------------------------------- | |||
* Copyright (c)2005-2014 Daniel Mealha Cabrita | * Copyright (c)2005-2021 Daniel Mealha Cabrita | |||
* | * | |||
* This program is free software; you can redistribute it and/or modify | * This program is free software; you can redistribute it and/or modify | |||
* it under the terms of the GNU General Public License as published by | * it under the terms of the GNU General Public License as published by | |||
* the Free Software Foundation; either version 2 of the License, or | * the Free Software Foundation; either version 2 of the License, or | |||
* (at your option) any later version. | * (at your option) any later version. | |||
* | * | |||
* This program is distributed in the hope that it will be useful, | * This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU General Public License for more details. | * GNU General Public License for more details. | |||
skipping to change at line 310 | skipping to change at line 310 | |||
switch (dpid_issue (PIDFile, dpid)) { | switch (dpid_issue (PIDFile, dpid)) { | |||
case 0: | case 0: | |||
/* no problems here */ | /* no problems here */ | |||
break; | break; | |||
case 1: | case 1: | |||
/* file exists */ | /* file exists */ | |||
error_log_printf (LOGMT_FATALERROR, LOGSS _DAEMON, "The PID file already exists! Daemon is either running already, or a pr evious process crashed. The PID file is: %s\n", PIDFile); | error_log_printf (LOGMT_FATALERROR, LOGSS _DAEMON, "The PID file already exists! Daemon is either running already, or a pr evious process crashed. The PID file is: %s\n", PIDFile); | |||
daemon_retcode = 9; | daemon_retcode = 9; | |||
break; | break; | |||
case 2: | case 2: | |||
/* error while writting file */ | /* error while writing file */ | |||
error_log_puts (LOGMT_FATALERROR, LOGSS_D | error_log_puts (LOGMT_FATALERROR, LOGSS_D | |||
AEMON, "Error while writting PID file."); | AEMON, "Error while writing PID file."); | |||
daemon_retcode = 9; | daemon_retcode = 9; | |||
break; | break; | |||
default: | default: | |||
/* another error */ | /* another error */ | |||
error_log_puts (LOGMT_FATALERROR, LOGSS_D AEMON, "Error while creating/writting PID file."); | error_log_puts (LOGMT_FATALERROR, LOGSS_D AEMON, "Error while creating/writing PID file."); | |||
daemon_retcode = 9; | daemon_retcode = 9; | |||
break; | break; | |||
} | } | |||
} else { | } else { | |||
/* no PID file, let's just dump the daemon PID to stdout then */ | /* no PID file, let's just dump the daemon PID to stdout then */ | |||
printf ("%lld\n", dpid_llint); | printf ("%lld\n", dpid_llint); | |||
} | } | |||
if (daemon_retcode != 0) { | if (daemon_retcode != 0) { | |||
kill (dpid, SIGTERM); | kill (dpid, SIGTERM); | |||
skipping to change at line 636 | skipping to change at line 636 | |||
case 'f': | case 'f': | |||
option_error (3, "Obsolete option. Use \"OnlyFrom \" config option instead.\n", optarg); | option_error (3, "Obsolete option. Use \"OnlyFrom \" config option instead.\n", optarg); | |||
break; | break; | |||
case 'g': | case 'g': | |||
/* will check if group exists later */ | /* will check if group exists later */ | |||
cli_RunAsGroup = optarg; | cli_RunAsGroup = optarg; | |||
defined_group = 1; | defined_group = 1; | |||
break; | break; | |||
case 'h': | case 'h': | |||
printf ("Ziproxy " VERSION "\n" | printf ("Ziproxy " VERSION "\n" | |||
"Copyright (c)2005-2014 Daniel Me alha Cabrita\n" | "Copyright (c)2005-2021 Daniel Me alha Cabrita\n" | |||
"\n" | "\n" | |||
"This program is free software; y ou can redistribute it and/or modify\n" | "This program is free software; y ou can redistribute it and/or modify\n" | |||
"it under the terms of the GNU Ge neral Public License as published by\n" | "it under the terms of the GNU Ge neral Public License as published by\n" | |||
"the Free Software Foundation; ei ther version 2 of the License, or\n" | "the Free Software Foundation; ei ther version 2 of the License, or\n" | |||
"(at your option) any later versi on.\n" | "(at your option) any later versi on.\n" | |||
"\n" | "\n" | |||
"This program is distributed in t he hope that it will be useful,\n" | "This program is distributed in t he hope that it will be useful,\n" | |||
"but WITHOUT ANY WARRANTY; withou t even the implied warranty of\n" | "but WITHOUT ANY WARRANTY; withou t even the implied warranty of\n" | |||
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" | "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" | |||
End of changes. 4 change blocks. | ||||
6 lines changed or deleted | 6 lines changed or added |