/[weechat]/weechat/src/irc/irc-server.c
ViewVC logotype

Diff of /weechat/src/irc/irc-server.c

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

revision 1.78 by flashcode, Wed Nov 23 15:44:01 2005 UTC revision 1.79 by flashcode, Tue Dec 6 18:20:59 2005 UTC
# Line 91  server_init (t_irc_server *server) Line 91  server_init (t_irc_server *server)
91      server->child_write = -1;      server->child_write = -1;
92      server->sock = -1;      server->sock = -1;
93      server->is_connected = 0;      server->is_connected = 0;
 #ifdef HAVE_GNUTLS  
94      server->ssl_connected = 0;      server->ssl_connected = 0;
 #endif  
95      server->unterminated_message = NULL;      server->unterminated_message = NULL;
96      server->nick = NULL;      server->nick = NULL;
97      server->reconnect_start = 0;      server->reconnect_start = 0;
# Line 365  server_new (char *name, int autoconnect, Line 363  server_new (char *name, int autoconnect,
363          return NULL;          return NULL;
364            
365  #ifdef DEBUG  #ifdef DEBUG
366      wee_log_printf ("Creating new server (name:%s, address:%s, port:%d, pwd:%s, "      weechat_log_printf ("Creating new server (name:%s, address:%s, port:%d, pwd:%s, "
367                      "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, "                          "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, "
368                      "command:%s, autojoin:%s, autorejoin:%s, notify_levels:%s)\n",                          "command:%s, autojoin:%s, autorejoin:%s, notify_levels:%s)\n",
369                      name, address, port, (password) ? password : "",                          name, address, port, (password) ? password : "",
370                      (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "",                          (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "",
371                      (username) ? username : "", (realname) ? realname : "",                          (username) ? username : "", (realname) ? realname : "",
372                      (command) ? command : "", (autojoin) ? autojoin : "",                          (command) ? command : "", (autojoin) ? autojoin : "",
373                      (autorejoin) ? "on" : "off", (notify_levels) ? notify_levels : "");                          (autorejoin) ? "on" : "off", (notify_levels) ? notify_levels : "");
374  #endif  #endif
375            
376      if ((new_server = server_alloc ()))      if ((new_server = server_alloc ()))
# Line 801  server_close_connection (t_irc_server *s Line 799  server_close_connection (t_irc_server *s
799            
800      /* server is now disconnected */      /* server is now disconnected */
801      server->is_connected = 0;      server->is_connected = 0;
 #ifdef HAVE_GNUTLS  
802      server->ssl_connected = 0;      server->ssl_connected = 0;
 #endif  
803  }  }
804    
805  /*  /*
# Line 1399  server_connect (t_irc_server *server) Line 1395  server_connect (t_irc_server *server)
1395                      (server->ssl) ? " (SSL)" : "",                      (server->ssl) ? " (SSL)" : "",
1396                      cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port,                      cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port,
1397                      (cfg_proxy_ipv6) ? " (IPv6)" : "");                      (cfg_proxy_ipv6) ? " (IPv6)" : "");
1398          wee_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"),          weechat_log_printf (_("Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"),
1399                          server->address, server->port,                              server->address, server->port,
1400                          (server->ipv6) ? " (IPv6)" : "",                              (server->ipv6) ? " (IPv6)" : "",
1401                          (server->ssl) ? " (SSL)" : "",                              (server->ssl) ? " (SSL)" : "",
1402                          cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port,                              cfg_proxy_type_values[cfg_proxy_type], cfg_proxy_address, cfg_proxy_port,
1403                          (cfg_proxy_ipv6) ? " (IPv6)" : "");                              (cfg_proxy_ipv6) ? " (IPv6)" : "");
1404        }        }
1405      else      else
1406        {        {
# Line 1413  server_connect (t_irc_server *server) Line 1409  server_connect (t_irc_server *server)
1409                      PACKAGE_NAME, server->address, server->port,                      PACKAGE_NAME, server->address, server->port,
1410                      (server->ipv6) ? " (IPv6)" : "",                      (server->ipv6) ? " (IPv6)" : "",
1411                      (server->ssl) ? " (SSL)" : "");                      (server->ssl) ? " (SSL)" : "");
1412          wee_log_printf (_("Connecting to server %s:%d%s%s...\n"),          weechat_log_printf (_("Connecting to server %s:%d%s%s...\n"),
1413                          server->address, server->port,                              server->address, server->port,
1414                          (server->ipv6) ? " (IPv6)" : "",                              (server->ipv6) ? " (IPv6)" : "",
1415                          (server->ssl) ? " (SSL)" : "");                              (server->ssl) ? " (SSL)" : "");
1416        }        }
1417            
1418      /* close any opened connection and kill child process if running */      /* close any opened connection and kill child process if running */
1419      server_close_connection (server);      server_close_connection (server);
1420            
1421      /* init SSL if asked */      /* init SSL if asked */
 #ifdef HAVE_GNUTLS  
