attack.sh: adapt to changes

[platform/upstream/libwebsockets.git] / lib / output.c

diff --git a/lib/output.c b/lib/output.c
index efb2606..9f72443 100644 (file)
--- a/lib/output.c
+++ b/lib/output.c
@@ -250,6 +250,23 @@ LWS_VISIBLE int lws_write(struct lws *wsi, unsigned char *buf, size_t len,
        int pre = 0, n;
        size_t orig_len = len;
 
+       if (wsi->parent_carries_io) {
+               struct lws_write_passthru pas;
+
+               pas.buf = buf;
+               pas.len = len;
+               pas.wp = wp;
+               pas.wsi = wsi;
+
+               if (wsi->parent->protocol->callback(wsi->parent,
+                               LWS_CALLBACK_CHILD_WRITE_VIA_PARENT,
+                               wsi->parent->user_space,
+                               (void *)&pas, 0))
+                       return 1;
+
+               return len;
+       }
+
        lws_stats_atomic_bump(wsi->context, pt, LWSSTATS_C_API_LWS_WRITE, 1);
 
        if ((int)len < 0) {
@@ -513,8 +530,8 @@ send_raw:
                             wp == LWS_WRITE_HTTP_FINAL) &&
                            wsi->u.http.content_length) {
                                wsi->u.http.content_remain -= len;
-                               lwsl_info("%s: content_remain = %lu\n", __func__,
-                                         (unsigned long)wsi->u.http.content_remain);
+                               lwsl_info("%s: content_remain = %llu\n", __func__,
+                                         (unsigned long long)wsi->u.http.content_remain);
                                if (!wsi->u.http.content_remain) {
                                        lwsl_info("%s: selecting final write mode\n", __func__);
                                        wp = LWS_WRITE_HTTP_FINAL;
@@ -613,7 +630,7 @@ LWS_VISIBLE int lws_serve_http_file_fragment(struct lws *wsi)
 
                        lwsl_notice("%s: doing range start %llu\n", __func__, wsi->u.http.range.start);
 
-                       if ((long)lws_vfs_file_seek_cur(wsi->u.http.fop_fd,
+                       if ((long long)lws_vfs_file_seek_cur(wsi->u.http.fop_fd,
                                                   wsi->u.http.range.start -
                                                   wsi->u.http.filepos) < 0)
                                goto file_had_it;
@@ -679,7 +696,7 @@ LWS_VISIBLE int lws_serve_http_file_fragment(struct lws *wsi)
                        if (wsi->sending_chunked) {
                                args.p = (char *)p;
                                args.len = n;
-                               args.max_len = poss + 128;
+                               args.max_len = (unsigned int)poss + 128;
                                args.final = wsi->u.http.filepos + n ==
                                             wsi->u.http.filelen;
                                if (user_callback_handle_rxflow(