[Middle-man-commits] middleman/include flags.h,1.81,1.82 proto.h,1.192,1.193 types.h,1.168,1.169

[jason m. <mc...@us...>]

Update of /cvsroot/middle-man/middleman/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31395/include

Modified Files:
	flags.h proto.h types.h 
Log Message:


Index: flags.h
===================================================================
RCS file: /cvsroot/middle-man/middleman/include/flags.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** flags.h	2 Apr 2004 10:03:04 -0000	1.81
--- flags.h	2 Apr 2004 14:31:36 -0000	1.82
***************
*** 136,143 ****
  #define MMLOG_ANTIVIRUS (1<<16)
  #define MMLOG_EXTERNAL (1<<17)
! #define MMLOG_SECURITY (1 << 18)
! #define MMLOG_WARN (1 << 19)
! #define MMLOG_ERROR (1 << 20)
! #define MMLOG_DEBUG (1 << 21)
  
  #define FEATURE_FILTER 1
--- 136,144 ----
  #define MMLOG_ANTIVIRUS (1<<16)
  #define MMLOG_EXTERNAL (1<<17)
! #define MMLOG_DNSBL (1<<18)
! #define MMLOG_SECURITY (1 << 19)
! #define MMLOG_WARN (1 << 20)
! #define MMLOG_ERROR (1 << 21)
! #define MMLOG_DEBUG (1 << 22)
  
  #define FEATURE_FILTER 1

Index: types.h
===================================================================
RCS file: /cvsroot/middle-man/middleman/include/types.h,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** types.h	2 Apr 2004 10:03:04 -0000	1.168
--- types.h	2 Apr 2004 14:31:36 -0000	1.169
***************
*** 658,665 ****
  	MimeList allow_list, deny_list;
  	Mime empty;
! 
   public:
  	MimeSection();
! 	const Mime* check(CONNECTION * connection);
  };
  
--- 658,666 ----
  	MimeList allow_list, deny_list;
  	Mime empty;
! 	const Mime* check(CONNECTION *);
   public:
  	MimeSection();
! 	bool check_and_block(CONNECTION *);
! 	void check_show(CONNECTION *);
  };
  
***************
*** 1069,1075 ****
  
  class DnsblSection: public Section {
   	void update();
- 
-  public:
  	/* should be private */
  	int& enabled;
--- 1070,1075 ----
  
  class DnsblSection: public Section {
+  private:
   	void update();
  	/* should be private */
  	int& enabled;
***************
*** 1079,1082 ****
--- 1079,1083 ----
  
   public:
+ 	bool check_and_block(CONNECTION *) const;
  	DnsblSection();
  };

Index: proto.h
===================================================================
RCS file: /cvsroot/middle-man/middleman/include/proto.h,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -d -r1.192 -r1.193
*** proto.h	2 Apr 2004 10:03:04 -0000	1.192
--- proto.h	2 Apr 2004 14:31:36 -0000	1.193
***************
*** 387,391 ****
  void interface_page_global(Filebuf *, CGIMap &, CONNECTION *);
  void interface_send_response(CONNECTION *, Filebuf *);
- void mime_check_show(CONNECTION *);
  void score_show(CONNECTION *, int);
  void cache_show(CONNECTION *);
--- 387,390 ----