Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-context: Early token change
[src/app-framework-binder.git]
/
src
/
afb-stub-ws.c
diff --git
a/src/afb-stub-ws.c
b/src/afb-stub-ws.c
index
ce5b805
..
036b494
100644
(file)
--- a/
src/afb-stub-ws.c
+++ b/
src/afb-stub-ws.c
@@
-474,30
+474,39
@@
static void on_subcall(void *closure, struct afb_proto_ws_subcall *subcall, void
static void record_session(struct afb_stub_ws *stubws, struct afb_session *session)
{
static void record_session(struct afb_stub_ws *stubws, struct afb_session *session)
{
- struct server_session *
iter
;
+ struct server_session *
s, **prv
;
/* search */
/* search */
- for (iter = stubws->sessions ; iter ; iter = iter->next)
- if (iter->session == session)
+ prv = &stubws->sessions;
+ while ((s = *prv)) {
+ if (s->session == session)
return;
return;
+ if (afb_session_is_closed(s->session)) {
+ *prv = s->next;
+ afb_session_unref(s->session);
+ free(s);
+ }
+ else
+ prv = &s->next;
+ }
/* create */
/* create */
-
iter = malloc(sizeof *iter
);
- if (
iter
) {
-
iter
->session = afb_session_addref(session);
-
iter
->next = stubws->sessions;
- stubws->sessions =
iter
;
+
s = malloc(sizeof *s
);
+ if (
s
) {
+
s
->session = afb_session_addref(session);
+
s
->next = stubws->sessions;
+ stubws->sessions =
s
;
}
}
static void release_sessions(struct afb_stub_ws *stubws)
{
}
}
static void release_sessions(struct afb_stub_ws *stubws)
{
- struct server_session *
iter
;
+ struct server_session *
s
;
- while((
iter
= stubws->sessions)) {
- stubws->sessions =
iter
->next;
- afb_session_unref(
iter
->session);
- free(
iter
);
+ while((
s
= stubws->sessions)) {
+ stubws->sessions =
s
->next;
+ afb_session_unref(
s
->session);
+ free(
s
);
}
}
}
}
@@
-524,6
+533,8
@@
static void on_call(void *closure, struct afb_proto_ws_call *call, const char *v
goto unconnected;
wreq->xreq.context.validated = 1;
record_session(stubws, wreq->xreq.context.session);
goto unconnected;
wreq->xreq.context.validated = 1;
record_session(stubws, wreq->xreq.context.session);
+ if (wreq->xreq.context.created)
+ afb_session_set_autoclose(wreq->xreq.context.session, 1);
/* makes the call */
wreq->xreq.cred = afb_cred_addref(stubws->cred);
/* makes the call */
wreq->xreq.cred = afb_cred_addref(stubws->cred);
@@
-640,10
+651,12
@@
static void on_hangup(void *closure)
{
struct afb_stub_ws *stubws = closure;
{
struct afb_stub_ws *stubws = closure;
+ afb_stub_ws_addref(stubws);
if (stubws->on_hangup)
stubws->on_hangup(stubws);
release_sessions(stubws);
if (stubws->on_hangup)
stubws->on_hangup(stubws);
release_sessions(stubws);
+ afb_stub_ws_unref(stubws);
}
/*****************************************************/
}
/*****************************************************/
@@
-696,7
+709,8
@@
void afb_stub_ws_unref(struct afb_stub_ws *stubws)
{
if (!__atomic_sub_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED)) {
drop_all_events(stubws);
{
if (!__atomic_sub_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED)) {
drop_all_events(stubws);
- afb_evt_listener_unref(stubws->listener);
+ if (stubws->listener)
+ afb_evt_listener_unref(stubws->listener);
release_sessions(stubws);
afb_proto_ws_unref(stubws->proto);
afb_cred_unref(stubws->cred);
release_sessions(stubws);
afb_proto_ws_unref(stubws->proto);
afb_cred_unref(stubws->cred);