Changeset 82 for branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp

Timestamp:

02/10/07 23:52:32 (18 years ago)

Author:

psmith

Message:

getting there...

File:

• branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp (modified) (4 diffs)

branches/home/psmith/restructure/src/protocol/yarpc/yarpc-packet-factory.lisp ¶

@@ -41 +41 @@
 (defconstant +PACKET-ID-SIZE+ 1)
 (defconstant +PACKET-LENGTH-SIZE+ 4)
-;(defconstant +PACKET-REQUEST-ID+ 4)
+(defconstant +PACKET-REQUEST-ID-SIZE+ 4)
 
 (defconstant +yarpc-packet-header-size+
@@ -54 +54 @@
             (let* ((packet-request-id (bytebuffer-read-32 buf))
                    (ret-packet (ecase packet-id
-                                (0 (progn (format-log t "yarpc-packet-factory:get-packet - got CALL-METHOD-PACKET-ID~%") (call-method-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+)) :request-id packet-request-id)))
-                                (1 (progn (format-log t "yarpc-packet-factory:get-packet - got METHOD-RESPONSE-PACKET-ID~%") (method-response-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+)) :request-id packet-request-id))))))
+                                (0 (progn (format-log t "yarpc-packet-factory:get-packet - got CALL-METHOD-PACKET-ID~%") (call-method-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+ +PACKET-REQUEST-ID-SIZE+)) :request-id packet-request-id)))
+                                (1 (progn (format-log t "yarpc-packet-factory:get-packet - got METHOD-RESPONSE-PACKET-ID~%") (method-response-packet (bytebuffer-read-string buf (- packet-length +yarpc-packet-header-size+ +PACKET-REQUEST-ID-SIZE+)) :request-id packet-request-id))))))
               (compact buf)
               #+nio-debug  (format-log t "yarpc-packet-factory:get-packet - after compact ~%~A~%" buf)
@@ -71 +71 @@
                :reader request-id)))
 
-(defclass call-method-packet (yarpc-packet)((call-string :initarg :call-string
-                                            :accessor call-string)))
-(defun call-method-packet (call-string)
-  (make-instance 'call-method-packet :call-string call-string))
+(defclass call-method-packet (yarpc-packet)
+  ((call-string :initarg :call-string
+                :accessor call-string)))
+
+(defun call-method-packet (call-string &key request-id)
+  (make-instance 'call-method-packet :call-string call-string :request-id request-id))
 
 (defmethod print-object ((packet call-method-packet) stream)
@@ -104 +106 @@
              :accessor response)))
 
-(defun method-response-packet (response)
-  (make-instance 'method-response-packet :response response))
+(defun method-response-packet (response &key request-id)
+  (make-instance 'method-response-packet :response response :request-id request-id))
 
 (defmethod print-object ((packet method-response-packet) stream)