Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
d8454a48
Commit
d8454a48
authored
1 year ago
by
Rob Swindell
Browse files
Options
Downloads
Patches
Plain Diff
Add subscibe_qos property (exposes/overrides default subscribe QoS)
parent
c85e7359
No related branches found
No related tags found
1 merge request
!463
MRC mods by Codefenix (2024-10-20)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sbbs3/js_mqtt.c
+13
-1
13 additions, 1 deletion
src/sbbs3/js_mqtt.c
with
13 additions
and
1 deletion
src/sbbs3/js_mqtt.c
+
13
−
1
View file @
d8454a48
...
@@ -333,6 +333,7 @@ enum {
...
@@ -333,6 +333,7 @@ enum {
,
MQTT_PROP_KEEPALIVE
,
MQTT_PROP_KEEPALIVE
,
MQTT_PROP_PROT_VER
,
MQTT_PROP_PROT_VER
,
MQTT_PROP_PUB_QOS
,
MQTT_PROP_PUB_QOS
,
MQTT_PROP_SUB_QOS
,
MQTT_PROP_TLS_MODE
,
MQTT_PROP_TLS_MODE
,
MQTT_PROP_TLS_CAFILE
,
MQTT_PROP_TLS_CAFILE
,
MQTT_PROP_TLS_CERTFILE
,
MQTT_PROP_TLS_CERTFILE
...
@@ -356,6 +357,7 @@ static char* com_prop_desc[] = {
...
@@ -356,6 +357,7 @@ static char* com_prop_desc[] = {
,
"Seconds of time to keep inactive connection alive"
,
"Seconds of time to keep inactive connection alive"
,
"Protocol version number (3 = 3.1.0, 4 = 3.1.1, 5 = 5.0)"
,
"Protocol version number (3 = 3.1.0, 4 = 3.1.1, 5 = 5.0)"
,
"Quality Of Service (QOS) value to use when publishing, by default"
,
"Quality Of Service (QOS) value to use when publishing, by default"
,
"Quality Of Service (QOS) value to use when subscribing, by default"
,
"TLS (encryption) mode"
,
"TLS (encryption) mode"
,
"TLS Certificate Authority (CA) certificate (file path)"
,
"TLS Certificate Authority (CA) certificate (file path)"
,
"TLS Client certificate (file path)"
,
"TLS Client certificate (file path)"
...
@@ -414,6 +416,11 @@ static JSBool js_mqtt_set(JSContext* cx, JSObject* obj, jsid id, JSBool strict,
...
@@ -414,6 +416,11 @@ static JSBool js_mqtt_set(JSContext* cx, JSObject* obj, jsid id, JSBool strict,
return
JS_FALSE
;
return
JS_FALSE
;
p
->
cfg
.
publish_qos
=
i
;
p
->
cfg
.
publish_qos
=
i
;
break
;
break
;
case
MQTT_PROP_SUB_QOS
:
if
(
!
JS_ValueToInt32
(
cx
,
*
vp
,
&
i
))
return
JS_FALSE
;
p
->
cfg
.
subscribe_qos
=
i
;
break
;
case
MQTT_PROP_TLS_MODE
:
case
MQTT_PROP_TLS_MODE
:
if
(
!
JS_ValueToInt32
(
cx
,
*
vp
,
&
i
))
if
(
!
JS_ValueToInt32
(
cx
,
*
vp
,
&
i
))
return
JS_FALSE
;
return
JS_FALSE
;
...
@@ -513,6 +520,9 @@ static JSBool js_mqtt_get(JSContext* cx, JSObject* obj, jsid id, jsval *vp)
...
@@ -513,6 +520,9 @@ static JSBool js_mqtt_get(JSContext* cx, JSObject* obj, jsid id, jsval *vp)
case
MQTT_PROP_PUB_QOS
:
case
MQTT_PROP_PUB_QOS
:
*
vp
=
INT_TO_JSVAL
(
p
->
cfg
.
publish_qos
);
*
vp
=
INT_TO_JSVAL
(
p
->
cfg
.
publish_qos
);
break
;
break
;
case
MQTT_PROP_SUB_QOS
:
*
vp
=
INT_TO_JSVAL
(
p
->
cfg
.
subscribe_qos
);
break
;
case
MQTT_PROP_TLS_MODE
:
case
MQTT_PROP_TLS_MODE
:
*
vp
=
INT_TO_JSVAL
(
p
->
cfg
.
tls
.
mode
);
*
vp
=
INT_TO_JSVAL
(
p
->
cfg
.
tls
.
mode
);
break
;
break
;
...
@@ -585,6 +595,7 @@ static jsSyncPropertySpec js_mqtt_properties[] = {
...
@@ -585,6 +595,7 @@ static jsSyncPropertySpec js_mqtt_properties[] = {
{
"keepalive"
,
MQTT_PROP_KEEPALIVE
,
MQTT_PROP_FLAGS
,
320
},
{
"keepalive"
,
MQTT_PROP_KEEPALIVE
,
MQTT_PROP_FLAGS
,
320
},
{
"protocol_version"
,
MQTT_PROP_PROT_VER
,
MQTT_PROP_FLAGS
,
320
},
{
"protocol_version"
,
MQTT_PROP_PROT_VER
,
MQTT_PROP_FLAGS
,
320
},
{
"publish_qos"
,
MQTT_PROP_PUB_QOS
,
MQTT_PROP_FLAGS
,
320
},
{
"publish_qos"
,
MQTT_PROP_PUB_QOS
,
MQTT_PROP_FLAGS
,
320
},
{
"subscribe_qos"
,
MQTT_PROP_SUB_QOS
,
MQTT_PROP_FLAGS
,
320
},
{
"tls_mode"
,
MQTT_PROP_TLS_MODE
,
MQTT_PROP_FLAGS
,
320
},
{
"tls_mode"
,
MQTT_PROP_TLS_MODE
,
MQTT_PROP_FLAGS
,
320
},
{
"tls_ca_cert"
,
MQTT_PROP_TLS_CAFILE
,
MQTT_PROP_FLAGS
,
320
},
{
"tls_ca_cert"
,
MQTT_PROP_TLS_CAFILE
,
MQTT_PROP_FLAGS
,
320
},
{
"tls_client_cert"
,
MQTT_PROP_TLS_CERTFILE
,
MQTT_PROP_FLAGS
,
320
},
{
"tls_client_cert"
,
MQTT_PROP_TLS_CERTFILE
,
MQTT_PROP_FLAGS
,
320
},
...
@@ -621,7 +632,8 @@ static jsSyncMethodSpec js_mqtt_functions[] = {
...
@@ -621,7 +632,8 @@ static jsSyncMethodSpec js_mqtt_functions[] = {
{
"read"
,
js_read
,
0
,
JSTYPE_STRING
{
"read"
,
js_read
,
0
,
JSTYPE_STRING
,
JSDOCSTR
(
"[timeout=0] [,bool verbpose=false]"
)
,
JSDOCSTR
(
"[timeout=0] [,bool verbpose=false]"
)
,
JSDOCSTR
(
"Read next message, optionally waiting for <i>timeout</i> milliseconds, "
,
JSDOCSTR
(
"Read next message, optionally waiting for <i>timeout</i> milliseconds, "
"returns an object when <i>verbose</i> is <tt>true</tt>"
)
"returns an object instead of a string when <i>verbose</i> is <tt>true</tt>. "
"Returns <i>false</i> when no message is available."
)
,
320
,
320
},
},
{
0
}
{
0
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment