fastly · jkarneges · Nov 6, 2023 · Nov 4, 2023
diff --git a/.gitignore b/.gitignore
@@ -31,12 +31,6 @@ vendor
 /src/m2adapter/Makefile
 /src/proxy/Makefile
 /src/handler/Makefile
-/src/handler/libpushpin-handler/Makefile
-/src/handler/pushpin-handler/Makefile
-/src/handler/libpushpin-handler.a
-/src/handler/tests/Makefile
-/src/handler/tests/*test/Makefile
-/src/handler/tests/*test/*test
 /src/rust/Makefile
 /src/runner/Makefile
 /src/runner/librunner/Makefile

diff --git a/src/cpp/cpp/cpp.pri b/src/cpp/cpp/cpp.pri
@@ -143,3 +143,64 @@ SOURCES += \
 	$$PSRC_DIR/engine.cpp \
 	$$PSRC_DIR/app.cpp \
 	$$PSRC_DIR/main.cpp
+
+HSRC_DIR = $$SRC_DIR/handler
+
+HEADERS += \
+	$$HSRC_DIR/deferred.h \
+	$$HSRC_DIR/variantutil.h \
+	$$HSRC_DIR/jsonpointer.h \
+	$$HSRC_DIR/jsonpatch.h \
+	$$HSRC_DIR/detectrule.h \
+	$$HSRC_DIR/lastids.h \
+	$$HSRC_DIR/cidset.h \
+	$$HSRC_DIR/sessionrequest.h \
+	$$HSRC_DIR/requeststate.h \
+	$$HSRC_DIR/wscontrolmessage.h \
+	$$HSRC_DIR/publishformat.h \
+	$$HSRC_DIR/publishitem.h \
+	$$HSRC_DIR/instruct.h \
+	$$HSRC_DIR/format.h \
+	$$HSRC_DIR/idformat.h \
+	$$HSRC_DIR/httpsession.h \
+	$$HSRC_DIR/httpsessionupdatemanager.h \
+	$$HSRC_DIR/wssession.h \
+	$$HSRC_DIR/publishlastids.h \
+	$$HSRC_DIR/controlrequest.h \
+	$$HSRC_DIR/conncheckworker.h \
+	$$HSRC_DIR/refreshworker.h \
+	$$HSRC_DIR/ratelimiter.h \
+	$$HSRC_DIR/sequencer.h \
+	$$HSRC_DIR/filter.h \
+	$$HSRC_DIR/filterstack.h \
+	$$HSRC_DIR/handlerengine.h \
+	$$HSRC_DIR/handlerapp.h \
+	$$HSRC_DIR/main.h
+
+SOURCES += \
+	$$HSRC_DIR/deferred.cpp \
+	$$HSRC_DIR/variantutil.cpp \
+	$$HSRC_DIR/jsonpointer.cpp \
+	$$HSRC_DIR/jsonpatch.cpp \
+	$$HSRC_DIR/sessionrequest.cpp \
+	$$HSRC_DIR/requeststate.cpp \
+	$$HSRC_DIR/wscontrolmessage.cpp \
+	$$HSRC_DIR/publishformat.cpp \
+	$$HSRC_DIR/publishitem.cpp \
+	$$HSRC_DIR/instruct.cpp \
+	$$HSRC_DIR/format.cpp \
+	$$HSRC_DIR/idformat.cpp \
+	$$HSRC_DIR/httpsession.cpp \
+	$$HSRC_DIR/httpsessionupdatemanager.cpp \
+	$$HSRC_DIR/wssession.cpp \
+	$$HSRC_DIR/publishlastids.cpp \
+	$$HSRC_DIR/controlrequest.cpp \
+	$$HSRC_DIR/conncheckworker.cpp \
+	$$HSRC_DIR/refreshworker.cpp \
+	$$HSRC_DIR/ratelimiter.cpp \
+	$$HSRC_DIR/sequencer.cpp \
+	$$HSRC_DIR/filter.cpp \
+	$$HSRC_DIR/filterstack.cpp \
+	$$HSRC_DIR/handlerengine.cpp \
+	$$HSRC_DIR/handlerapp.cpp \
+	$$HSRC_DIR/handlermain.cpp
diff --git a/src/handler/cidset.h → src/cpp/handler/cidset.h b/src/handler/cidset.h → src/cpp/handler/cidset.h
diff --git a/src/handler/conncheckworker.cpp → src/cpp/handler/conncheckworker.cpp b/src/handler/conncheckworker.cpp → src/cpp/handler/conncheckworker.cpp
diff --git a/src/handler/conncheckworker.h → src/cpp/handler/conncheckworker.h b/src/handler/conncheckworker.h → src/cpp/handler/conncheckworker.h
diff --git a/src/handler/controlrequest.cpp → src/cpp/handler/controlrequest.cpp b/src/handler/controlrequest.cpp → src/cpp/handler/controlrequest.cpp
diff --git a/src/handler/controlrequest.h → src/cpp/handler/controlrequest.h b/src/handler/controlrequest.h → src/cpp/handler/controlrequest.h
diff --git a/src/handler/deferred.cpp → src/cpp/handler/deferred.cpp b/src/handler/deferred.cpp → src/cpp/handler/deferred.cpp
diff --git a/src/handler/deferred.h → src/cpp/handler/deferred.h b/src/handler/deferred.h → src/cpp/handler/deferred.h
diff --git a/src/handler/detectrule.h → src/cpp/handler/detectrule.h b/src/handler/detectrule.h → src/cpp/handler/detectrule.h
diff --git a/src/handler/filter.cpp → src/cpp/handler/filter.cpp b/src/handler/filter.cpp → src/cpp/handler/filter.cpp
diff --git a/src/handler/filter.h → src/cpp/handler/filter.h b/src/handler/filter.h → src/cpp/handler/filter.h
diff --git a/src/handler/filterstack.cpp → src/cpp/handler/filterstack.cpp b/src/handler/filterstack.cpp → src/cpp/handler/filterstack.cpp
diff --git a/src/handler/filterstack.h → src/cpp/handler/filterstack.h b/src/handler/filterstack.h → src/cpp/handler/filterstack.h
diff --git a/src/handler/format.cpp → src/cpp/handler/format.cpp b/src/handler/format.cpp → src/cpp/handler/format.cpp
diff --git a/src/handler/format.h → src/cpp/handler/format.h b/src/handler/format.h → src/cpp/handler/format.h
diff --git a/src/handler/app.cpp → src/cpp/handler/handlerapp.cpp b/src/handler/app.cpp → src/cpp/handler/handlerapp.cpp
@@ -20,7 +20,7 @@
  * $FANOUT_END_LICENSE$
  */
 
