/[cvs]/eggdrop1.8/src/main.c
ViewVC logotype

Diff of /eggdrop1.8/src/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.3 by pseudo, Sun Oct 10 21:24:43 2010 UTC revision 1.4 by pseudo, Tue Oct 19 12:13:33 2010 UTC
# Line 164  int cx_line[16]; Line 164  int cx_line[16];
164  int cx_ptr = 0;  int cx_ptr = 0;
165  #endif  #endif
166    
167    #ifdef TLS
168    int ssl_cleanup();
169    #endif
170    
171  void fatal(const char *s, int recoverable)  void fatal(const char *s, int recoverable)
172  {  {
# Line 174  void fatal(const char *s, int recoverabl Line 177  void fatal(const char *s, int recoverabl
177    for (i = 0; i < dcc_total; i++)    for (i = 0; i < dcc_total; i++)
178      if (dcc[i].sock >= 0)      if (dcc[i].sock >= 0)
179        killsock(dcc[i].sock);        killsock(dcc[i].sock);
180    #ifdef TLS
181      ssl_cleanup();
182    #endif
183    unlink(pid_file);    unlink(pid_file);
184    if (!recoverable) {    if (!recoverable) {
185      bg_send_quit(BG_ABORT);      bg_send_quit(BG_ABORT);
# Line 193  int expmem_modules(int); Line 199  int expmem_modules(int);
199  int expmem_language();  int expmem_language();
200  int expmem_tcldcc();  int expmem_tcldcc();
201  int expmem_tclmisc();  int expmem_tclmisc();
202    int expmem_dns();
203    #ifdef TLS
204    int expmem_tls();
205    #endif
206    
207  /* For mem.c : calculate memory we SHOULD be using  /* For mem.c : calculate memory we SHOULD be using
208   */   */
# Line 203  int expected_memory(void) Line 213  int expected_memory(void)
213    tot = expmem_chanprog() + expmem_users() + expmem_misc() + expmem_dccutil() +    tot = expmem_chanprog() + expmem_users() + expmem_misc() + expmem_dccutil() +
214          expmem_botnet() + expmem_tcl() + expmem_tclhash() + expmem_net() +          expmem_botnet() + expmem_tcl() + expmem_tclhash() + expmem_net() +
215          expmem_modules(0) + expmem_language() + expmem_tcldcc() +          expmem_modules(0) + expmem_language() + expmem_tcldcc() +
216          expmem_tclmisc();          expmem_tclmisc() + expmem_dns();
217    #ifdef TLS
218      tot += expmem_tls();
219    #endif
220    return tot;    return tot;
221  }  }
222    
# Line 695  int init_bots(); Line 708  int init_bots();
708  int init_modules();  int init_modules();
709  int init_tcl(int, char **);  int init_tcl(int, char **);
710  int init_language(int);  int init_language(int);
711    #ifdef TLS
712    int ssl_init();
713    #endif
714    
715  static void patch(const char *str)  static void patch(const char *str)
716  {  {
# Line 904  int mainloop(int toplevel) Line 920  int mainloop(int toplevel)
920        }        }
921    
922        rehash();        rehash();
923    #ifdef TLS
924          ssl_cleanup();
925          ssl_init();
926    #endif
927        restart_chons();        restart_chons();
928        call_hook(HOOK_LOADED);        call_hook(HOOK_LOADED);
929      }      }
# Line 1063  int main(int arg_c, char **arg_v) Line 1083  int main(int arg_c, char **arg_v)
1083      i++;      i++;
1084    putlog(LOG_MISC, "*", "=== %s: %d channels, %d users.",    putlog(LOG_MISC, "*", "=== %s: %d channels, %d users.",
1085           botnetnick, i, count_users(userlist));           botnetnick, i, count_users(userlist));
1086    #ifdef TLS
1087      ssl_init();
1088    #endif
1089    cache_miss = 0;    cache_miss = 0;
1090    cache_hit = 0;    cache_hit = 0;
1091    if (!pid_file[0])    if (!pid_file[0])

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

webmaster@eggheads.org
ViewVC Help
Powered by ViewVC 1.1.23