X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=cdc9f239f6e4fedc0c83ef8aebe113e9a2ac36cb;hb=04241c8168fe8826b4fc7a80500577b50936b57a;hp=389a67e2ebd48d94c8d1caf2f2f397fe4463b1dc;hpb=157c652b4bb8eba5692bed2a4bc75650f7ae7622;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 389a67e2..cdc9f239 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -33,11 +33,9 @@
 #endif
 
 #include "afb-method.h"
-#include <afb/afb-req-itf.h>
 #include "afb-msg-json.h"
 #include "afb-context.h"
 #include "afb-hreq.h"
-#include "afb-subcall.h"
 #include "afb-session.h"
 #include "afb-cred.h"
 #include "verbose.h"
@@ -318,20 +316,22 @@ static void req_destroy(struct afb_xreq *xreq)
 	}
 	afb_context_disconnect(&hreq->xreq.context);
 	json_object_put(hreq->json);
-	free((char*)hreq->xreq.api);
-	free((char*)hreq->xreq.verb);
+	free((char*)hreq->xreq.request.api);
+	free((char*)hreq->xreq.request.verb);
 	afb_cred_unref(hreq->xreq.cred);
 	free(hreq);
 }
 
 void afb_hreq_addref(struct afb_hreq *hreq)
 {
-	afb_xreq_addref(&hreq->xreq);
+	afb_xreq_unhooked_addref(&hreq->xreq);
 }
 
 void afb_hreq_unref(struct afb_hreq *hreq)
 {
-	afb_xreq_unref(&hreq->xreq);
+	if (hreq->replied)
+		hreq->xreq.replied = 1;
+	afb_xreq_unhooked_unref(&hreq->xreq);
 }
 
 /*
@@ -914,15 +914,15 @@ static void req_success(struct afb_xreq *xreq, json_object *obj, const char *inf
 
 void afb_hreq_call(struct afb_hreq *hreq, struct afb_apiset *apiset, const char *api, size_t lenapi, const char *verb, size_t lenverb)
 {
-	hreq->xreq.api = strndup(api, lenapi);
-	hreq->xreq.verb = strndup(verb, lenverb);
-	if (hreq->xreq.api == NULL || hreq->xreq.verb == NULL) {
+	hreq->xreq.request.api = strndup(api, lenapi);
+	hreq->xreq.request.verb = strndup(verb, lenverb);
+	if (hreq->xreq.request.api == NULL || hreq->xreq.request.verb == NULL) {
 		ERROR("Out of memory");
 		afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
 	} else if (afb_hreq_init_context(hreq) < 0) {
 		afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
 	} else {
-		afb_xreq_addref(&hreq->xreq); /* TODO check if needed */
+		afb_xreq_unhooked_addref(&hreq->xreq);
 		afb_xreq_process(&hreq->xreq, apiset);
 	}
 }
@@ -983,7 +983,6 @@ struct afb_hreq *afb_hreq_create()
 	if (hreq) {
 		/* init the request */
 		afb_xreq_init(&hreq->xreq, &afb_hreq_xreq_query_itf);
-		hreq->xreq.cred = afb_cred_current();
 		hreq->reqid = ++global_reqids;
 	}
 	return hreq;