ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/branches/newio/src/s_bsd.c
(Generate patch)

Comparing branches/newio/src/s_bsd.c (file contents):
Revision 2407 by michael, Wed Jul 17 20:29:02 2013 UTC vs.
Revision 2408 by michael, Thu Jul 18 19:57:58 2013 UTC

# Line 47 | Line 47
47   #include "s_user.h"
48   #include "msgq.h"
49   #include "ioengine.h"
50 + #include "dbuf.h"
51  
52  
53   dlink_list connection_list;
# Line 651 | Line 652 | read_packet(struct Client *client_p, int
652        return exit_client(client_p, client_p, "Excess Flood");
653  
654      while (DBufLength(&client_p->localClient->recvQ) && !NoNewLine(client_p) &&
655 <           (IsTrusted(client_p) || cli_since(client_p) - CurrentTime < 10))
655 >           (IsTrusted(client_p) || client_p->localClient->since - CurrentTime < 10))
656      {
657        dolen = dbuf_getmsg(&client_p->localClient->recvQ,
658                            client_p->localClient->buffer, IRCD_BUFSIZE);
# Line 854 | Line 855 | client_sock_callback(struct Event *ev)
855  
856        /*FALLTHROUGH*/
857      case ET_EOF:  /* End of file on socket */
858 <      SetFlag(client_p, FLAGS_DEADSOCKET);
858 >      AddFlag(client_p, FLAGS_DEADSOCKET);
859  
860        if ((IsServer(client_p) || IsHandshake(client_p)) && client_p->localClient->error == 0)
861        {
862          exit_client_msg(client_p, client_p, "Server %s closed the connection (%s)",
863 <                        client_p->name, client_p->servptr->->last_error_msg);
863 >                        client_p->name, client_p->servptr->last_error_msg);
864          return;
865        }
866        else

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)