Bump version: 0.62 → 0.63

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 0.61
+current_version = 0.63
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
 serialize = 
 	{major}.{minor}
@@ -10,7 +10,7 @@ serialize =
 search = VERSION "{current_version}"
 replace = VERSION "{new_version}"
 
-[bumpversion:file:PKGBUILD]
+[bumpversion:file:pkg/arch/PKGBUILD]
 search = pkgver={current_version}
 replace = pkgver={new_version}
 

.gitignore

@@ -1,8 +1,7 @@
-/pkg/
-/src/ustreamer-*/
-/src/v*.tar.gz
-/v*.tar.gz
-/ustreamer-*.pkg.tar.xz
+/pkg/arch/pkg/
+/pkg/arch/src/
+/pkg/arch/v*.tar.gz
+/pkg/arch/ustreamer-*.pkg.tar.xz
 /vgcore.*
 /ustreamer
 /*.sock

Makefile

@@ -8,7 +8,7 @@ CC ?= gcc
 # =====
 LIBS = -lm -ljpeg -pthread -levent -levent_pthreads -luuid
 override CFLAGS += -c -std=c11 -Wall -Wextra -D_GNU_SOURCE
-SOURCES = $(shell ls src/*.c src/encoders/cpu/*.c src/encoders/hw/*.c)
+SOURCES = $(shell ls src/*.c src/http/*.c src/encoders/cpu/*.c src/encoders/hw/*.c)
 PROG = ustreamer
 
 ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
@@ -29,8 +29,8 @@ install: $(PROG)
 
 
 regen:
-	tools/make-jpeg-h.py src/data/blank.jpeg src/data/blank_jpeg.h BLANK 640 480
-	tools/make-html-h.py src/data/index.html src/data/index_html.h HTML_INDEX_PAGE
+	tools/make-jpeg-h.py src/http/data/blank.jpeg src/http/data/blank_jpeg.h BLANK
+	tools/make-html-h.py src/http/data/index.html src/http/data/index_html.h INDEX
 
 
 $(PROG): $(OBJECTS)
@@ -59,5 +59,6 @@ push:
 
 clean-all: clean
 clean:
-	rm -f src/*.o src/encoders/*/*.o vgcore.* *.sock $(PROG)
-	rm -rf pkg src/$(PROG)-* src/v*.tar.gz v*.tar.gz $(PROG)-*.pkg.tar.xz
+	find src -name '*.o' -exec rm '{}' \;
+	rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.xz
+	rm -f vgcore.* *.sock $(PROG)

README.md

@@ -15,16 +15,14 @@
 | Option to skip frames when streaming<br>static images by HTTP to save traffic | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes <sup>2</sup> | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
 | Streaming via UNIX domain socket | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
 | Debug logs without recompiling,<br>performance statistics log,<br>access to HTTP broadcast parameters | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
+| Option to serve files<br>with a built-in HTTP server | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) Regular files only |
 | Access to webcam controls (focus, servos)<br>and settings such as brightness via HTTP | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes |
-| Option to serve files<br>with a built-in HTTP server, auth settings | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No <sup>3</sup> | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes |
 
 Footnotes:
   * ```1``` Long before µStreamer, I made a [patch](https://github.com/jacksonliam/mjpg-streamer/pull/164) to add DV-timings support to mjpg-streamer and to keep it from hanging up no device disconnection. Alas, the patch is far from perfect and I can't guarantee it will work every time - mjpg-streamer's source code is very complicated and its structure is hard to understand. With this in mind, along with needing multithreading and JPEG hardware acceleration in the future, I decided to make my own stream server from scratch instead of supporting legacy code.
   
   * ```2``` This feature allows to cut down outgoing traffic several-fold when broadcasting HDMI, but it increases CPU usage a little bit. The idea is that HDMI is a fully digital interface and each captured frame can be identical to the previous one byte-wise. There's no need to broadcast the same image over the net several times a second. With the `--drop-same-frames=20` option enabled, µStreamer will drop all the matching frames (with a limit of 20 in a row). Each new frame is matched with the previous one first by length, then using ```memcmp()```.
 
-  * ```3``` ...and there'll never be. µStreamer is designed UNIX-way, so if you need a small website with your broadcast, install NGINX.
-
 -----
 # TL;DR
 If you're going to live-stream from your backyard webcam and need to control it, use mjpg-streamer. If you need a high-quality image with high FPS - µStreamer for the win.

README.ru.md

@@ -15,16 +15,14 @@
 | Возможность пропуска фреймов при передаче<br>статического изображения по HTTP<br>для экономии трафика | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть <sup>2</sup> | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
 | Стрим через UNIX domain socket | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
 | Дебаг-логи без перекомпиляции,<br>логгирование статистики производительности,<br>возможность получения параметров<br>трансляции по HTTP | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
+| Возможность сервить файлы встроенным<br>HTTP-сервером  | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) Нет каталогов |
 | Поддержка контролов веб-камер (фокус,<br> движение сервами) и всяких настроек,<br> типа яркости, через HTTP | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть |
-| Возможность сервить файлы встроенным<br>HTTP-сервером, настройки авторизации | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет <sup>3</sup> | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть |
 
 Сносочки:
   * ```1``` Еще до написания µStreamer, я запилил [патч](https://github.com/jacksonliam/mjpg-streamer/pull/164), добавляющий в mjpg-streamer поддержку DV-таймингов и предотвращающий его зависание при отключении устройства. Однако патч, увы, далек от совершенства и я не гарантирую его стопроцентную работоспособность, поскольку код mjpg-streamer чрезвычайно запутан и очень плохо структурирован. Учитывая это, а также то, что в дальнейшем мне потребовались многопоточность и аппаратное кодирование JPEG, было принято решение написать свой стрим-сервер с нуля, чтобы не тратить силы на поддержку лишнего легаси.
   
   * ```2``` Это фича позволяет в несколько раз снизить объем исходящего трафика при трансляции HDMI, однако немного увеличивает загрузку процессора. Суть в том, что HDMI - полностью цифровой интерфейс, и новый захваченный фрейм может быть идентичен предыдущему в точности до байта. В этом случае нет нужды передавать одну и ту же картинку по сети несколько раз в секунду. При использовании опции `--drop-same-frames=20`, µStreamer будет дропать все одинаковые фреймы, но не более 20 подряд. Новый фрейм сравнивается с предыдущим сначала по длине, а затем помощью ```memcmp()```.
 
-  * ```3``` ... и не будет. µStreamer придерживается концепции UNIX-way, так что если вам нужно нарисовать маленький сайтик со встроенной трансляцией - просто поставьте NGINX.
-
 -----
 # TL;DR
 Если вам нужно вещать стрим с уличной камеры и управлять ее параметрами - возьмите mjpg-streamer. Если же вам нужно очень качественное изображение с высоким FPS - µStreamer ваш бро.

pkg/arch/PKGBUILD

@@ -3,7 +3,7 @@
 
 
 pkgname=ustreamer
-pkgver=0.61
+pkgver=0.63
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pi-kvm/ustreamer"

src/config.h

@@ -22,4 +22,4 @@
 
 #pragma once
 
-#define VERSION "0.61"
+#define VERSION "0.63"

src/device.c

@@ -497,11 +497,11 @@ static void _device_open_alloc_picbufs(struct device_t *dev) {
 	LOG_DEBUG("Allocating picture buffers ...");
 	A_CALLOC(dev->run->pictures, dev->run->n_buffers);
 
-	dev->run->max_picture_size = ((dev->run->width * dev->run->height) << 1) * 2;
+	dev->run->max_raw_image_size = ((dev->run->width * dev->run->height) << 1) * 2;
 	for (unsigned index = 0; index < dev->run->n_buffers; ++index) {
-		LOG_DEBUG("Allocating picture buffer %u sized %zu bytes... ", index, dev->run->max_picture_size);
-		A_CALLOC(dev->run->pictures[index].data, dev->run->max_picture_size);
-		dev->run->pictures[index].allocated = dev->run->max_picture_size;
+		LOG_DEBUG("Allocating picture buffer %u sized %zu bytes... ", index, dev->run->max_raw_image_size);
+		A_CALLOC(dev->run->pictures[index].data, dev->run->max_raw_image_size);
+		dev->run->pictures[index].allocated = dev->run->max_raw_image_size;
 	}
 }
 

src/device.h

@@ -66,7 +66,7 @@ struct device_runtime_t {
 //	unsigned			n_workers; // FIXME
 	struct hw_buffer_t	*hw_buffers;
 	struct picture_t	*pictures;
-	size_t				max_picture_size;
+	size_t				max_raw_image_size;
 	bool				capturing;
 };
 

src/encoders/cpu/encoder.c

@@ -40,14 +40,14 @@
 
 
 struct _jpeg_dest_manager_t {
-	struct			jpeg_destination_mgr mgr; // Default manager
-	JOCTET			*buffer; // Start of buffer
-	unsigned char	*outbuffer_cursor;
-	size_t			*written;
+	struct				jpeg_destination_mgr mgr; // Default manager
+	JOCTET				*buffer; // Start of buffer
+	struct picture_t	*picture;
+	unsigned char		*picture_data_cursor;
 };
 
 
-static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture, size_t *written);
+static void _jpeg_set_picture(j_compress_ptr jpeg, struct picture_t *picture);
 
 static void _jpeg_write_scanlines_yuyv(
 	struct jpeg_compress_struct *jpeg, const unsigned char *data,
@@ -79,10 +79,7 @@ void cpu_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned
 	jpeg.err = jpeg_std_error(&jpeg_error);
 	jpeg_create_compress(&jpeg);
 
-#	define PICTURE(_next) dev->run->pictures[index]._next
-
-	PICTURE(used) = 0;
-	_jpeg_set_dest_picture(&jpeg, PICTURE(data), &PICTURE(used));
+	_jpeg_set_picture(&jpeg, &dev->run->pictures[index]);
 
 	jpeg.image_width = dev->run->width;
 	jpeg.image_height = dev->run->height;
@@ -112,11 +109,11 @@ void cpu_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned
 	// https://stackoverflow.com/questions/19857766/error-handling-in-libjpeg
 	jpeg_finish_compress(&jpeg);
 	jpeg_destroy_compress(&jpeg);
-	assert(PICTURE(used) > 0);
-	assert(PICTURE(used) <= dev->run->max_picture_size);
+
+	assert(dev->run->pictures[index].used > 0);
 }
 
