Correct protocol handling in login phase

[eow] / empire.lisp

diff --git a/empire.lisp b/empire.lisp
index 001f755037313cdcc13e1168199eea4817c3a096..062c0fe960964ed642936ee318c853135efe133a 100644 (file)
--- a/empire.lisp
+++ b/empire.lisp
@@ -127,8 +127,8 @@
 (defclass base-mode ()
   ((connection :initarg :connection :accessor connection)))
 (defclass init-mode (base-mode)
-  ((play-sent-p :initform nil
-               :documentation "Have we already sent the play command?")))
+  ((phase :initform :initial
+         :documentation "Initialization phase")))
 (defclass play-mode (base-mode) nil)
 
 (defun make-mode (connection mode)
@@ -141,6 +141,7 @@
     (empire-log:info "~a: set-new-mode ~a -> ~a" c (connection-mode c) new-mode)
     (setf (connection-mode c) mode)))
 
+(defgeneric handle-cmdok (base-mode message))
 (defgeneric handle-data (base-mode message))
 (defgeneric handle-init (base-mode message))
 (defgeneric handle-exit (base-mode message))
@@ -151,16 +152,33 @@
 
 (defmethod handle-init ((m init-mode) message)
   (declare (ignorable message))
-  (with-slots (play-sent-p) m
-    (if (not play-sent-p)
-       (let ((c (connection m)))
-         (login-and-play c)
-         (setf play-sent-p t))
-       (set-new-mode m 'play-mode))))
+  (with-slots (phase connection) m
+    (ecase phase
+      (:initial (handle-cmdok m message))
+      (:play-sent (set-new-mode m 'play-mode)))))
+
+(defmethod handle-cmdok ((m init-mode) message)
+  (declare (ignorable message))
+  (with-slots (phase connection) m
+    (flet ((init-phase (mode send-args next-phase)
+            (with-slots (phase connection) mode
+              (send-message-one connection (apply #'format nil send-args))
+              (setf phase next-phase))))
+      (with-slots (user password) (connection m)
+       (ecase phase
+         (:initial (init-phase m `("client eow ~a" ,*version*) :client-sent))
+         (:client-sent (init-phase m `("coun ~a" ,user) :coun-sent))
+         (:coun-sent (init-phase m `("pass ~a" ,password) :pass-sent))
+         (:pass-sent (init-phase m '("play") :play-sent)))))))
 
 (defmethod handle-exit ((m init-mode) message)
   (declare (ignorable message))
-  t)
+  (with-slots (phase connection) m
+    (ecase phase
+      (:play-sent (send-message-one connection "kill")
+                 (setf phase :kill-sent))
+      (:kill-sent (send-message-one connection "play")
+                 (setf phase :play-sent)))))
 
 (defmethod handle-exit ((m play-mode) message)
   (declare (ignorable message))
@@ -181,7 +199,7 @@
 
 (defmethod send-next-line ((c connection))
   (let ((next-event (locked-queue:dequeue (send-queue c))))
-    (typecase next-event
+    (etypecase next-event
       (string (send-message-one c next-event))
       (cons (let ((message (car next-event))
                  (mode (cdr next-event)))
@@ -208,7 +226,7 @@
        `(,+C_FLUSH+ . handle-flush)
        `(,+C_BADCMD+ . handle-simple-message)
        `(,+C_FLASH+ . handle-simple-message)
-       `(,+C_CMDOK+ . handle-ignore)
+       `(,+C_CMDOK+ . handle-cmdok)
        `(,+C_PROMPT+ . handle-prompt)))
 
 (defun parse-server-line (line)
@@ -287,20 +305,5 @@
   (cond ((special-command-p line) (special-command c (subseq line 1)))
        (t (send-message c line))))
 
-(defgeneric login-and-play (connection))
-(defmethod login-and-play ((c connection))
-  (send-message-one c (format nil "client eow ~a" *version*))
-  (send-message-one c "user FIXME")
-  (with-slots (user password) c
-    (send-message-one c (format nil "coun ~a" user))
-    (send-message-one c (format nil "pass ~a" password)))
-  (send-message-one c "kill")
-  (send-message-one c "play"))
-
 (defmethod quit ((c connection))
   (usocket:socket-close (socket c)))
-
-
-;;; Tests
-(defvar *l1* "2 Empire server ready")
-;; (parse-server-line *l1*)