-#include "app.h"
+#include "handlerapp.h"
 
 #include <assert.h>
 #include <QCoreApplication>
@@ -31,7 +31,7 @@
 #include "processquit.h"
 #include "log.h"
 #include "settings.h"
-#include "engine.h"
+#include "handlerengine.h"
 #include "config.h"
 
 #define DEFAULT_HTTP_MAX_HEADERS_SIZE 10000
@@ -144,16 +144,16 @@ static CommandLineParseResult parseCommandLine(QCommandLineParser *parser, ArgsD
 	return CommandLineOk;
 }
 
-class App::Private : public QObject
+class HandlerApp::Private : public QObject
 {
 	Q_OBJECT
 
 public:
-	App *q;
+	HandlerApp *q;
 	ArgsData args;
-	Engine *engine;
+	HandlerEngine *engine;
 
-	Private(App *_q) :
+	Private(HandlerApp *_q) :
 		QObject(_q),
 		q(_q),
 		engine(0)
@@ -299,7 +299,7 @@ class App::Private : public QObject
 			return;
 		}
 
-		Engine::Configuration config;
+		HandlerEngine::Configuration config;
 		config.appVersion = VERSION;
 		config.instanceId = "pushpin-handler_" + QByteArray::number(QCoreApplication::applicationPid());
 		if(!services.contains("mongrel2") && (!condure_in_stream_specs.isEmpty() || !condure_out_specs.isEmpty()))
@@ -350,7 +350,7 @@ class App::Private : public QObject
 		config.prometheusPort = prometheusPort;
 		config.prometheusPrefix = prometheusPrefix;
 
-		engine = new Engine(this);
+		engine = new HandlerEngine(this);
 		if(!engine->start(config))
 		{
 			emit q->quit();
@@ -383,20 +383,20 @@ private slots:
 	}
 };
 
