fix: IT WORKS

Author: AeroNotix

src/lsquic/lsquic.lisp

@@ -28,9 +28,9 @@
       (weird-pointers:save (pop-stream-ctx (weird-pointers:restore stream-ctx))))))
 
 (defcallback stream-readf :unsigned-int ((stream-ctx :pointer) (buf :pointer) (buf-len :unsigned-int) (fin :int))
-  (format t "in stream-readf: ~A" (cffi:foreign-string-to-lisp buf))
+  (format t "in stream-readf: ~A~%" (cffi:foreign-string-to-lisp buf))
   (force-output)
-  -1)
+  buf-len)
 
 (defcallback cb-on-read :void ((stream :pointer) (stream-ctx :pointer))
   (let ((ctx (weird-pointers:restore stream-ctx))
@@ -39,16 +39,19 @@
       (stream-close stream))
     (when (eq bytes-read 0)
       (stream-shutdown stream 0)
-      (stream-wantread stream 0))))
+      (stream-wantread stream 0))
+    bytes-read))
 
 (defparameter send-headers nil)
 
 (defcallback cb-on-write :void ((stream :pointer) (stream-ctx :pointer))
   (let* ((ctx (weird-pointers:restore stream-ctx))
          (packed-headers (lsxpack-headers (request ctx)))
-         (eos (if (body (request ctx)) 0 1)))
+         (eos 0))
     (unless send-headers
       (stream-send-headers stream packed-headers eos)
+      (stream-shutdown stream 1)
+      (stream-wantread stream 1)
       (setf send-headers t))))
 
 (defcallback cb-on-close :void ((stream :pointer) (stream-ctx :pointer)))
@@ -61,8 +64,6 @@
 
 (defcallback cb-packets-out :int ((packets-out-ctx :pointer) (specs :pointer) (count :int))
   (declare (ignore packets-out-ctx))
-  (format t "cb-packets-out~%")
-  (force-output)
   (let ((n 0))
     (loop while (< n count)
           do

src/lsquic/request.lisp

@@ -14,22 +14,26 @@
    (body :initarg :body :accessor body)))
 
 (defun make-lsxpack-header (el header)
-  (with-foreign-slots ((buf name-len name-offset val-len val-offset) el (:struct lsxpack-header))
+  (with-foreign-slots ((buf flags name-len name-offset val-len val-offset) el (:struct lsxpack-header))
+    (setf flags 0)
     (setf buf (foreign-string-alloc (format nil "~A~A" (name header) (value header))))
     (setf name-len (length (name header)))
     (setf name-offset 0)
     (setf val-len (length (value header)))
     (setf val-offset (length (name header)))))
 
 (defmethod required-headers ((request request))
-  (list
-   (make-instance 'header :name ":method" :value (verb request))
-   (make-instance 'header :name ":scheme" :value (scheme request))
-   (make-instance 'header :name ":path" :value (path request))
-   (make-instance 'header :name ":authority" :value (authority request))))
+  (let ((hdrs (list
+               (make-instance 'header :name ":method" :value (verb request))
+               (make-instance 'header :name ":scheme" :value (scheme request))
+               (make-instance 'header :name ":path" :value (path request))
+               (make-instance 'header :name ":authority" :value (authority request)))))
+    (if (body request)
+        hdrs
+        (append hdrs (list (make-instance 'header :name "connection" :value "close"))))))
 
 (defmethod lsxpack-headers ((request request))
-  (let* ((all-headers (nconc (required-headers request) (headers request)))
+  (let* ((all-headers (append (required-headers request) (headers request)))
          (count-hdrs (length all-headers))
          (pheaders (cffi:foreign-alloc '(:struct lsxpack-header) :count count-hdrs))
          (http-headers (cffi:foreign-alloc '(:struct http-headers))))
@@ -41,5 +45,4 @@
     (with-foreign-slots ((count headers) http-headers (:struct http-headers))
       (setf count count-hdrs)
       (setf headers pheaders))
-
     http-headers))