[X2serv-cvs] CVS: x2/source send.c,1.29,1.30 send.h,1.10,1.11 server.c,1.16,1.17

[Richard P. <lys...@us...>]

Update of /cvsroot/x2serv/x2/source
In directory usw-pr-cvs1:/tmp/cvs-serv9553

Modified Files:
	send.c send.h server.c 
Log Message:
When x2 detects a client joining that was glined, it now sends the gline to
the server of the client only, and not to the whole net.


Index: send.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/send.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** send.c	2001/05/31 12:54:19	1.29
--- send.c	2001/06/06 10:54:18	1.30
***************
*** 225,228 ****
--- 225,240 ----
  }
  
+ void send_gline_to_server(char num, char *mask, time_t duration, char *format, ...)
+ {
+   va_list args;
+   char buff[LINEBUFFSIZE];
+ 
+   va_start(args, format);
+   vsprintf(buff, format, args);
+   va_end(args);
+ 
+   send_command_from_server("GLINE %c +%s %lu :%s", num, mask, duration, buff);
+ }
+ 
  void send_ungline(char *mask)
  {

Index: send.h
===================================================================
RCS file: /cvsroot/x2serv/x2/source/send.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** send.h	2001/05/31 12:54:19	1.10
--- send.h	2001/06/06 10:54:18	1.11
***************
*** 19,22 ****
--- 19,23 ----
  void send_kill(UserListType uptr, char *format, ...);
  void send_gline(char *mask, time_t duration, char *format, ...);
+ void send_gline_to_server(char num, char *mask, time_t duration, char *format, ...);
  void send_ungline(char *mask);
  void send_settime(time_t thetime);

Index: server.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/server.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** server.c	2001/04/11 09:04:31	1.16
--- server.c	2001/06/06 10:54:18	1.17
***************
*** 84,88 ****
       if(!matches(gptr->address, uhr) && gptr->time > NetTime())                                           
       {                                                                                   
!           send_gline(gptr->address, gptr->time - NetTime(), "%s", gptr->reason);
            return(TRUE);
       }                                                                                   
--- 84,88 ----
       if(!matches(gptr->address, uhr) && gptr->time > NetTime())                                           
       {                                                                                   
!           send_gline_to_server(UserPtr->Numnick[0], gptr->address, gptr->time - NetTime(), "%s", gptr->reason);
            return(TRUE);
       }