* riece-server.el: Implement flood protection.

(riece-flush-send-queue): New function.
(riece-process-send-string): Use it.
(riece-seconds-to-time): New function.
(riece-time-since): New function.
(riece-time-less-p): New function.
(riece-reset-process-buffer): Reset riece-send-queue,
riece-last-send-time, riece-send-size.
* riece-options.el (riece-max-send-size): New user option.
(riece-send-delay): New user option.
* riece-globals.el (riece-send-queue): New variable.
(riece-last-send-time): New variable.
(riece-send-size): New variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 260193b..9dac29e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2004-09-25  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-server.el: Implement flood protection.
+       (riece-flush-send-queue): New function.
+       (riece-process-send-string): Use it.
+       (riece-seconds-to-time): New function.
+       (riece-time-since): New function.
+       (riece-time-less-p): New function.
+       (riece-reset-process-buffer): Reset riece-send-queue,
+       riece-last-send-time, riece-send-size.
+       * riece-options.el (riece-max-send-size): New user option.
+       (riece-send-delay): New user option.
+       * riece-globals.el (riece-send-queue): New variable.
+       (riece-last-send-time): New variable.
+       (riece-send-size): New variable.
+
 2004-09-14  OHASHI Akira  <bg66@koka-in.org>
 
        * riece-log.el (riece-log-flashback): Run riece-button-update-buffer

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index 6c18318..711edc3 100644 (file)
--- a/lisp/riece-globals.el
+++ b/lisp/riece-globals.el
@@ -111,6 +111,12 @@ Local to the server buffers.")
 (defvar riece-send-queue nil
   "Send queue for avoiding client flood.
 Local to the server buffers.")
+(defvar riece-last-send-time nil
+  "Timestamp of the last send.
+Local to the server buffers.")
+(defvar riece-send-size nil
+  "Size of the last send.
+Local to the server buffers.")
 (defvar riece-obarray nil
   "Namespace of the IRC world.
 Local to the server buffers.")

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index f73e2b7..d7306da 100644 (file)
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -183,6 +183,11 @@ way is to put Riece variables on .emacs or file loaded from there."
   :type 'integer
   :group 'riece-server)
 
+(defcustom riece-send-delay 1
+  "Duration of multiple send."
+  :type 'integer
+  :group 'riece-server)
+  
 (defcustom riece-default-password (getenv "IRCPASSWORD")
   "Your password."
   :type '(radio (string :tag "Password")

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 6bdecfa..9002676 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -105,30 +105,58 @@ the `riece-server-keyword-map' variable."
 (put 'riece-with-server-buffer 'lisp-indent-function 1)
 (put 'riece-with-server-buffer 'edebug-form-spec '(form body))
 
+;; stolen (and renamed) from time-date.el.
+(defun riece-seconds-to-time (seconds)
+  "Convert SECONDS (a floating point number) to a time value."
+  (list (floor seconds 65536)
+       (floor (mod seconds 65536))
+       (floor (* (- seconds (ffloor seconds)) 1000000))))
+
+;; stolen (and renamed) from time-date.el.
+(defun riece-time-since (time)
+  "Return the time elapsed since TIME.
+TIME should be either a time value or a date-time string."
+  (let* ((current (current-time))
+        (rest (when (< (nth 1 current) (nth 1 time))
+                (expt 2 16))))
+    (list (- (+ (car current) (if rest -1 0)) (car time))
+         (- (+ (or rest 0) (nth 1 current)) (nth 1 time)))))
+
+;; stolen (and renamed) from time-date.el.
+(defun riece-time-less-p (t1 t2)
+  "Say whether time value T1 is less than time value T2."
+  (or (< (car t1) (car t2))
+      (and (= (car t1) (car t2))
+          (< (nth 1 t1) (nth 1 t2)))))
+
 (defun riece-flush-send-queue (process)
   (with-current-buffer (process-buffer process)
     (let ((length 0)
-         (total 0)
          string)
+      (if (riece-time-less-p (riece-seconds-to-time riece-send-delay)
+                            (riece-time-since riece-last-send-time))
+         (setq riece-send-size 0))
       (while (and riece-send-queue
-                 (< total riece-max-send-size))
+                 (< riece-send-size riece-max-send-size))
        (setq string (riece-encode-coding-string (car riece-send-queue))
              length (length string))
        (if (> length riece-max-send-size)
            (message "Long message (%d > %d)" length riece-max-send-size)
          (process-send-string process string)
-         (setq total (+ total length)))
+         (setq riece-send-size (+ riece-send-size length)))
        (setq riece-send-queue (cdr riece-send-queue)))
       (if riece-send-queue
          (progn
            (if riece-debug
                (message "%d bytes sent, %d bytes left"
-                        total (apply #'+ (mapcar #'length riece-send-queue))))
+                        riece-send-size
+                        (apply #'+ (mapcar #'length riece-send-queue))))
            ;; schedule next send after a second
-           (riece-run-at-time 1 nil
+           (riece-run-at-time riece-send-delay nil
                               #'riece-flush-send-queue process))
        (if riece-debug
-           (message "%d bytes sent" total))))))
+           (message "%d bytes sent" riece-send-size)))
+      (setq riece-last-send-time (current-time)))))
 
 (defun riece-process-send-string (process string)
   (with-current-buffer (process-buffer process)
@@ -205,6 +233,10 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-server-name)
     (make-local-variable 'riece-read-point)
     (make-local-variable 'riece-send-queue)
+    (make-local-variable 'riece-last-send-time)
+    (setq riece-last-send-time '(0 0 0))
+    (make-local-variable 'riece-send-size)
+    (setq riece-send-size 0)
     (setq riece-read-point (point-min))
     (make-local-variable 'riece-obarray)
     (setq riece-obarray (make-vector riece-obarray-size 0))