-App::App(QObject *parent) :
+HandlerApp::HandlerApp(QObject *parent) :
 	QObject(parent)
 {
 	d = new Private(this);
 }
 
-App::~App()
+HandlerApp::~HandlerApp()
 {
 	delete d;
 }
 
-void App::start()
+void HandlerApp::start()
 {
 	d->start();
 }
 
-#include "app.moc"
+#include "handlerapp.moc"
diff --git a/src/handler/app.h → src/cpp/handler/handlerapp.h b/src/handler/app.h → src/cpp/handler/handlerapp.h
@@ -20,18 +20,18 @@
  * $FANOUT_END_LICENSE$
  */
 
-#ifndef APP_H
-#define APP_H
+#ifndef HANDLERAPP_H
+#define HANDLERAPP_H
 
 #include <QObject>
 
-class App : public QObject
+class HandlerApp : public QObject
 {
 	Q_OBJECT
 
 public:
-	App(QObject *parent = 0);
-	~App();
+	HandlerApp(QObject *parent = 0);
+	~HandlerApp();
 
 	void start();
 

diff --git a/src/handler/engine.cpp → src/cpp/handler/handlerengine.cpp b/src/handler/engine.cpp → src/cpp/handler/handlerengine.cpp
@@ -21,7 +21,7 @@
  * $FANOUT_END_LICENSE$
  */
 
-#include "engine.h"
+#include "handlerengine.h"
 
 #include <assert.h>
 #include <algorithm>
@@ -1181,20 +1181,20 @@ private slots:
 	}
 };
 
-class Engine::Private : public QObject
+class HandlerEngine::Private : public QObject
 {
 	Q_OBJECT
 
 public:
 	class PublishAction : public RateLimiter::Action
 	{
 	public:
-		Engine::Private *ep;
+		HandlerEngine::Private *ep;
 		QPointer<QObject> target;
 		PublishItem item;
 		QList<QByteArray> exposeHeaders;
 
-		PublishAction(Engine::Private *_ep, QObject *_target, const PublishItem &_item, const QList<QByteArray> &_exposeHeaders = QList<QByteArray>()) :
+		PublishAction(HandlerEngine::Private *_ep, QObject *_target, const PublishItem &_item, const QList<QByteArray> &_exposeHeaders = QList<QByteArray>()) :
 			ep(_ep),
 			target(_target),
 			item(_item),
@@ -1212,7 +1212,7 @@ class Engine::Private : public QObject
 		}
 	};
 
-	Engine *q;
+	HandlerEngine *q;
 	Configuration config;
 	ZhttpManager *zhttpIn;
 	ZhttpManager *zhttpOut;
@@ -1244,7 +1244,7 @@ class Engine::Private : public QObject
 	QSet<Deferred*> deferreds;
 	Deferred *report;
 
-	Private(Engine *_q) :
+	Private(HandlerEngine *_q) :
 		QObject(_q),
 		q(_q),
 		zhttpIn(0),
@@ -3143,25 +3143,25 @@ private slots:
 	}
 };
 
-Engine::Engine(QObject *parent) :
+HandlerEngine::HandlerEngine(QObject *parent) :
 	QObject(parent)
 {
 	d = new Private(this);
 }
 
-Engine::~Engine()
+HandlerEngine::~HandlerEngine()
 {
 	delete d;
 }
 
-bool Engine::start(const Configuration &config)
+bool HandlerEngine::start(const Configuration &config)
 {
 	return d->start(config);
 }
 
-void Engine::reload()
+void HandlerEngine::reload()
 {
 	d->reload();
 }
 
-#include "engine.moc"
+#include "handlerengine.moc"
diff --git a/src/handler/engine.h → src/cpp/handler/handlerengine.h b/src/handler/engine.h → src/cpp/handler/handlerengine.h
@@ -20,14 +20,14 @@
  * $FANOUT_END_LICENSE$
  */
 
-#ifndef ENGINE_H
-#define ENGINE_H
+#ifndef HANDLERENGINE_H
+#define HANDLERENGINE_H
 
 #include <QObject>
 #include <QStringList>
 #include <QHostAddress>
 
-class Engine : public QObject
+class HandlerEngine : public QObject
 {
 	Q_OBJECT
 
@@ -100,8 +100,8 @@ class Engine : public QObject
 		}
 	};
 
