9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change some RATBOX_FOO defines to CHARYBDIS_FOO.

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-07 05:01:31 -06:00
parent b8e9ac5f5f
commit 638d286293
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/client.h
View file

@ -28,7 +28,7 @@
#include "config.h"
#if !defined(CONFIG_RATBOX_LEVEL_1)
#if !defined(CONFIG_CHARYBDIS_LEVEL_1)
#error Incorrect config.h for this revision of ircd.
#endif

6
include/config.h
View file

@ -91,11 +91,11 @@
*/
#define KILLCHASETIMELIMIT 90 /* Recommended value: 90 */
/* RATBOX_SOMAXCONN
/* CHARYBDIS_SOMAXCONN
* Use SOMAXCONN if OS has it, otherwise use this value for the
* listen(); backlog. 5 for AIX/SUNOS, 25 for other OSs.
*/
#define RATBOX_SOMAXCONN 25
#define CHARYBDIS_SOMAXCONN 25
/* MAX_BUFFER
* The amount of fds to reserve for clients exempt from limits
@ -110,7 +110,7 @@
* ----------------------------------------------------------------
*/
#define CONFIG_RATBOX_LEVEL_2
#define CONFIG_CHARYBDIS_LEVEL_2
#include "defaults.h"
#endif /* INCLUDED_config_h */

6
include/config.h.dist
View file

@ -91,11 +91,11 @@
*/
#define KILLCHASETIMELIMIT 90 /* Recommended value: 90 */
/* RATBOX_SOMAXCONN
/* CHARYBDIS_SOMAXCONN
* Use SOMAXCONN if OS has it, otherwise use this value for the
* listen(); backlog. 5 for AIX/SUNOS, 25 for other OSs.
*/
#define RATBOX_SOMAXCONN 25
#define CHARYBDIS_SOMAXCONN 25
/* MAX_BUFFER
* The amount of fds to reserve for clients exempt from limits
@ -110,7 +110,7 @@
* ----------------------------------------------------------------
*/
#define CONFIG_RATBOX_LEVEL_2
#define CONFIG_CHARYBDIS_LEVEL_2
#include "defaults.h"
#endif /* INCLUDED_config_h */

2
include/defaults.h
View file

@ -59,5 +59,5 @@
#define JOIN_LEAVE_COUNT_EXPIRE_TIME 120
#define MIN_SPAM_NUM 5
#define MIN_SPAM_TIME 60
#define CONFIG_RATBOX_LEVEL_1
#define CONFIG_CHARYBDIS_LEVEL_1
#endif /* INCLUDED_defaults_h */

2
include/ircd_defs.h
View file

@ -56,7 +56,7 @@
#define IRC_DEPRECATED
#endif
#if !defined(CONFIG_RATBOX_LEVEL_1)
#if !defined(CONFIG_CHARYBDIS_LEVEL_1)
# error Incorrect config.h for this revision of ircd.
#endif

4
include/m_info.h
View file

@ -63,10 +63,10 @@ Info MyInformation[] = {
#endif /* UH PATH */
#ifdef SOMAXCONN
{"RATBOX_SOMAXCONN", "", SOMAXCONN,
{"CHARYBDIS_SOMAXCONN", "", SOMAXCONN,
"Maximum Queue Length of Pending Connections"},
#else
{"RATBOX_SOMAXCONN", "", RATBOX_SOMAXCONN,
{"CHARYBDIS_SOMAXCONN", "", CHARYBDIS_SOMAXCONN,
"Maximum Queue Length of Pending Connections"},
#endif /* SOMAXCONN */

8
ircd/listener.c
View file

@ -159,11 +159,11 @@ show_ports(struct Client *source_p)
* returns true (1) if successful false (0) on error.
*
* If the operating system has a define for SOMAXCONN, use it, otherwise
* use RATBOX_SOMAXCONN
* use CHARYBDIS_SOMAXCONN
*/
#ifdef SOMAXCONN
#undef RATBOX_SOMAXCONN
#define RATBOX_SOMAXCONN SOMAXCONN
#undef CHARYBDIS_SOMAXCONN
#define CHARYBDIS_SOMAXCONN SOMAXCONN
#endif
static int
@ -253,7 +253,7 @@ inetport(struct Listener *listener)
return 0;
}
if(rb_listen(F, RATBOX_SOMAXCONN, listener->defer_accept))
if(rb_listen(F, CHARYBDIS_SOMAXCONN, listener->defer_accept))
{
errstr = strerror(rb_get_sockerr(F));
sendto_realops_snomask(SNO_GENERAL, L_ALL,