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

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

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

revision 1.29 by flashcode, Sat Oct 22 14:04:26 2005 UTC revision 1.30 by flashcode, Sun Oct 30 09:56:24 2005 UTC
# Line 362  dcc_close (t_irc_dcc *ptr_dcc, int statu Line 362  dcc_close (t_irc_dcc *ptr_dcc, int statu
362      {      {
363          if (DCC_IS_FILE(ptr_dcc->type))          if (DCC_IS_FILE(ptr_dcc->type))
364          {          {
365              irc_display_prefix (ptr_dcc->server->buffer, PREFIX_INFO);              irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
366                                    PREFIX_INFO);
367              gui_printf (ptr_dcc->server->buffer, _("DCC: file "));              gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
368              gui_printf_color (ptr_dcc->server->buffer,              gui_printf_color (ptr_dcc->server->buffer,
369                                COLOR_WIN_CHAT_CHANNEL,                                COLOR_WIN_CHAT_CHANNEL,
# Line 397  dcc_close (t_irc_dcc *ptr_dcc, int statu Line 398  dcc_close (t_irc_dcc *ptr_dcc, int statu
398                  ptr_buffer = ptr_dcc->channel->buffer;                  ptr_buffer = ptr_dcc->channel->buffer;
399              else              else
400                  ptr_buffer = ptr_dcc->server->buffer;                  ptr_buffer = ptr_dcc->server->buffer;
401              irc_display_prefix (ptr_buffer, PREFIX_INFO);              irc_display_prefix (ptr_dcc->server, ptr_buffer, PREFIX_INFO);
402              gui_printf (ptr_buffer, _("DCC chat closed with "));              gui_printf (ptr_buffer, _("DCC chat closed with "));
403              gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_NICK,              gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_NICK,
404                                "%s", ptr_dcc->nick);                                "%s", ptr_dcc->nick);
# Line 452  dcc_channel_for_chat (t_irc_dcc *ptr_dcc Line 453  dcc_channel_for_chat (t_irc_dcc *ptr_dcc
453  {  {
454      if (!channel_create_dcc (ptr_dcc))      if (!channel_create_dcc (ptr_dcc))
455      {      {
456          irc_display_prefix (ptr_dcc->server->buffer, PREFIX_ERROR);          irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
457                                PREFIX_ERROR);
458          gui_printf (ptr_dcc->server->buffer,          gui_printf (ptr_dcc->server->buffer,
459                      _("%s can't associate DCC chat with private buffer "                      _("%s can't associate DCC chat with private buffer "
460                      "(maybe private buffer has already DCC CHAT?)\n"),                      "(maybe private buffer has already DCC CHAT?)\n"),
# Line 462  dcc_channel_for_chat (t_irc_dcc *ptr_dcc Line 464  dcc_channel_for_chat (t_irc_dcc *ptr_dcc
464          return;          return;
465      }      }
466            
467      irc_display_prefix (ptr_dcc->channel->buffer, PREFIX_INFO);      irc_display_prefix (ptr_dcc->server, ptr_dcc->channel->buffer,
468                            PREFIX_INFO);
469      gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,      gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,
470                       _("Connected to "));                       _("Connected to "));
471      gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_NICK,      gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_NICK,
# Line 560  dcc_accept_resume (t_irc_server *server, Line 563  dcc_accept_resume (t_irc_server *server,
563                        ptr_dcc->nick, ptr_dcc->filename,                        ptr_dcc->nick, ptr_dcc->filename,
564                        ptr_dcc->port, ptr_dcc->start_resume);                        ptr_dcc->port, ptr_dcc->start_resume);
565                    
566          irc_display_prefix (ptr_dcc->server->buffer, PREFIX_INFO);          irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
567                                PREFIX_INFO);
568          gui_printf (ptr_dcc->server->buffer, _("DCC: file "));          gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
569          gui_printf_color (ptr_dcc->server->buffer,          gui_printf_color (ptr_dcc->server->buffer,
570                            COLOR_WIN_CHAT_CHANNEL,                            COLOR_WIN_CHAT_CHANNEL,
# Line 614  dcc_add (t_irc_server *server, int type, Line 618  dcc_add (t_irc_server *server, int type,
618      /* create new DCC struct */      /* create new DCC struct */
619      if ((new_dcc = (t_irc_dcc *) malloc (sizeof (t_irc_dcc))) == NULL)      if ((new_dcc = (t_irc_dcc *) malloc (sizeof (t_irc_dcc))) == NULL)
620      {      {
621          irc_display_prefix (server->buffer, PREFIX_ERROR);          irc_display_prefix (server, server->buffer, PREFIX_ERROR);
622          gui_printf (server->buffer,          gui_printf (server->buffer,
623                      _("%s not enough memory for new DCC\n"),                      _("%s not enough memory for new DCC\n"),
624                      WEECHAT_ERROR);                      WEECHAT_ERROR);
# Line 664  dcc_add (t_irc_server *server, int type, Line 668  dcc_add (t_irc_server *server, int type,
668      /* write info message on server buffer */      /* write info message on server buffer */
669      if (type == DCC_FILE_RECV)      if (type == DCC_FILE_RECV)
670      {      {
671          irc_display_prefix (server->buffer, PREFIX_INFO);          irc_display_prefix (server, server->buffer, PREFIX_INFO);
672          gui_printf (server->buffer, _("Incoming DCC file from "));          gui_printf (server->buffer, _("Incoming DCC file from "));
673          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
674          gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");          gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
# Line 681  dcc_add (t_irc_server *server, int type, Line 685  dcc_add (t_irc_server *server, int type,
685      }      }
686      if (type == DCC_FILE_SEND)      if (type == DCC_FILE_SEND)
687      {      {
688          irc_display_prefix (server->buffer, PREFIX_INFO);          irc_display_prefix (server, server->buffer, PREFIX_INFO);
689          gui_printf (server->buffer, _("Sending DCC file to "));          gui_printf (server->buffer, _("Sending DCC file to "));
690          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
691          gui_printf (server->buffer, ": ");          gui_printf (server->buffer, ": ");
# Line 695  dcc_add (t_irc_server *server, int type, Line 699  dcc_add (t_irc_server *server, int type,
699      }      }
700      if (type == DCC_CHAT_RECV)      if (type == DCC_CHAT_RECV)
701      {      {
702          irc_display_prefix (server->buffer, PREFIX_INFO);          irc_display_prefix (server, server->buffer, PREFIX_INFO);
703          gui_printf (server->buffer, _("Incoming DCC chat request from "));          gui_printf (server->buffer, _("Incoming DCC chat request from "));
704          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
705          gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");          gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
# Line 707  dcc_add (t_irc_server *server, int type, Line 711  dcc_add (t_irc_server *server, int type,
711      }      }
712      if (type == DCC_CHAT_SEND)      if (type == DCC_CHAT_SEND)
713      {      {
714          irc_display_prefix (server->buffer, PREFIX_INFO);          irc_display_prefix (server, server->buffer, PREFIX_INFO);
715          gui_printf (server->buffer, _("Sending DCC chat request to "));          gui_printf (server->buffer, _("Sending DCC chat request to "));
716          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s\n", nick);          gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s\n", nick);
717          dcc_redraw (HOTLIST_MSG);          dcc_redraw (HOTLIST_MSG);
# Line 722  dcc_add (t_irc_server *server, int type, Line 726  dcc_add (t_irc_server *server, int type,
726            
727      if (DCC_IS_FILE(type) && (new_dcc->start_resume > 0))      if (DCC_IS_FILE(type) && (new_dcc->start_resume > 0))
728      {      {
729          irc_display_prefix (new_dcc->server->buffer, PREFIX_INFO);          irc_display_prefix (new_dcc->server, new_dcc->server->buffer,
730                                PREFIX_INFO);
731          gui_printf (new_dcc->server->buffer, _("DCC: file "));          gui_printf (new_dcc->server->buffer, _("DCC: file "));
732          gui_printf_color (new_dcc->server->buffer,          gui_printf_color (new_dcc->server->buffer,
733                            COLOR_WIN_CHAT_CHANNEL,                            COLOR_WIN_CHAT_CHANNEL,
# Line 800  dcc_send_request (t_irc_server *server, Line 805  dcc_send_request (t_irc_server *server,
805                                           4);                                           4);
806              if (!filename2)              if (!filename2)
807              {              {
808                  irc_display_prefix (server->buffer, PREFIX_ERROR);                  irc_display_prefix (server, server->buffer, PREFIX_ERROR);
809                  gui_printf (server->buffer,                  gui_printf (server->buffer,
810                              _("%s not enough memory for DCC SEND\n"),                              _("%s not enough memory for DCC SEND\n"),
811                              WEECHAT_ERROR);                              WEECHAT_ERROR);
# Line 822  dcc_send_request (t_irc_server *server, Line 827  dcc_send_request (t_irc_server *server,
827          /* check if file exists */          /* check if file exists */
828          if (stat (filename2, &st) == -1)          if (stat (filename2, &st) == -1)
829          {          {
830              irc_display_prefix (server->buffer, PREFIX_ERROR);              irc_display_prefix (server, server->buffer, PREFIX_ERROR);
831              gui_printf (server->buffer,              gui_printf (server->buffer,
832                          _("%s cannot access file \"%s\"\n"),                          _("%s cannot access file \"%s\"\n"),
833                          WEECHAT_ERROR, filename2);                          WEECHAT_ERROR, filename2);
# Line 864  dcc_send_request (t_irc_server *server, Line 869  dcc_send_request (t_irc_server *server,
869      sock = socket (AF_INET, SOCK_STREAM, 0);      sock = socket (AF_INET, SOCK_STREAM, 0);
870      if (sock == -1)      if (sock == -1)
871      {      {
872          irc_display_prefix (server->buffer, PREFIX_ERROR);          irc_display_prefix (server, server->buffer, PREFIX_ERROR);
873          gui_printf (server->buffer,          gui_printf (server->buffer,
874                      _("%s cannot create socket for DCC\n"),                      _("%s cannot create socket for DCC\n"),
875                      WEECHAT_ERROR);                      WEECHAT_ERROR);
# Line 897  dcc_send_request (t_irc_server *server, Line 902  dcc_send_request (t_irc_server *server,
902                      if (bind (sock, (struct sockaddr *) &addr, sizeof (addr)) == 0)                      if (bind (sock, (struct sockaddr *) &addr, sizeof (addr)) == 0)
903                          break;                          break;
904                  }                  }
905                    port++;
906              }              }
907                            
908              if (port > port_end)              if (port > port_end)
# Line 921  dcc_send_request (t_irc_server *server, Line 927  dcc_send_request (t_irc_server *server,
927      if (port == -1)      if (port == -1)
928      {      {
929          /* Could not find any port to bind */          /* Could not find any port to bind */
930          irc_display_prefix (server->buffer, PREFIX_ERROR);          irc_display_prefix (server, server->buffer, PREFIX_ERROR);
931          gui_printf (server->buffer,          gui_printf (server->buffer,
932                      _("%s cannot find available port for DCC\n"),                      _("%s cannot find available port for DCC\n"),
933                      WEECHAT_ERROR);                      WEECHAT_ERROR);
# Line 965  dcc_send_request (t_irc_server *server, Line 971  dcc_send_request (t_irc_server *server,
971                             short_filename, filename2, st.st_size);                             short_filename, filename2, st.st_size);
972      if (!ptr_dcc)      if (!ptr_dcc)
973      {      {
974          irc_display_prefix (server->buffer, PREFIX_ERROR);          irc_display_prefix (server, server->buffer, PREFIX_ERROR);
975          gui_printf (server->buffer,          gui_printf (server->buffer,
976                      _("%s cannot send DCC\n"),                      _("%s cannot send DCC\n"),
977                      WEECHAT_ERROR);                      WEECHAT_ERROR);
# Line 1045  dcc_chat_sendf (t_irc_dcc *ptr_dcc, char Line 1051  dcc_chat_sendf (t_irc_dcc *ptr_dcc, char
1051                                       buffer);                                       buffer);
1052      if (dcc_chat_send (ptr_dcc, buf2, strlen (buf2)) <= 0)      if (dcc_chat_send (ptr_dcc, buf2, strlen (buf2)) <= 0)
1053      {      {
1054          irc_display_prefix (ptr_dcc->server->buffer, PREFIX_ERROR);          irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
1055          gui_printf (ptr_dcc->server->buffer, _("%s error sending data to \"%s\" via DCC CHAT\n"),                              PREFIX_ERROR);
1056            gui_printf (ptr_dcc->server->buffer,
1057                        _("%s error sending data to \"%s\" via DCC CHAT\n"),
1058                      WEECHAT_ERROR, ptr_dcc->nick);                      WEECHAT_ERROR, ptr_dcc->nick);
1059          dcc_close (ptr_dcc, DCC_FAILED);          dcc_close (ptr_dcc, DCC_FAILED);
1060      }      }
# Line 1318  dcc_handle () Line 1326  dcc_handle ()
1326              {              {
1327                  if (cfg_dcc_blocksize > (int) sizeof (buffer))                  if (cfg_dcc_blocksize > (int) sizeof (buffer))
1328                  {                  {
1329                      irc_display_prefix (NULL, PREFIX_ERROR);                      irc_display_prefix (NULL, NULL, PREFIX_ERROR);
1330                      gui_printf (NULL, _("%s DCC failed because blocksize is too "                      gui_printf (NULL, _("%s DCC failed because blocksize is too "
1331                                  "big. Check value of \"dcc_blocksize\" option, "                                  "big. Check value of \"dcc_blocksize\" option, "
1332                                  "max is %d.\n"),                                  "max is %d.\n"),

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30

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