[srvx-commits] CVS: services/src chanserv.c,1.308,1.309

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11885/src

Modified Files:
	chanserv.c 
Log Message:
simplify netride detection code


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -C2 -r1.308 -r1.309
*** chanserv.c	14 Nov 2002 02:22:35 -0000	1.308
--- chanserv.c	22 Nov 2002 02:20:35 -0000	1.309
***************
*** 5961,5965 ****
      struct banData *bData;
      struct handle_info *handle;
!     unsigned int ii, modes;
      char *greeting;
      char info[MAXLEN];
--- 5961,5965 ----
      struct banData *bData;
      struct handle_info *handle;
!     unsigned int modes;
      char *greeting;
      char info[MAXLEN];
***************
*** 5996,6019 ****
      if(user->uplink->burst)
      {
          for(ii = 0; ii < channel->banlist.used; ii++)
          {
              if(user_matches_glob(user, channel->banlist.list[ii]->ban, 1))
              {
!                 break;
              }
          }
      }
-     else
-     {
-         ii = channel->banlist.used;
-     }
  
!     if(ii<channel->banlist.used)
!     {
!         /* Riding a netburst.  Naughty. */
!         KickChannelUser(user, channel, chanserv, CSMSG_NETRIDE_DETECTED);
!         return 1;
!     }
!     else if(channel->banlist.used < MAXBANS)
      {
          /* Not joining through a ban. */
--- 5996,6012 ----
      if(user->uplink->burst)
      {
+         unsigned int ii;
          for(ii = 0; ii < channel->banlist.used; ii++)
          {
              if(user_matches_glob(user, channel->banlist.list[ii]->ban, 1))
              {
!                 /* Riding a netburst.  Naughty. */
!                 KickChannelUser(user, channel, chanserv, CSMSG_NETRIDE_DETECTED);
!                 return 1;
              }
          }
      }
  
!     if(channel->banlist.used < MAXBANS)
      {
          /* Not joining through a ban. */