Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv20446/src
Modified Files:
proto-p10.c proto-common.c proto-bahamut.c main.c
Log Message:
make ping_freq and ping_timeout private to proto-*.c
Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** proto-p10.c 2 Aug 2002 00:15:25 -0000 1.7
--- proto-p10.c 4 Aug 2002 13:55:06 -0000 1.8
***************
*** 1150,1153 ****
--- 1150,1160 ----
init_parse(void)
{
+ int tmp;
+
+ tmp = conf_server_ping_freq();
+ if (tmp != -1) ping_freq = tmp;
+ tmp = conf_server_ping_timeout();
+ if (tmp != -1) ping_timeout = tmp;
+
irc_func_dict = dict_new();
dict_insert(irc_func_dict, CMD_BURST, cmd_burst);
Index: proto-common.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-common.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** proto-common.c 30 Jul 2002 02:15:11 -0000 1.5
--- proto-common.c 4 Aug 2002 13:55:06 -0000 1.6
***************
*** 40,47 ****
static char replay_line[MAXLEN+80];
static struct io_fd *socket_io_fd;
extern struct cManagerNode cManager;
extern unsigned long burst_length;
- extern int ping_freq, ping_timeout;
extern struct cManagerNode cManager;
extern struct policer_params *oper_policer_params, *luser_policer_params;
--- 40,47 ----
static char replay_line[MAXLEN+80];
static struct io_fd *socket_io_fd;
+ static int ping_freq = 120, ping_timeout = 30;
extern struct cManagerNode cManager;
extern unsigned long burst_length;
extern struct cManagerNode cManager;
extern struct policer_params *oper_policer_params, *luser_policer_params;
Index: proto-bahamut.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-bahamut.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** proto-bahamut.c 2 Aug 2002 00:41:16 -0000 1.8
--- proto-bahamut.c 4 Aug 2002 13:55:06 -0000 1.9
***************
*** 948,951 ****
--- 948,958 ----
void init_parse(void) {
+ int tmp;
+
+ tmp = conf_server_ping_freq();
+ if (tmp != -1) ping_freq = tmp;
+ tmp = conf_server_ping_timeout();
+ if (tmp != -1) ping_timeout = tmp;
+
service_msginfo_dict = dict_new();
dict_set_free_data(service_msginfo_dict, free);
Index: main.c
===================================================================
RCS file: /cvsroot/srvx/services/src/main.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -r1.129 -r1.130
*** main.c 30 Jul 2002 02:15:11 -0000 1.129
--- main.c 4 Aug 2002 13:55:06 -0000 1.130
***************
*** 63,67 ****
unsigned long burst_length = 0;
- int ping_freq = 120, ping_timeout = 30;
int silent, quit_services, max_cycles;
--- 63,66 ----
***************
*** 642,646 ****
int main(int argc, char *argv[])
{
! int tmp, daemon;
pid_t pid = 0;
FILE *file_out;
--- 641,645 ----
int main(int argc, char *argv[])
{
! int daemon;
pid_t pid = 0;
FILE *file_out;
***************
*** 788,795 ****
reg_exit_func(main_shutdown);
- tmp = conf_server_ping_freq();
- if (tmp != -1) ping_freq = tmp;
- tmp = conf_server_ping_timeout();
- if (tmp != -1) ping_timeout = tmp;
modcmd_init();
timeq_init();
--- 787,790 ----
|
