summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main.c11
-rwxr-xr-xstress-server.sh4
2 files changed, 4 insertions, 11 deletions
diff --git a/src/main.c b/src/main.c
index 01c06095..0924e04e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,8 @@
#define NO_BINDING_VERBOSE_MACRO
#include <stdlib.h>
-#include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
@@ -29,11 +30,8 @@
#include <json-c/json.h>
-#include <systemd/sd-event.h>
#include <systemd/sd-daemon.h>
-#include <afb/afb-binding.h>
-
#include "afb-config.h"
#include "afb-hswitch.h"
#include "afb-apiset.h"
@@ -41,10 +39,8 @@
#include "afb-api-dbus.h"
#include "afb-api-ws.h"
#include "afb-hsrv.h"
-#include "afb-context.h"
#include "afb-hreq.h"
#include "afb-xreq.h"
-#include "afb-cred.h"
#include "jobs.h"
#include "afb-session.h"
#include "verbose.h"
@@ -471,7 +467,6 @@ static void startup_call_unref(struct afb_xreq *xreq)
free(sreq->api);
free(sreq->verb);
json_object_put(sreq->xreq.json);
- afb_cred_unref(sreq->xreq.cred);
sreq->current = sreq->current->next;
if (sreq->current)
startup_call_current(sreq);
@@ -497,11 +492,9 @@ static void startup_call_current(struct startup_req *sreq)
if (verb) {
json = strchr(verb, ':');
if (json) {
- memset(&sreq->xreq, 0, sizeof sreq->xreq);
afb_xreq_init(&sreq->xreq, &startup_xreq_itf);
afb_context_init(&sreq->xreq.context, sreq->session, NULL);
sreq->xreq.context.validated = 1;
- sreq->xreq.cred = afb_cred_current();
sreq->api = strndup(api, verb - api);
sreq->verb = strndup(verb + 1, json - verb - 1);
sreq->xreq.api = sreq->api;
diff --git a/stress-server.sh b/stress-server.sh
index 35b7ac48..ec57da57 100755
--- a/stress-server.sh
+++ b/stress-server.sh
@@ -18,8 +18,8 @@ rm $OUT*
case "$1" in
--ws)
shift
- ARGS="-q --ldpaths=/tmp --binding=$HELLO --session-max=100 --ws-server=unix:hello --no-httpd --exec $AFB --session-max=100 --port=$PORT --ldpaths=/tmp --roothttp=$TEST --token=$TOKEN --ws-client=unix:hello "
-# ARGS="-vv --tracereq=all --ldpaths=/tmp --binding=$HELLO --session-max=100 --ws-server=unix:hello --no-httpd --exec $AFB --session-max=100 --port=$PORT --ldpaths=/tmp --roothttp=$TEST --token=$TOKEN --ws-client=unix:hello "
+ ARGS="-q --ldpaths=/tmp --binding=$HELLO --session-max=100 --ws-server=unix:@afw:hello --no-httpd --exec $AFB --session-max=100 --port=$PORT --ldpaths=/tmp --roothttp=$TEST --token=$TOKEN --ws-client=unix:@afw:hello "
+# ARGS="$ARGS -vvv --tracereq=all"
;;
*)
ARGS="-q --session-max=100 --port=$PORT --workdir=$ROOT --roothttp=$TEST --token=$TOKEN --ldpaths=/tmp --binding=$HELLO"