-	Engine(QObject *parent = 0);
-	~Engine();
+	HandlerEngine(QObject *parent = 0);
+	~HandlerEngine();
 
 	bool start(const Configuration &config);
 	void reload();

diff --git a/src/handler/main.cpp → src/cpp/handler/handlermain.cpp b/src/handler/main.cpp → src/cpp/handler/handlermain.cpp
@@ -22,20 +22,20 @@
 
 #include <QCoreApplication>
 #include <QTimer>
-#include "app.h"
+#include "handlerapp.h"
 
-class AppMain : public QObject
+class HandlerAppMain : public QObject
 {
 	Q_OBJECT
 
 public:
-	App *app;
+	HandlerApp *app;
 
 public slots:
 	void start()
 	{
-		app = new App(this);
-		connect(app, &App::quit, this, &AppMain::app_quit);
+		app = new HandlerApp(this);
+		connect(app, &HandlerApp::quit, this, &HandlerAppMain::app_quit);
 		app->start();
 	}
 
@@ -46,13 +46,17 @@ public slots:
 	}
 };
 
-int main(int argc, char **argv)
+extern "C" {
+
+int handler_main(int argc, char **argv)
 {
 	QCoreApplication qapp(argc, argv);
 
-	AppMain appMain;
+	HandlerAppMain appMain;
 	QTimer::singleShot(0, &appMain, SLOT(start()));
 	return qapp.exec();
 }
 
-#include "main.moc"
+}
+
+#include "handlermain.moc"
diff --git a/src/handler/httpsession.cpp → src/cpp/handler/httpsession.cpp b/src/handler/httpsession.cpp → src/cpp/handler/httpsession.cpp
diff --git a/src/handler/httpsession.h → src/cpp/handler/httpsession.h b/src/handler/httpsession.h → src/cpp/handler/httpsession.h
diff --git a/src/handler/httpsessionupdatemanager.cpp → src/cpp/handler/httpsessionupdatemanager.cpp b/src/handler/httpsessionupdatemanager.cpp → src/cpp/handler/httpsessionupdatemanager.cpp
diff --git a/src/handler/httpsessionupdatemanager.h → src/cpp/handler/httpsessionupdatemanager.h b/src/handler/httpsessionupdatemanager.h → src/cpp/handler/httpsessionupdatemanager.h
diff --git a/src/handler/idformat.cpp → src/cpp/handler/idformat.cpp b/src/handler/idformat.cpp → src/cpp/handler/idformat.cpp
diff --git a/src/handler/idformat.h → src/cpp/handler/idformat.h b/src/handler/idformat.h → src/cpp/handler/idformat.h
diff --git a/src/handler/instruct.cpp → src/cpp/handler/instruct.cpp b/src/handler/instruct.cpp → src/cpp/handler/instruct.cpp
diff --git a/src/handler/instruct.h → src/cpp/handler/instruct.h b/src/handler/instruct.h → src/cpp/handler/instruct.h
diff --git a/src/handler/jsonpatch.cpp → src/cpp/handler/jsonpatch.cpp b/src/handler/jsonpatch.cpp → src/cpp/handler/jsonpatch.cpp
diff --git a/src/handler/jsonpatch.h → src/cpp/handler/jsonpatch.h b/src/handler/jsonpatch.h → src/cpp/handler/jsonpatch.h
diff --git a/src/handler/jsonpointer.cpp → src/cpp/handler/jsonpointer.cpp b/src/handler/jsonpointer.cpp → src/cpp/handler/jsonpointer.cpp
diff --git a/src/handler/jsonpointer.h → src/cpp/handler/jsonpointer.h b/src/handler/jsonpointer.h → src/cpp/handler/jsonpointer.h
diff --git a/src/handler/lastids.h → src/cpp/handler/lastids.h b/src/handler/lastids.h → src/cpp/handler/lastids.h
diff --git a/src/cpp/handler/main.h b/src/cpp/handler/main.h
@@ -0,0 +1,6 @@
+#ifndef HANDLER_MAIN_H
+#define HANDLER_MAIN_H
+
+int handler_main(int argc, char **argv);
+
+#endif
diff --git a/src/handler/publishformat.cpp → src/cpp/handler/publishformat.cpp b/src/handler/publishformat.cpp → src/cpp/handler/publishformat.cpp
diff --git a/src/handler/publishformat.h → src/cpp/handler/publishformat.h b/src/handler/publishformat.h → src/cpp/handler/publishformat.h
diff --git a/src/handler/publishitem.cpp → src/cpp/handler/publishitem.cpp b/src/handler/publishitem.cpp → src/cpp/handler/publishitem.cpp
diff --git a/src/handler/publishitem.h → src/cpp/handler/publishitem.h b/src/handler/publishitem.h → src/cpp/handler/publishitem.h
diff --git a/src/handler/publishlastids.cpp → src/cpp/handler/publishlastids.cpp b/src/handler/publishlastids.cpp → src/cpp/handler/publishlastids.cpp
diff --git a/src/handler/publishlastids.h → src/cpp/handler/publishlastids.h b/src/handler/publishlastids.h → src/cpp/handler/publishlastids.h
diff --git a/src/handler/ratelimiter.cpp → src/cpp/handler/ratelimiter.cpp b/src/handler/ratelimiter.cpp → src/cpp/handler/ratelimiter.cpp
diff --git a/src/handler/ratelimiter.h → src/cpp/handler/ratelimiter.h b/src/handler/ratelimiter.h → src/cpp/handler/ratelimiter.h
diff --git a/src/handler/refreshworker.cpp → src/cpp/handler/refreshworker.cpp b/src/handler/refreshworker.cpp → src/cpp/handler/refreshworker.cpp
diff --git a/src/handler/refreshworker.h → src/cpp/handler/refreshworker.h b/src/handler/refreshworker.h → src/cpp/handler/refreshworker.h
diff --git a/src/handler/requeststate.cpp → src/cpp/handler/requeststate.cpp b/src/handler/requeststate.cpp → src/cpp/handler/requeststate.cpp
diff --git a/src/handler/requeststate.h → src/cpp/handler/requeststate.h b/src/handler/requeststate.h → src/cpp/handler/requeststate.h
diff --git a/src/handler/sequencer.cpp → src/cpp/handler/sequencer.cpp b/src/handler/sequencer.cpp → src/cpp/handler/sequencer.cpp
diff --git a/src/handler/sequencer.h → src/cpp/handler/sequencer.h b/src/handler/sequencer.h → src/cpp/handler/sequencer.h
diff --git a/src/handler/sessionrequest.cpp → src/cpp/handler/sessionrequest.cpp b/src/handler/sessionrequest.cpp → src/cpp/handler/sessionrequest.cpp
diff --git a/src/handler/sessionrequest.h → src/cpp/handler/sessionrequest.h b/src/handler/sessionrequest.h → src/cpp/handler/sessionrequest.h
diff --git a/src/handler/variantutil.cpp → src/cpp/handler/variantutil.cpp b/src/handler/variantutil.cpp → src/cpp/handler/variantutil.cpp
diff --git a/src/handler/variantutil.h → src/cpp/handler/variantutil.h b/src/handler/variantutil.h → src/cpp/handler/variantutil.h
diff --git a/src/handler/wscontrolmessage.cpp → src/cpp/handler/wscontrolmessage.cpp b/src/handler/wscontrolmessage.cpp → src/cpp/handler/wscontrolmessage.cpp
diff --git a/src/handler/wscontrolmessage.h → src/cpp/handler/wscontrolmessage.h b/src/handler/wscontrolmessage.h → src/cpp/handler/wscontrolmessage.h
diff --git a/src/handler/wssession.cpp → src/cpp/handler/wssession.cpp b/src/handler/wssession.cpp → src/cpp/handler/wssession.cpp
diff --git a/src/handler/wssession.h → src/cpp/handler/wssession.h b/src/handler/wssession.h → src/cpp/handler/wssession.h
diff --git a/src/handler/tests/enginetest/enginetest.cpp → ...pp/tests/handlerenginetest/enginetest.cpp b/src/handler/tests/enginetest/enginetest.cpp → ...pp/tests/handlerenginetest/enginetest.cpp
@@ -29,7 +29,7 @@
 #include "zhttprequestpacket.h"
 #include "zhttpresponsepacket.h"
 #include "packet/httpresponsedata.h"