-static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture, size_t *written) {
+static void _jpeg_set_picture(j_compress_ptr jpeg, struct picture_t *picture) {
 	struct _jpeg_dest_manager_t *dest;
 
 	if (jpeg->dest == NULL) {
@@ -129,8 +126,10 @@ static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture,
 	dest->mgr.init_destination = _jpeg_init_destination;
 	dest->mgr.empty_output_buffer = _jpeg_empty_output_buffer;
 	dest->mgr.term_destination = _jpeg_term_destination;
-	dest->outbuffer_cursor = picture;
-	dest->written = written;
+	dest->picture = picture;
+	dest->picture_data_cursor = picture->data;
+
+	picture->used = 0;
 }
 
 #define YUV_R(_y, _, _v)	(((_y) + (359 * (_v))) >> 8)
@@ -262,7 +261,7 @@ static void _jpeg_write_scanlines_rgb24(
 	}
 }
 
-#define JPEG_OUTPUT_BUFFER_SIZE  4096
+#define JPEG_OUTPUT_BUFFER_SIZE 4096
 
 static void _jpeg_init_destination(j_compress_ptr jpeg) {
 	struct _jpeg_dest_manager_t *dest = (struct _jpeg_dest_manager_t *)jpeg->dest;
@@ -280,10 +279,13 @@ static boolean _jpeg_empty_output_buffer(j_compress_ptr jpeg) {
 	// Called whenever local jpeg buffer fills up
 
 	struct _jpeg_dest_manager_t *dest = (struct _jpeg_dest_manager_t *)jpeg->dest;
+	size_t new_used = dest->picture->used + JPEG_OUTPUT_BUFFER_SIZE;
 
-	memcpy(dest->outbuffer_cursor, dest->buffer, JPEG_OUTPUT_BUFFER_SIZE);
-	dest->outbuffer_cursor += JPEG_OUTPUT_BUFFER_SIZE;
-	*dest->written += JPEG_OUTPUT_BUFFER_SIZE;
+	assert(new_used <= dest->picture->allocated);
+
+	memcpy(dest->picture_data_cursor, dest->buffer, JPEG_OUTPUT_BUFFER_SIZE);
+	dest->picture_data_cursor += JPEG_OUTPUT_BUFFER_SIZE;
+	dest->picture->used = new_used;
 
 	dest->mgr.next_output_byte = dest->buffer;
 	dest->mgr.free_in_buffer = JPEG_OUTPUT_BUFFER_SIZE;
@@ -296,12 +298,15 @@ static void _jpeg_term_destination(j_compress_ptr jpeg) {
 	// Usually needs to flush buffer
 
 	struct _jpeg_dest_manager_t *dest = (struct _jpeg_dest_manager_t *)jpeg->dest;
-	size_t data_count = JPEG_OUTPUT_BUFFER_SIZE - dest->mgr.free_in_buffer;
+	size_t final = JPEG_OUTPUT_BUFFER_SIZE - dest->mgr.free_in_buffer;
+	size_t new_used = dest->picture->used + final;
+
+	assert(new_used <= dest->picture->allocated);
 
 	// Write any data remaining in the buffer
-	memcpy(dest->outbuffer_cursor, dest->buffer, data_count);
-	dest->outbuffer_cursor += data_count;
-	*dest->written += data_count;
+	memcpy(dest->picture_data_cursor, dest->buffer, final);
+	dest->picture_data_cursor += final;
+	dest->picture->used = new_used;
 }
 
 #undef JPEG_OUTPUT_BUFFER_SIZE

src/encoders/omx/encoder.c

@@ -78,6 +78,7 @@ struct omx_encoder_t *omx_encoder_init() {
 	//   - https://github.com/gagle/raspberrypi-openmax-jpeg/blob/master/jpeg.c
 	//   - https://www.raspberrypi.org/forums/viewtopic.php?t=154790
 	//   - https://bitbucket.org/bensch128/omxjpegencode/src/master/jpeg_encoder.cpp
+	//   - http://home.nouwen.name/RaspberryPi/documentation/ilcomponents/image_encode.html
 
 	struct omx_encoder_t *omx;
 	OMX_ERRORTYPE error;
@@ -198,7 +199,7 @@ int omx_encoder_compress_buffer(struct omx_encoder_t *omx, struct device_t *dev,
 		if (omx->output_available) {
 			omx->output_available = false;
 
-			assert(PICTURE(used) + OUT(nFilledLen) <= dev->run->max_picture_size);
+			assert(PICTURE(used) + OUT(nFilledLen) <= PICTURE(allocated));
 			memcpy(PICTURE(data) + PICTURE(used), OUT(pBuffer) + OUT(nOffset), OUT(nFilledLen));
 			PICTURE(used) += OUT(nFilledLen);
 
@@ -247,8 +248,6 @@ int omx_encoder_compress_buffer(struct omx_encoder_t *omx, struct device_t *dev,
 }
 
 static int _omx_init_component(struct omx_encoder_t *omx) {
-	// http://home.nouwen.name/RaspberryPi/documentation/ilcomponents/image_encode.html
-
 	OMX_ERRORTYPE error;
 
 	OMX_CALLBACKTYPE callbacks;
@@ -313,7 +312,7 @@ static int _omx_setup_input(struct omx_encoder_t *omx, struct device_t *dev) {
 #	undef ALIGN_HEIGHT
 	portdef.format.image.bFlagErrorConcealment = OMX_FALSE;
 	portdef.format.image.eCompressionFormat = OMX_IMAGE_CodingUnused;
-	portdef.nBufferSize = dev->run->max_picture_size;
+	portdef.nBufferSize = dev->run->max_raw_image_size;
 
 #	define MAP_FORMAT(_v4l2_format, _omx_format) \
 		case _v4l2_format: { portdef.format.image.eColorFormat = _omx_format; break; }

src/http/base64.c

@@ -0,0 +1,71 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "../tools.h"
+#include "base64.h"
+
+
+static const char ENCODING_TABLE[] = {
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+	'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+	'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+	'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+	'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+	'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+	'w', 'x', 'y', 'z', '0', '1', '2', '3',
+	'4', '5', '6', '7', '8', '9', '+', '/',
+};
+
+static const unsigned MOD_TABLE[] = {0, 2, 1};
+
+
+char *base64_encode(const unsigned char *str) {
+	size_t str_len = strlen((const char *)str);
+	size_t encoded_size = 4 * ((str_len + 2) / 3) + 1; // +1 for '\0'
+	char *encoded;
+
+	A_CALLOC(encoded, encoded_size);
+
+	for (unsigned str_index = 0, encoded_index = 0; str_index < str_len;) {
+		unsigned octet_a = (str_index < str_len ? (unsigned char)str[str_index++] : 0);
+		unsigned octet_b = (str_index < str_len ? (unsigned char)str[str_index++] : 0);
+		unsigned octet_c = (str_index < str_len ? (unsigned char)str[str_index++] : 0);
+
+		unsigned triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
+
+		encoded[encoded_index++] = ENCODING_TABLE[(triple >> 3 * 6) & 0x3F];
+		encoded[encoded_index++] = ENCODING_TABLE[(triple >> 2 * 6) & 0x3F];
+		encoded[encoded_index++] = ENCODING_TABLE[(triple >> 1 * 6) & 0x3F];
+		encoded[encoded_index++] = ENCODING_TABLE[(triple >> 0 * 6) & 0x3F];
+	}
+
+	for (unsigned index = 0; index < MOD_TABLE[str_len % 3]; index++) {
+		encoded[encoded_size - 2 - index] = '=';
+	}
+
+	encoded[encoded_size - 1] = '\0';
+	return encoded;
+}

src/http/base64.h

@@ -0,0 +1,28 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once
+
+#include <stdlib.h>
+
+
+char *base64_encode(const unsigned char *str);

src/http/data/blank_jpeg.h

@@ -20,6 +20,9 @@
 *****************************************************************************/
 
 
+#pragma once
+
+
 const unsigned BLANK_JPEG_WIDTH = 640;
 const unsigned BLANK_JPEG_HEIGHT = 480;
 

src/http/data/index_html.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../config.h"
+#include "../../config.h"
 
 
 const char HTML_INDEX_PAGE[] = " \

src/http/mime.c

@@ -0,0 +1,73 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#include <string.h>
+
+#include <event2/util.h>
+
+#include "../tools.h"
+
+#include "mime.h"
+
+
+static const struct {
+	const char *ext;
+	const char *mime;
+} _MIME_TYPES[] = {
+	{"html",	"text/html"},
+	{"htm",		"text/html"},
+	{"css",		"text/css"},
+	{"js",		"text/javascript"},
+	{"txt",		"text/plain"},
+	{"jpg",		"image/jpeg"},
+	{"jpeg",	"image/jpeg"},
+	{"png",		"image/png"},
+	{"gif",		"image/gif"},
+	{"ico",		"image/x-icon"},
+	{"bmp",		"image/bmp"},
+	{"svg",		"image/svg+xml"},
+	{"swf",		"application/x-shockwave-flash"},
+	{"cab",		"application/x-shockwave-flash"},
+	{"jar",		"application/java-archive"},
+	{"json",	"application/json"},
+};
+
+
+const char *guess_mime_type(const char *path) {
+	char *dot;
+	char *ext;
+
+	dot = strchr(path, '.');
+	if (dot == NULL || strchr(dot, '/') != NULL) {
+		goto misc;
+	}
+
+	ext = dot + 1;
+	for (unsigned index = 0; index < ARRAY_LEN(_MIME_TYPES); ++index) {
+		if (!evutil_ascii_strcasecmp(ext, _MIME_TYPES[index].ext)) {
+			return _MIME_TYPES[index].mime;
+		}
+	}
+
+	misc:
+		return "application/misc";
+}

src/http/mime.h

@@ -0,0 +1,26 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once
+
+
+const char *guess_mime_type(const char *str);

src/http/path.c

@@ -0,0 +1,183 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "../tools.h"
+
+#include "path.h"
+
+
+char *simplify_request_path(const char *str) {
+	// Based on Lighttpd sources:
+	//   - https://github.com/lighttpd/lighttpd1.4/blob/b31e7840d5403bc640579135b7004793b9ccd6c0/src/buffer.c#L840
+	//   - https://github.com/lighttpd/lighttpd1.4/blob/77c01f981725512653c01cde5ca74c11633dfec4/src/t/test_buffer.c
+
+	char ch; // Current character
+	char pre1; // The one before
+	char pre2; // The one before that
+	char *simplified;
+	char *start;
+	char *out;
+	char *slash;
+
+	A_CALLOC(simplified, strlen(str) + 1);
+
+	if (str[0] == '\0') {
+		simplified[0] = '\0';
+		return simplified;
+	}
+
+	start = simplified;
+	out = simplified;
+	slash = simplified;
+
+	// Skip leading spaces
+	for (; *str == ' '; ++str);
+
+	if (*str == '.') {
+		if (str[1] == '/' || str[1] == '\0') {
+			++str;
+		} else if (str[1] == '.' && (str[2] == '/' || str[2] == '\0')) {
+			str += 2;
+		}
+	}
+
+	pre1 = '\0';
+	ch = *(str++);
+
+	while (ch != '\0') {
+		pre2 = pre1;
+		pre1 = ch;
+
+		// Possibly: out == str - need to read first
+		ch = *str;
+		*out = pre1;
+
+		out++;
+		str++;
+		// (out <= str) still true; also now (slash < out)
+
+		if (ch == '/' || ch == '\0') {
+			size_t toklen = out - slash;
+
+			if (toklen == 3 && pre2 == '.' && pre1 == '.' && *slash == '/') {
+				// "/../" or ("/.." at end of string)
+				out = slash;
+				// If there is something before "/..", there is at least one
+				// component, which needs to be removed
+				if (out > start) {
+					--out;
+					for (; out > start && *out != '/'; --out);
+				}
+
+				// Don't kill trailing '/' at end of path
+				if (ch == '\0') {
+					++out;
+				}
+				// slash < out before, so out_new <= slash + 1 <= out_before <= str
+			} else if (toklen == 1 || (pre2 == '/' && pre1 == '.')) {
+				// "//" or "/./" or (("/" or "/.") at end of string)
+				out = slash;
+				// Don't kill trailing '/' at end of path
+				if (ch == '\0') {
+					++out;
+				}
+				// Slash < out before, so out_new <= slash + 1 <= out_before <= str
+			}
+
+			slash = out;
+		}
+	}
+
+	*out = '\0';
+	return simplified;
+}
+
+#if 0
+
+int test_simplify_request_path(const char *sample, const char *expected) {
+	char *result = simplify_request_path(sample);
+	int retval = -!!strcmp(result, expected);
+
+	printf("Testing '%s' -> '%s' ... ", sample, expected);
+	if (retval == 0) {
+		printf("ok\n");
+	} else {
+		printf("FAILED; got '%s'\n", result);
+	}
+	free(result);
+	return retval;
+}
+
+int main(void) {
+	int retval = 0;
+
+#	define TEST_SIMPLIFY_REQUEST_PATH(_sample, _expected) { \
+			retval += test_simplify_request_path(_sample, _expected); \
+		}
+
+	TEST_SIMPLIFY_REQUEST_PATH("", "");
+	TEST_SIMPLIFY_REQUEST_PATH("   ", "");
+	TEST_SIMPLIFY_REQUEST_PATH("/", "/");
+	TEST_SIMPLIFY_REQUEST_PATH("//", "/");
+	TEST_SIMPLIFY_REQUEST_PATH("abc", "abc");
+	TEST_SIMPLIFY_REQUEST_PATH("abc//", "abc/");
+	TEST_SIMPLIFY_REQUEST_PATH("abc/./xyz", "abc/xyz");
+	TEST_SIMPLIFY_REQUEST_PATH("abc/.//xyz", "abc/xyz");
+	TEST_SIMPLIFY_REQUEST_PATH("abc/../xyz", "/xyz");
+	TEST_SIMPLIFY_REQUEST_PATH("/abc/./xyz", "/abc/xyz");
+	TEST_SIMPLIFY_REQUEST_PATH("/abc//./xyz", "/abc/xyz");
+	TEST_SIMPLIFY_REQUEST_PATH("/abc/../xyz", "/xyz");
+	TEST_SIMPLIFY_REQUEST_PATH("abc/../xyz/.", "/xyz/");
+	TEST_SIMPLIFY_REQUEST_PATH("/abc/../xyz/.", "/xyz/");
+	TEST_SIMPLIFY_REQUEST_PATH("abc/./xyz/..", "abc/");
+	TEST_SIMPLIFY_REQUEST_PATH("/abc/./xyz/..", "/abc/");
+	TEST_SIMPLIFY_REQUEST_PATH(".", "");
+	TEST_SIMPLIFY_REQUEST_PATH("..", "");
+	TEST_SIMPLIFY_REQUEST_PATH("...", "...");
+	TEST_SIMPLIFY_REQUEST_PATH("....", "....");
+	TEST_SIMPLIFY_REQUEST_PATH(".../", ".../");
+	TEST_SIMPLIFY_REQUEST_PATH("./xyz/..", "/");
+	TEST_SIMPLIFY_REQUEST_PATH(".//xyz/..", "/");
+	TEST_SIMPLIFY_REQUEST_PATH("/./xyz/..", "/");
+	TEST_SIMPLIFY_REQUEST_PATH(".././xyz/..", "/");
+	TEST_SIMPLIFY_REQUEST_PATH("/.././xyz/..", "/");
+	TEST_SIMPLIFY_REQUEST_PATH("/.././xyz/..", "/");
+	TEST_SIMPLIFY_REQUEST_PATH("../../../etc/passwd", "/etc/passwd");
+	TEST_SIMPLIFY_REQUEST_PATH("/../../../etc/passwd", "/etc/passwd");
+	TEST_SIMPLIFY_REQUEST_PATH("   ../../../etc/passwd", "/etc/passwd");
+	TEST_SIMPLIFY_REQUEST_PATH("   /../../../etc/passwd", "/etc/passwd");
+	TEST_SIMPLIFY_REQUEST_PATH("   /foo/bar/../../../etc/passwd", "/etc/passwd");
+
+#	undef TEST_SIMPLIFY_REQUEST_PATH
+
+	if (retval < 0) {
+		printf("===== TEST FAILED =====\n");
+	}
+	return retval;
+}
+
+#endif

src/http/path.h

@@ -0,0 +1,26 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once
+
+
+char *simplify_request_path(const char *str);

src/http/server.c

@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <assert.h>
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/stat.h>
@@ -46,11 +47,15 @@
 #	error Required libevent-pthreads support
 #endif
 
-#include "tools.h"
-#include "logging.h"
-#include "encoder.h"
-#include "stream.h"
-#include "http.h"
+#include "../tools.h"
+#include "../logging.h"
+#include "../encoder.h"
+#include "../stream.h"
+
+#include "base64.h"
+#include "mime.h"
+#include "static.h"
+#include "server.h"
 
 #include "data/index_html.h"
 #include "data/blank_jpeg.h"
@@ -58,8 +63,10 @@
 
 static bool _http_get_param_true(struct evkeyvalq *params, const char *key);
 static char *_http_get_param_uri(struct evkeyvalq *params, const char *key);
+static int _http_preprocess_request(struct evhttp_request *request, struct http_server_t *server);
 
-static void _http_callback_root(struct evhttp_request *request, void *arg);
+static void _http_callback_root(struct evhttp_request *request, void *v_server);
+static void _http_callback_static(struct evhttp_request *request, void *v_server);
 static void _http_callback_state(struct evhttp_request *request, void *v_server);
 static void _http_callback_snapshot(struct evhttp_request *request, void *v_server);
 
@@ -89,6 +96,10 @@ struct http_server_t *http_server_init(struct stream_t *stream) {
 	A_CALLOC(server, 1);
 	server->host = "127.0.0.1";
 	server->port = 8080;
+	server->unix_path = "";
+	server->user = "";
+	server->passwd = "";
+	server->static_path = "";
 	server->timeout = 10;
 	server->run = run;
 
@@ -98,12 +109,6 @@ struct http_server_t *http_server_init(struct stream_t *stream) {
 	assert((run->base = event_base_new()));
 	assert((run->http = evhttp_new(run->base)));
 	evhttp_set_allowed_methods(run->http, EVHTTP_REQ_GET|EVHTTP_REQ_HEAD);
-
-	assert(!evhttp_set_cb(run->http, "/", _http_callback_root, NULL));
-	assert(!evhttp_set_cb(run->http, "/state", _http_callback_state, (void *)server));
-	assert(!evhttp_set_cb(run->http, "/snapshot", _http_callback_snapshot, (void *)server));
-	assert(!evhttp_set_cb(run->http, "/stream", _http_callback_stream, (void *)server));
-
 	return server;
 }
 
@@ -128,6 +133,10 @@ void http_server_destroy(struct http_server_t *server) {
 		client = next;
 	}
 
+	if (server->run->auth_token) {
+		free(server->run->auth_token);
+	}
+
 	free(server->run->exposed->picture.data);
 	free(server->run->exposed);
 	free(server->run);
@@ -135,16 +144,30 @@ void http_server_destroy(struct http_server_t *server) {
 }
 
 int http_server_listen(struct http_server_t *server) {
-	struct timeval refresh_interval;
-
-	refresh_interval.tv_sec = 0;
-	if (server->run->stream->dev->desired_fps > 0) {
-		refresh_interval.tv_usec = 1000000 / (server->run->stream->dev->desired_fps * 2);
-	} else {
-		refresh_interval.tv_usec = 16000; // ~60fps
+	{
+		if (server->static_path[0] != '\0') {
+			evhttp_set_gencb(server->run->http, _http_callback_static, (void *)server);
+		} else {
+			assert(!evhttp_set_cb(server->run->http, "/", _http_callback_root, (void *)server));
+		}
+		assert(!evhttp_set_cb(server->run->http, "/state", _http_callback_state, (void *)server));
+		assert(!evhttp_set_cb(server->run->http, "/snapshot", _http_callback_snapshot, (void *)server));
+		assert(!evhttp_set_cb(server->run->http, "/stream", _http_callback_stream, (void *)server));
+	}
+
+	{
+		struct timeval refresh_interval;
+
+		refresh_interval.tv_sec = 0;
+		if (server->run->stream->dev->desired_fps > 0) {
+			refresh_interval.tv_usec = 1000000 / (server->run->stream->dev->desired_fps * 2);
+		} else {
+			refresh_interval.tv_usec = 16000; // ~60fps
+		}
+
+		assert((server->run->refresh = event_new(server->run->base, -1, EV_PERSIST, _http_exposed_refresh, server)));
+		assert(!event_add(server->run->refresh, &refresh_interval));
 	}
-	assert((server->run->refresh = event_new(server->run->base, -1, EV_PERSIST, _http_exposed_refresh, server)));
-	assert(!event_add(server->run->refresh, &refresh_interval));
 
 	server->run->drop_same_frames_blank = max_u(server->drop_same_frames, server->run->drop_same_frames_blank);
 
@@ -154,7 +177,23 @@ int http_server_listen(struct http_server_t *server) {
 
 	evhttp_set_timeout(server->run->http, server->timeout);
 
-	if (server->unix_path) {
+	if (server->user[0] != '\0') {
+		char *raw_token;
+		char *encoded_token;
+
+		A_CALLOC(raw_token, strlen(server->user) + strlen(server->passwd) + 2);
+		sprintf(raw_token, "%s:%s", server->user, server->passwd);
+		encoded_token = base64_encode((unsigned char *)raw_token);
+		free(raw_token);
+
+		A_CALLOC(server->run->auth_token, strlen(encoded_token) + 16);
+		sprintf(server->run->auth_token, "Basic %s", encoded_token);
+		free(encoded_token);
+
+		LOG_INFO("Using HTTP basic auth");
+	}
+
+	if (server->unix_path[0] != '\0') {
 		struct sockaddr_un unix_addr;
 		int unix_fd_flags;
 
@@ -221,7 +260,12 @@ static bool _http_get_param_true(struct evkeyvalq *params, const char *key) {
 	const char *value_str;
 
 	if ((value_str = evhttp_find_header(params, key)) != NULL) {
-		if (!strcasecmp(value_str, "true") || !strcasecmp(value_str, "yes") || value_str[0] == '1') {
+		if (
+			value_str[0] == '1'
+			|| value_str[0] == 'y'
+			|| !evutil_ascii_strcasecmp(value_str, "true")
+			|| !evutil_ascii_strcasecmp(value_str, "yes")
+		) {
 			return true;
 		}
 	}
@@ -240,17 +284,36 @@ static char *_http_get_param_uri(struct evkeyvalq *params, const char *key) {
 #define ADD_HEADER(_key, _value) \
 	assert(!evhttp_add_header(evhttp_request_get_output_headers(request), _key, _value))
 
-#define PROCESS_HEAD_REQUEST { \
-		if (evhttp_request_get_command(request) == EVHTTP_REQ_HEAD) { \
-			evhttp_send_reply(request, HTTP_OK, "OK", NULL); \
+static int _http_preprocess_request(struct evhttp_request *request, struct http_server_t *server) {
+	if (server->run->auth_token) {
+		const char *token = evhttp_find_header(evhttp_request_get_input_headers(request), "Authorization");
+
+		if (token == NULL || strcmp(token, server->run->auth_token) != 0) {
+			ADD_HEADER("WWW-Authenticate", "Basic realm=\"Restricted area\"");
+			evhttp_send_reply(request, 401, "Unauthorized", NULL);
+			return -1;
+		}
+	}
+
+	if (evhttp_request_get_command(request) == EVHTTP_REQ_HEAD) { \
+		evhttp_send_reply(request, HTTP_OK, "OK", NULL); \
+		return -1;
+	}
+
+	return 0;
+}
+
+#define PREPROCESS_REQUEST { \
+		if (_http_preprocess_request(request, server) < 0) { \
 			return; \
 		} \
 	}
 
-static void _http_callback_root(struct evhttp_request *request, UNUSED void *arg) {
+static void _http_callback_root(struct evhttp_request *request, void *v_server) {
+	struct http_server_t *server = (struct http_server_t *)v_server;
 	struct evbuffer *buf;
 
-	PROCESS_HEAD_REQUEST;
+	PREPROCESS_REQUEST;
 
 	assert((buf = evbuffer_new()));
 	assert(evbuffer_add_printf(buf, "%s", HTML_INDEX_PAGE));
@@ -259,13 +322,86 @@ static void _http_callback_root(struct evhttp_request *request, UNUSED void *arg
 	evbuffer_free(buf);
 }
 
+static void _http_callback_static(struct evhttp_request *request, void *v_server) {
+	struct http_server_t *server = (struct http_server_t *)v_server;
+	struct evbuffer *buf = NULL;
+	struct evhttp_uri *uri = NULL;
+	char *uri_path;
+	char *decoded_path = NULL;
+	char *static_path = NULL;
+	int fd = -1;
+	struct stat st;
+
+	PREPROCESS_REQUEST;
+
+	if ((uri = evhttp_uri_parse(evhttp_request_get_uri(request))) == NULL) {
+		goto bad_request;
+	}
+	if ((uri_path = (char *)evhttp_uri_get_path(uri)) == NULL) {
+		uri_path = "/";
+	}
+
+	if ((decoded_path = evhttp_uridecode(uri_path, 0, NULL)) == NULL) {
+		goto bad_request;
+	}
+
+	assert((buf = evbuffer_new()));
+
+	if ((static_path = find_static_file_path(server->static_path, decoded_path)) == NULL) {
+		goto not_found;
+	}
+
+	if ((fd = open(static_path, O_RDONLY)) < 0) {
+		LOG_PERROR("HTTP: Can't open found static file %s", static_path);
+		goto not_found;
+	}
+
+	if (fstat(fd, &st) < 0) {
+		LOG_PERROR("HTTP: Can't stat() found static file %s", static_path);
+		goto not_found;
+	}
+
+	if (evbuffer_add_file(buf, fd, 0, st.st_size) < 0) {
+		LOG_ERROR("HTTP: Can't serve static file %s", static_path);
+		goto not_found;
+	}
+	ADD_HEADER("Content-Type", guess_mime_type(static_path));
+	evhttp_send_reply(request, HTTP_OK, "OK", buf);
+	goto cleanup;
+
+	bad_request:
+		evhttp_send_error(request, HTTP_BADREQUEST, NULL);
+		goto cleanup;
+
+	not_found:
+		evhttp_send_error(request, HTTP_NOTFOUND, NULL);
+		goto cleanup;
+
+	cleanup:
+		if (fd >= 0) {
+			close(fd);
+		}
+		if (static_path) {
+			free(static_path);
+		}
+		if (buf) {
+			evbuffer_free(buf);
+		}
+		if (decoded_path) {
+			free(decoded_path);
+		}
+		if (uri) {
+			evhttp_uri_free(uri);
+		}
+}
+
 static void _http_callback_state(struct evhttp_request *request, void *v_server) {
 	struct http_server_t *server = (struct http_server_t *)v_server;
 	struct evbuffer *buf;
 	enum encoder_type_t encoder_run_type;
 	unsigned encoder_run_quality;
 
-	PROCESS_HEAD_REQUEST;
+	PREPROCESS_REQUEST;
 
 #	define ENCODER(_next) server->run->stream->encoder->_next
 
@@ -319,7 +455,7 @@ static void _http_callback_snapshot(struct evhttp_request *request, void *v_serv
 	struct evbuffer *buf;
 	char header_buf[64];
 
-	PROCESS_HEAD_REQUEST;
+	PREPROCESS_REQUEST;
 
 #	define EXPOSED(_next) server->run->exposed->_next
 
@@ -384,7 +520,7 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
 	unsigned short client_port;
 	uuid_t uuid;
 
-	PROCESS_HEAD_REQUEST;
+	PREPROCESS_REQUEST;
 
 	conn = evhttp_request_get_connection(request);
 	if (conn != NULL) {
@@ -431,7 +567,7 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
 	}
 }
 
-#undef PROCESS_HEAD_REQUEST
+#undef PREPROCESS_REQUEST
 
 static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_client) {
 #	define BOUNDARY "boundarydonotcross"

src/http/server.h

@@ -20,6 +20,8 @@
 *****************************************************************************/
 
 
+#pragma once
+
 #include <stdbool.h>
 
 #include <sys/stat.h>
@@ -28,8 +30,8 @@
 #include <event2/http.h>
 #include <event2/util.h>
 
-#include "tools.h"
-#include "stream.h"
+#include "../tools.h"
+#include "../stream.h"
 
 
 struct stream_client_t {
@@ -70,6 +72,7 @@ struct http_server_runtime_t {
 	struct event_base		*base;
 	struct evhttp			*http;
 	evutil_socket_t			unix_fd;
+	char					*auth_token;
 	struct event			*refresh;
 	struct stream_t			*stream;
 	struct exposed_t		*exposed;
@@ -84,6 +87,9 @@ struct http_server_t {
 	char		*unix_path;
 	bool		unix_rm;
 	mode_t		unix_mode;
+	char		*user;
+	char		*passwd;
+	char		*static_path;
 	unsigned	drop_same_frames;
 	bool		slowdown;
 	unsigned	fake_width;

src/http/static.c

@@ -0,0 +1,88 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "../tools.h"
+#include "../logging.h"
+
+#include "path.h"
+#include "static.h"
+
+
+char *find_static_file_path(const char *root_path, const char *request_path) {
+	char *simplified_path;
+	char *path = NULL;
+	struct stat st;
+
+	simplified_path = simplify_request_path(request_path);
+	if (simplified_path[0] == '\0') {
+		goto error;
+	}
+
+	A_CALLOC(path, strlen(root_path) + strlen(simplified_path) + 32);
+	sprintf(path, "%s/%s", root_path, simplified_path);
+
+#	define LOAD_STAT { \
+			if (lstat(path, &st) < 0) { \
+				/* LOG_PERROR("Can't stat() file %s", path); */ \
+				goto error; \
+			} \
+		}
+
+	LOAD_STAT;
+	if (S_ISDIR(st.st_mode)) {
+		strcat(path, "/index.html");
+		LOAD_STAT;
+	}
+
+#	undef LOAD_STAT
+
+	if (!S_ISREG(st.st_mode)) {
+		// LOG_ERROR("Not a regulary file: %s", path);
+		goto error;
+	}
+
+	if (access(path, R_OK) < 0) {
+		// LOG_PERROR("Can't access() R_OK file %s", path);
+		goto error;
+	}
+
+	goto ok;
+
+	error:
+		if (path) {
+			free(path);
+		}
+		path = NULL;
+
+	ok:
+		free(simplified_path);
+
+	return path;
+}

src/http/static.h

@@ -0,0 +1,26 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once
+
+
+char *find_static_file_path(const char *root_path, const char *request_path);

src/logging.h

@@ -25,16 +25,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <time.h>
 #include <assert.h>
 
 #include <pthread.h>
 
-#include <sys/types.h>
-#include <sys/syscall.h>
-
 #include "tools.h"
 
 
@@ -72,7 +68,7 @@ pthread_mutex_t log_mutex;
 	}
 
 #define LOG_PRINTF_NOLOCK(_label, _msg, ...) { \
-		printf("-- " _label " [%.03Lf tid=%ld] -- " _msg "\n", get_now_monotonic(), syscall(SYS_gettid), ##__VA_ARGS__); \
+		printf("-- " _label " [%.03Lf tid=%d] -- " _msg "\n", get_now_monotonic(), get_thread_id(), ##__VA_ARGS__); \
 		fflush(stdout); \
 	}
 
@@ -84,9 +80,9 @@ pthread_mutex_t log_mutex;
 
 #define LOG_PERROR(_msg, ...) { \
 		char _buf[1024] = ""; \
-		char *_ptr = strerror_r(errno, _buf, 1024); \
+		char *_ptr = errno_to_string(_buf, 1024); \
 		LOGGING_LOCK; \
-		printf("-- ERROR [%.03Lf tid=%ld] -- " _msg ": %s\n", get_now_monotonic(), syscall(SYS_gettid), ##__VA_ARGS__, _ptr); \
+		printf("-- ERROR [%.03Lf tid=%d] -- " _msg ": %s\n", get_now_monotonic(), get_thread_id(), ##__VA_ARGS__, _ptr); \
 		fflush(stdout); \
 		LOGGING_UNLOCK; \
 	}
@@ -124,3 +120,13 @@ pthread_mutex_t log_mutex;
 			LOGGING_UNLOCK; \
 		} \
 	}
+
+
+INLINE char *errno_to_string(char *buf, size_t size) {
+#if defined(__GLIBC__) && defined(_GNU_SOURCE)
+	return strerror_r(errno, buf, size);
+#else
+	strerror_r(errno, buf, size);
+	return buf;
+#endif
+}

src/main.c

@@ -38,7 +38,7 @@
 #include "device.h"
 #include "encoder.h"
 #include "stream.h"
-#include "http.h"
+#include "http/server.h"
 
 
 static const char _SHORT_OPTS[] = "d:i:x:y:m:a:f:z:ntb:w:q:c:s:p:u:ro:e:lhv";
@@ -79,11 +79,14 @@ static const struct option _LONG_OPTS[] = {
 	{"unix",					required_argument,	NULL,	'u'},
 	{"unix-rm",					no_argument,		NULL,	'r'},
 	{"unix-mode",				required_argument,	NULL,	'o'},
+	{"user",					required_argument,	NULL,	3000},
+	{"passwd",					required_argument,	NULL,	3001},
+	{"static",					required_argument,	NULL,	3002},
 	{"drop-same-frames",		required_argument,	NULL,	'e'},
 	{"slowdown",				no_argument,		NULL,	'l'},
-	{"fake-width",				required_argument,	NULL,	3001},
-	{"fake-height",				required_argument,	NULL,	3002},
-	{"server-timeout",			required_argument,	NULL,	3003},
+	{"fake-width",				required_argument,	NULL,	3003},
+	{"fake-height",				required_argument,	NULL,	3004},
+	{"server-timeout",			required_argument,	NULL,	3005},
 
 	{"perf",					no_argument,		NULL,	5000},
 	{"verbose",					no_argument,		NULL,	5001},
@@ -122,21 +125,21 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s
 	printf("    -a|--tv-standard <std>  ───────── Force TV standard.\n");
 	printf("                                      Available: %s; default: disabled.\n\n", STANDARDS_STR);
 	printf("    -f|--desired-fps <N>  ─────────── Desired FPS. Default: maximum as possible.\n\n");
-	printf("    -z|--min-frame-size <N>  ──────── Drop frames smaller then this limit.\n");
-	printf("                                      Useful if the device produces small-sized garbage frames.\n\n");
+	printf("    -z|--min-frame-size <N>  ──────── Drop frames smaller then this limit. Useful if the device\n");
+	printf("                                      produces small-sized garbage frames. Default: disabled.\n\n");
 	printf("    -n|--persistent  ──────────────── Don't re-initialize device on timeout. Default: disabled.\n\n");
 	printf("    -t|--dv-timings  ──────────────── Enable DV timings queriyng and events processing.\n");
 	printf("                                      Supports automatic resolution changing. Default: disabled.\n\n");
 	printf("    -b|--buffers <N>  ─────────────── The number of buffers to receive data from the device.\n");
 	printf("                                      Each buffer may processed using an intermediate thread.\n");
-	printf("                                      Default: %u (the number of CPU cores (but not more 4) + 1)\n\n", dev->n_buffers);
+	printf("                                      Default: %u (the number of CPU cores (but not more 4) + 1).\n\n", dev->n_buffers);
 	printf("    -w|--workers <N>  ─────────────── The number of worker threads. Default: %u (== --buffers).\n\n", dev->n_workers);
 	printf("    -q|--quality <N>  ─────────────── Set quality of JPEG encoding from 1 to 100 (best). Default: %u.\n\n", encoder->quality);
 	printf("    -c|--encoder <type>  ──────────── Use specified encoder. It may affects to workers number.\n");
 	printf("                                      Available: %s; default: CPU.\n\n", ENCODER_TYPES_STR);
 	printf("    --device-timeout <seconds>  ───── Timeout for device querying. Default: %u\n\n", dev->timeout);
 	printf("    --device-error-delay <seconds>  ─ Delay before trying to connect to the device again\n");
-	printf("                                      after timeout. Default: %u\n\n", dev->error_delay);
+	printf("                                      after an error (timeout for example). Default: %u\n\n", dev->error_delay);
 	printf("Image control options:\n");
 	printf("══════════════════════\n");
 	printf("    --brightness <N>  ───────────── Set brightness. Default: no change.\n\n");
@@ -154,20 +157,24 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s
 	printf("    --gain-auto  ────────────────── Enable automatic gain control. Default: no change.\n\n");
 	printf("HTTP server options:\n");
 	printf("════════════════════\n");
-	printf("    -s|--host <address>  ──────── Listen on Hostname or IP. Default: %s\n\n", server->host);
-	printf("    -p|--port <N>  ────────────── Bind to this TCP port. Default: %u\n\n", server->port);
-	printf("    -u|--unix <path>  ─────────── Bind to UNIX domain socket. Default: disabled\n\n");
-	printf("    -r|--unix-rm  ─────────────── Try to remove old UNIX socket file before binding. Default: disabled\n\n");
-	printf("    -o|--unix-mode <mode>  ────── Set UNIX socket file permissions (like 777). Default: disabled\n\n");
+	printf("    -s|--host <address>  ──────── Listen on Hostname or IP. Default: %s.\n\n", server->host);
+	printf("    -p|--port <N>  ────────────── Bind to this TCP port. Default: %u.\n\n", server->port);
+	printf("    -u|--unix <path>  ─────────── Bind to UNIX domain socket. Default: disabled.\n\n");
+	printf("    -r|--unix-rm  ─────────────── Try to remove old UNIX socket file before binding. Default: disabled.\n\n");
+	printf("    -o|--unix-mode <mode>  ────── Set UNIX socket file permissions (like 777). Default: disabled.\n\n");
+	printf("    --user <name>  ────────────── HTTP basic auth user. Default: disabled.\n\n");
+	printf("    --passwd <str>  ───────────── HTTP basic auth passwd. Default: empty.\n\n");
+	printf("    --static <path> ───────────── Path to dir with static files instead of embedded root index page.\n");
+	printf("                                  Symlinks are not supported for security reasons. Default: disabled.\n\n");
 	printf("    -e|--drop-same-frames <N>  ── Don't send same frames to clients, but no more than specified number.\n");
 	printf("                                  It can significantly reduce the outgoing traffic, but will increase\n");
 	printf("                                  the CPU loading. Don't use this option with analog signal sources\n");
 	printf("                                  or webcams, it's useless. Default: disabled.\n\n");
 	printf("    -l|--slowdown  ────────────── Slowdown capturing to 1 FPS or less when no stream clients connected.\n");
 	printf("                                  Useful to reduce CPU cosumption. Default: disabled.\n\n");
-	printf("    --fake-width <N>  ─────────── Override image width for /state. Default: disabled\n\n");
+	printf("    --fake-width <N>  ─────────── Override image width for /state. Default: disabled.\n\n");
 	printf("    --fake-height <N>  ────────── Override image height for /state. Default: disabled.\n\n");
-	printf("    --server-timeout <seconds>  ─ Timeout for client connections. Default: %u\n\n", server->timeout);
+	printf("    --server-timeout <seconds>  ─ Timeout for client connections. Default: %u.\n\n", server->timeout);
 	printf("Misc options:\n");
 	printf("═════════════\n");
 	printf("    --log-level <N>  ─ Verbosity level of messages from 0 (info) to 3 (debug).\n");
@@ -274,11 +281,14 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 			case 'u':	OPT_SET(server->unix_path, optarg);
 			case 'r':	OPT_SET(server->unix_rm, true);
 			case 'o':	OPT_CHMOD(server->unix_mode, "--unix-mode");
+			case 3000:	OPT_SET(server->user, optarg);
+			case 3001:	OPT_SET(server->passwd, optarg);
+			case 3002:	OPT_SET(server->static_path, optarg);
 			case 'e':	OPT_UNSIGNED(server->drop_same_frames, "--drop-same-frames", 0, 30);
-			case 3000:	OPT_SET(server->slowdown, true);
-			case 3001:	OPT_UNSIGNED(server->fake_width, "--fake-width", 0, 1920);
-			case 3002:	OPT_UNSIGNED(server->fake_height, "--fake-height", 0, 1200);
-			case 3003:	OPT_UNSIGNED(server->timeout, "--server-timeout", 1, 60);
+			case 'l':	OPT_SET(server->slowdown, true);
+			case 3003:	OPT_UNSIGNED(server->fake_width, "--fake-width", 0, 1920);
+			case 3004:	OPT_UNSIGNED(server->fake_height, "--fake-height", 0, 1200);
+			case 3005:	OPT_UNSIGNED(server->timeout, "--server-timeout", 1, 60);
 
 			case 5000:	OPT_SET(log_level, LOG_LEVEL_PERF);
 			case 5001:	OPT_SET(log_level, LOG_LEVEL_VERBOSE);

src/stream.c

@@ -93,7 +93,7 @@ void stream_loop(struct stream_t *stream) {
 		bool persistent_timeout_reported = false;
 
 		LOG_DEBUG("Allocation memory for stream picture ...");
-		A_CALLOC(stream->picture.data, stream->dev->run->max_picture_size);
+		A_CALLOC(stream->picture.data, stream->dev->run->max_raw_image_size);
 
 		LOG_INFO("Capturing ...");
 

src/tools.h

@@ -25,12 +25,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <unistd.h>
 #include <errno.h>
 #include <math.h>
 #include <pthread.h>
 #include <time.h>
 #include <assert.h>
 
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/syscall.h>
 
@@ -102,3 +104,7 @@ INLINE long double get_now_real(void) {
 	get_now(CLOCK_REALTIME, &sec, &msec);
 	return (long double)sec + ((long double)msec) / 1000;
 }
+
+INLINE pid_t get_thread_id(void) {
+	return syscall(SYS_gettid);
+}

tools/make-html-h.py

@@ -22,56 +22,36 @@
 
 
 import sys
+import os
 import textwrap
 
 
 # =====
 def main():
-    assert len(sys.argv) == 4, "%s <src> <dest> <name>" % (sys.argv[0])
-
-    src = sys.argv[1]
-    dest = sys.argv[2]
+    assert len(sys.argv) == 4, "%s <file.html> <file.h> <name>" % (sys.argv[0])
+    html_path = sys.argv[1]
+    header_path = sys.argv[2]
     name = sys.argv[3]
 
-    with open(src, "r") as html_file:
+    with open(html_path, "r") as html_file:
         text = html_file.read()
 
+    with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), "prepend.h")) as prepend_file:
+        prepend = prepend_file.read()
+
     text = text.strip()
     text = text.replace("\"", "\\\"")
     text = text.replace("%VERSION%", "\" VERSION \"")
     text = textwrap.indent(text, "\t", (lambda line: True))
-    text = "\n".join(("%s \\" if line.strip() else "%s\\") % (line) for line in text.split("\n"))
-    text = "const char %s[] = \" \\\n%s\n\";\n" % (name, text)
-    text = textwrap.dedent("""
-        /*****************************************************************************
-        #                                                                            #
-        #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-        #                                                                            #
-        #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
-        #                                                                            #
-        #    This program is free software: you can redistribute it and/or modify    #
-        #    it under the terms of the GNU General Public License as published by    #
-        #    the Free Software Foundation, either version 3 of the License, or       #
-        #    (at your option) any later version.                                     #
-        #                                                                            #
-        #    This program is distributed in the hope that it will be useful,         #
-        #    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
-        #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
-        #    GNU General Public License for more details.                            #
-        #                                                                            #
-        #    You should have received a copy of the GNU General Public License       #
-        #    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
-        #                                                                            #
-        *****************************************************************************/
+    text = "\n".join(
+        ("%s \\" if line.strip() else "%s\\") % (line)
+        for line in text.split("\n")
+    )
+    text = "const char HTML_%s_PAGE[] = \" \\\n%s\n\";\n" % (name, text)
+    text = prepend + "\n#include \"../../config.h\"\n\n\n" + text
 
-
-        #pragma once
-
-        #include "../config.h"
-    """).strip() + "\n\n\n" + text
-
-    with open(dest, "w") as h_file:
-        h_file.write(text)
+    with open(header_path, "w") as header_file:
+        header_file.write(text)
 
 
 # =====

tools/make-jpeg-h.py

@@ -22,22 +22,53 @@
 
 
 import sys
-import textwrap
+import os
+import io
+import struct
+
+
+# =====
+def _get_jpeg_size(data):
+    # https://sheep.horse/2013/9/finding_the_dimensions_of_a_jpeg_file_in_python.html
+
+    stream = io.BytesIO(data)
+    while True:
+        marker = struct.unpack(">H", stream.read(2))[0]
+        if (
+            marker == 0xFFD8  # Start of image
+            or marker == 0xFF01  # Private marker
+            or (marker >= 0xFFD0 and marker <= 0xFFD7)  # Restart markers
+        ):
+            continue
+        elif marker == 0xFFD9:
+            raise RuntimeError("Can't find jpeg size")
+
+        # All other markers specify chunks with lengths
+        length = struct.unpack(">H", stream.read(2))[0]
+
+        if marker == 0xFFC0:  # Baseline DCT chunk, has the info we want
+            (_, height, width) = struct.unpack(">BHH", stream.read(5))
+            return (width, height)
+
+        # Not the chunk we want, skip it
+        stream.seek(length - 2, 1)
 
 
 # =====
 def main():
-    assert len(sys.argv) == 6, "%s <src> <dest> <prefix> <width> <height>" % (sys.argv[0])
+    assert len(sys.argv) == 4, "%s <file.jpeg> <file.h> <name>" % (sys.argv[0])
+    jpeg_path = sys.argv[1]
+    header_path = sys.argv[2]
+    name = sys.argv[3]
 
-    src = sys.argv[1]
-    dest = sys.argv[2]
-    prefix = sys.argv[3]
-    width = int(sys.argv[4])
-    height = int(sys.argv[5])
-
-    with open(src, "rb") as jpeg_file:
+    with open(jpeg_path, "rb") as jpeg_file:
         jpeg_data = jpeg_file.read()
 
+    (width, height) = _get_jpeg_size(jpeg_data)
+
+    with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), "prepend.h")) as prepend_file:
+        prepend = prepend_file.read()
+
     rows = [[]]
     for ch in jpeg_data:
         if len(rows[-1]) > 20:
@@ -45,34 +76,13 @@ def main():
         rows[-1].append("0x%.2X" % (ch))
 
     text = ",\n\t".join(", ".join(row) for row in rows)
-    text = "const unsigned char %s_JPEG_DATA[] = {\n\t%s\n};\n" % (prefix, text)
-    text = "const unsigned %s_JPEG_HEIGHT = %d;\n\n" % (prefix, height) + text
-    text = "const unsigned %s_JPEG_WIDTH = %d;\n" % (prefix, width) + text
-    text = textwrap.dedent("""
-        /*****************************************************************************
-        #                                                                            #
-        #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-        #                                                                            #
-        #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
-        #                                                                            #
-        #    This program is free software: you can redistribute it and/or modify    #
-        #    it under the terms of the GNU General Public License as published by    #
-        #    the Free Software Foundation, either version 3 of the License, or       #
-        #    (at your option) any later version.                                     #
-        #                                                                            #
-        #    This program is distributed in the hope that it will be useful,         #
-        #    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
-        #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
-        #    GNU General Public License for more details.                            #
-        #                                                                            #
-        #    You should have received a copy of the GNU General Public License       #
-        #    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
-        #                                                                            #
-        *****************************************************************************/
-    """).strip() + "\n\n\n" + text
+    text = "const unsigned char %s_JPEG_DATA[] = {\n\t%s\n};\n" % (name, text)
+    text = "const unsigned %s_JPEG_HEIGHT = %d;\n\n" % (name, height) + text
+    text = "const unsigned %s_JPEG_WIDTH = %d;\n" % (name, width) + text
+    text = prepend + "\n\n" + text
 
-    with open(dest, "w") as h_file:
-        h_file.write(text)
+    with open(header_path, "w") as header_file:
+        header_file.write(text)
 
 
 # =====

tools/prepend.h

@@ -0,0 +1,23 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#                                                                            #
+#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#                                                                            #
+#    This program is free software: you can redistribute it and/or modify    #
+#    it under the terms of the GNU General Public License as published by    #
+#    the Free Software Foundation, either version 3 of the License, or       #
+#    (at your option) any later version.                                     #
+#                                                                            #
+#    This program is distributed in the hope that it will be useful,         #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of          #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           #
+#    GNU General Public License for more details.                            #
+#                                                                            #
+#    You should have received a copy of the GNU General Public License       #
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once