1422      server->ssl_connected = 0;      server->ssl_connected = 0;
1423    #ifdef HAVE_GNUTLS
1424      if (server->ssl)      if (server->ssl)
1425      {      {
1426          if (gnutls_init (&server->gnutls_sess, GNUTLS_CLIENT) != 0)          if (gnutls_init (&server->gnutls_sess, GNUTLS_CLIENT) != 0)
# Line 1706  server_remove_away () Line 1702  server_remove_away ()
1702          {          {
1703              for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel)              for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel)
1704              {              {
1705                  if (ptr_channel->type == CHAT_CHANNEL)                  if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
1706                      channel_remove_away (ptr_channel);                      channel_remove_away (ptr_channel);
1707              }              }
1708          }          }
# Line 1729  server_check_away () Line 1725  server_check_away ()
1725          {          {
1726              for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel)              for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel)
1727              {              {
1728                  if (ptr_channel->type == CHAT_CHANNEL)                  if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
1729                      channel_check_away (ptr_server, ptr_channel);                      channel_check_away (ptr_server, ptr_channel);
1730              }              }
1731          }          }
# Line 1749  server_set_away (t_irc_server *server, c Line 1745  server_set_away (t_irc_server *server, c
1745      {      {
1746          if (server->is_connected)          if (server->is_connected)
1747          {          {
1748              if (ptr_channel->type == CHAT_CHANNEL)              if (ptr_channel->type == CHANNEL_TYPE_CHANNEL)
1749                  channel_set_away (ptr_channel, nick, is_away);                  channel_set_away (ptr_channel, nick, is_away);
1750          }          }
1751      }      }
# Line 1762  server_set_away (t_irc_server *server, c Line 1758  server_set_away (t_irc_server *server, c
1758  void  void
1759  server_print_log (t_irc_server *server)  server_print_log (t_irc_server *server)
1760  {  {
1761      wee_log_printf ("[server %s (addr:0x%X)]\n", server->name, server);      weechat_log_printf ("[server %s (addr:0x%X)]\n",      server->name, server);
1762      wee_log_printf ("  autoconnect . . . . : %d\n",    server->autoconnect);      weechat_log_printf ("  autoconnect . . . . : %d\n",   server->autoconnect);
1763      wee_log_printf ("  autoreconnect . . . : %d\n",    server->autoreconnect);      weechat_log_printf ("  autoreconnect . . . : %d\n",   server->autoreconnect);
1764      wee_log_printf ("  autoreconnect_delay : %d\n",    server->autoreconnect_delay);      weechat_log_printf ("  autoreconnect_delay : %d\n",   server->autoreconnect_delay);
1765      wee_log_printf ("  command_line. . . . : %d\n",    server->command_line);      weechat_log_printf ("  command_line. . . . : %d\n",   server->command_line);
1766      wee_log_printf ("  address . . . . . . : '%s'\n",  server->address);      weechat_log_printf ("  address . . . . . . : '%s'\n", server->address);
1767      wee_log_printf ("  port. . . . . . . . : %d\n",    server->port);      weechat_log_printf ("  port. . . . . . . . : %d\n",   server->port);
1768      wee_log_printf ("  ipv6. . . . . . . . : %d\n",    server->ipv6);      weechat_log_printf ("  ipv6. . . . . . . . : %d\n",   server->ipv6);
1769      wee_log_printf ("  ssl . . . . . . . . : %d\n",    server->ssl);      weechat_log_printf ("  ssl . . . . . . . . : %d\n",   server->ssl);
1770      wee_log_printf ("  password. . . . . . : '%s'\n",      weechat_log_printf ("  password. . . . . . : '%s'\n",
1771          (server->password && server->password[0]) ? "(hidden)" : server->password);                          (server->password && server->password[0]) ?
1772      wee_log_printf ("  nick1 . . . . . . . : '%s'\n",  server->nick1);                          "(hidden)" : server->password);
1773      wee_log_printf ("  nick2 . . . . . . . : '%s'\n",  server->nick2);      weechat_log_printf ("  nick1 . . . . . . . : '%s'\n", server->nick1);
1774      wee_log_printf ("  nick3 . . . . . . . : '%s'\n",  server->nick3);      weechat_log_printf ("  nick2 . . . . . . . : '%s'\n", server->nick2);
1775      wee_log_printf ("  username. . . . . . : '%s'\n",  server->username);      weechat_log_printf ("  nick3 . . . . . . . : '%s'\n", server->nick3);
1776      wee_log_printf ("  realname. . . . . . : '%s'\n",  server->realname);      weechat_log_printf ("  username. . . . . . : '%s'\n", server->username);
1777      wee_log_printf ("  command . . . . . . : '%s'\n",      weechat_log_printf ("  realname. . . . . . : '%s'\n", server->realname);
1778          (server->command && server->command[0]) ? "(hidden)" : server->command);      weechat_log_printf ("  command . . . . . . : '%s'\n",
1779      wee_log_printf ("  command_delay . . . : %d\n",    server->command_delay);                          (server->command && server->command[0]) ?
1780      wee_log_printf ("  autojoin. . . . . . : '%s'\n",  server->autojoin);                          "(hidden)" : server->command);
1781      wee_log_printf ("  autorejoin. . . . . : %d\n",    server->autorejoin);      weechat_log_printf ("  command_delay . . . : %d\n",   server->command_delay);
1782      wee_log_printf ("  notify_levels . . . : %s\n",    server->notify_levels);      weechat_log_printf ("  autojoin. . . . . . : '%s'\n", server->autojoin);
1783      wee_log_printf ("  child_pid . . . . . : %d\n",    server->child_pid);      weechat_log_printf ("  autorejoin. . . . . : %d\n",   server->autorejoin);
1784      wee_log_printf ("  child_read  . . . . : %d\n",    server->child_read);      weechat_log_printf ("  notify_levels . . . : %s\n",   server->notify_levels);
1785      wee_log_printf ("  child_write . . . . : %d\n",    server->child_write);      weechat_log_printf ("  child_pid . . . . . : %d\n",   server->child_pid);
1786      wee_log_printf ("  sock. . . . . . . . : %d\n",    server->sock);      weechat_log_printf ("  child_read  . . . . : %d\n",   server->child_read);
1787      wee_log_printf ("  is_connected. . . . : %d\n",    server->is_connected);      weechat_log_printf ("  child_write . . . . : %d\n",   server->child_write);
1788  #ifdef HAVE_GNUTLS      weechat_log_printf ("  sock. . . . . . . . : %d\n",   server->sock);
1789      wee_log_printf("   ssl_connected . . . : %d\n",    server->ssl_connected);      weechat_log_printf ("  is_connected. . . . : %d\n",   server->is_connected);
1790  #endif      weechat_log_printf ("  ssl_connected . . . : %d\n",   server->ssl_connected);
1791      wee_log_printf ("  unterminated_message: '%s'\n",  server->unterminated_message);      weechat_log_printf ("  unterminated_message: '%s'\n", server->unterminated_message);
1792      wee_log_printf ("  nick. . . . . . . . : '%s'\n",  server->nick);      weechat_log_printf ("  nick. . . . . . . . : '%s'\n", server->nick);
1793      wee_log_printf ("  reconnect_start . . : %ld\n",   server->reconnect_start);      weechat_log_printf ("  reconnect_start . . : %ld\n",  server->reconnect_start);
1794      wee_log_printf ("  reconnect_join. . . : %d\n",    server->reconnect_join);      weechat_log_printf ("  reconnect_join. . . : %d\n",   server->reconnect_join);
1795      wee_log_printf ("  is_away . . . . . . : %d\n",    server->is_away);      weechat_log_printf ("  is_away . . . . . . : %d\n",   server->is_away);
1796      wee_log_printf ("  away_time . . . . . : %ld\n",   server->away_time);      weechat_log_printf ("  away_time . . . . . : %ld\n",  server->away_time);
1797      wee_log_printf ("  lag . . . . . . . . : %d\n",    server->lag);      weechat_log_printf ("  lag . . . . . . . . : %d\n",   server->lag);
1798      wee_log_printf ("  lag_check_time. . . : tv_sec:%d, tv_usec:%d\n",      weechat_log_printf ("  lag_check_time. . . : tv_sec:%d, tv_usec:%d\n",
1799          server->lag_check_time.tv_sec, server->lag_check_time.tv_usec);                          server->lag_check_time.tv_sec,
1800      wee_log_printf ("  lag_next_check. . . : %ld\n",   server->lag_next_check);                          server->lag_check_time.tv_usec);
1801      wee_log_printf ("  buffer. . . . . . . : 0x%X\n",  server->buffer);      weechat_log_printf ("  lag_next_check. . . : %ld\n",  server->lag_next_check);
1802      wee_log_printf ("  channels. . . . . . : 0x%X\n",  server->channels);      weechat_log_printf ("  buffer. . . . . . . : 0x%X\n", server->buffer);
1803      wee_log_printf ("  last_channel. . . . : 0x%X\n",  server->last_channel);      weechat_log_printf ("  channels. . . . . . : 0x%X\n", server->channels);
1804      wee_log_printf ("  prev_server . . . . : 0x%X\n",  server->prev_server);      weechat_log_printf ("  last_channel. . . . : 0x%X\n", server->last_channel);
1805      wee_log_printf ("  next_server . . . . : 0x%X\n",  server->next_server);      weechat_log_printf ("  prev_server . . . . : 0x%X\n", server->prev_server);
1806        weechat_log_printf ("  next_server . . . . : 0x%X\n", server->next_server);
1807  }  }

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.79

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26