-#include "engine.h"
+#include "handlerengine.h"
 
 class Wrapper : public QObject
 {
@@ -253,7 +253,7 @@ class EngineTest : public QObject
 	Q_OBJECT
 
 private:
-	Engine *engine;
+	HandlerEngine *engine;
 	Wrapper *wrapper;
 
 private slots:
@@ -266,9 +266,9 @@ private slots:
 		wrapper->startHttp();
 		wrapper->startProxy();
 
-		engine = new Engine(this);
+		engine = new HandlerEngine(this);
 
-		Engine::Configuration config;
+		HandlerEngine::Configuration config;
 		config.instanceId = "handler";
 		config.serverInStreamSpecs = QStringList() << "ipc://client-out-stream";
 		config.serverOutSpecs = QStringList() << "ipc://client-in";

diff --git a/src/handler/tests/enginetest/enginetest.pro → ...s/handlerenginetest/handlerenginetest.pro b/src/handler/tests/enginetest/enginetest.pro → ...s/handlerenginetest/handlerenginetest.pro
diff --git a/...ndler/tests/idformattest/idformattest.cpp → src/cpp/tests/idformattest/idformattest.cpp b/...ndler/tests/idformattest/idformattest.cpp → src/cpp/tests/idformattest/idformattest.cpp
diff --git a/...ndler/tests/idformattest/idformattest.pro → src/cpp/tests/idformattest/idformattest.pro b/...ndler/tests/idformattest/idformattest.pro → src/cpp/tests/idformattest/idformattest.pro
diff --git a/...ndler/tests/instructtest/instructtest.cpp → src/cpp/tests/instructtest/instructtest.cpp b/...ndler/tests/instructtest/instructtest.cpp → src/cpp/tests/instructtest/instructtest.cpp
diff --git a/...ndler/tests/instructtest/instructtest.pro → src/cpp/tests/instructtest/instructtest.pro b/...ndler/tests/instructtest/instructtest.pro → src/cpp/tests/instructtest/instructtest.pro
diff --git a/...ler/tests/jsonpatchtest/jsonpatchtest.cpp → ...cpp/tests/jsonpatchtest/jsonpatchtest.cpp b/...ler/tests/jsonpatchtest/jsonpatchtest.cpp → ...cpp/tests/jsonpatchtest/jsonpatchtest.cpp
diff --git a/...ler/tests/jsonpatchtest/jsonpatchtest.pro → ...cpp/tests/jsonpatchtest/jsonpatchtest.pro b/...ler/tests/jsonpatchtest/jsonpatchtest.pro → ...cpp/tests/jsonpatchtest/jsonpatchtest.pro
diff --git a/...s/publishformattest/publishformattest.cpp → ...s/publishformattest/publishformattest.cpp b/...s/publishformattest/publishformattest.cpp → ...s/publishformattest/publishformattest.cpp
diff --git a/...s/publishformattest/publishformattest.pro → ...s/publishformattest/publishformattest.pro b/...s/publishformattest/publishformattest.pro → ...s/publishformattest/publishformattest.pro
diff --git a/...tests/publishitemtest/publishitemtest.cpp → ...tests/publishitemtest/publishitemtest.cpp b/...tests/publishitemtest/publishitemtest.cpp → ...tests/publishitemtest/publishitemtest.cpp
diff --git a/...tests/publishitemtest/publishitemtest.pro → ...tests/publishitemtest/publishitemtest.pro b/...tests/publishitemtest/publishitemtest.pro → ...tests/publishitemtest/publishitemtest.pro
diff --git a/src/cpp/tests/tests.pri b/src/cpp/tests/tests.pri
@@ -16,6 +16,7 @@ include($$PWD/../../../conf.pri)
 
 INCLUDEPATH += $$SRC_DIR
 INCLUDEPATH += $$SRC_DIR/proxy
+INCLUDEPATH += $$SRC_DIR/handler
 INCLUDEPATH += $$QZMQ_DIR/src
 
 DEFINES += NO_IRISNET

diff --git a/src/cpp/tests/tests.pro b/src/cpp/tests/tests.pro
@@ -4,4 +4,10 @@ SUBDIRS += \
 	httpheaderstest \
 	jwttest \
 	routesfiletest \
-	proxyenginetest
+	proxyenginetest \
+	jsonpatchtest \
+	instructtest \
+	idformattest \
+	publishformattest \
+	publishitemtest \
+	handlerenginetest