#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
This PR allow usage of the new presence_dfks module with pua_json You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4195
-- Commit Summary --
* pua_json: add support for as-feature-event
-- File Changes --
M src/modules/pua_json/defs.h (16) M src/modules/pua_json/pua_json_publish.c (55)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4195.patch https://github.com/kamailio/kamailio/pull/4195.diff
@ThomasSevestre pushed 1 commit.
722c1ffb280cbe24e5d2afa1461e72c19a252545 pua_json: add support for as-feature-event
@ThomasSevestre pushed 1 commit.
b58e0c384febec5287a9ce56610a612cc21167aa pua_json: add support for as-feature-event
@henningw commented on this pull request.
Thanks for the PR. I have added a few remarks to the changes, please have a look.
@@ -139,4 +147,12 @@
</dialog>\ </dialog-info>"
+#define AS_FEATURE_BODY \ + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\ +<DoNotDisturbEvent xmlns="http://www.ecma-international.org/standards/ecma-323/csta/ed3%5C%22%3E%5C
This URL returns a 404, seems that they changed their page structure
+ json_api.extract_field(json_obj, AS_FEATURE_JSON_CALLID, &callid); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM, &from); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_USER, &from_user); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_REALM, &from_realm); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_DND_STATUS, &dnd_status); + + struct json_object *ExpiresObj = + json_api.get_object(json_obj, AS_FEATURE_JSON_EXPIRES); + if(ExpiresObj != NULL) { + expires = json_object_get_int(ExpiresObj); + } + + len = snprintf(body, AS_FEATURE_BODY_BUFFER_SIZE, AS_FEATURE_BODY,
We probably want to check if you've got a from and dnd value from the json before doing the snprintf. Compare to line 294 in this file, for example. If there are other mandatory fields we need to get from the json, we should also check for them. If they are not present, just go to the error case.
@ThomasSevestre commented on this pull request.
@@ -139,4 +147,12 @@
</dialog>\ </dialog-info>"
+#define AS_FEATURE_BODY \ + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\ +<DoNotDisturbEvent xmlns="http://www.ecma-international.org/standards/ecma-323/csta/ed3%5C%22%3E%5C
I've used the same link as in presence_dfks module. I'm not sure what link should be used
@ThomasSevestre pushed 1 commit.
6087e8b879a60f6456142da87f548ea92e519807 pua_json: add support for as-feature-event
@ThomasSevestre commented on this pull request.
+ json_api.extract_field(json_obj, AS_FEATURE_JSON_CALLID, &callid); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM, &from); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_USER, &from_user); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_REALM, &from_realm); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_DND_STATUS, &dnd_status); + + struct json_object *ExpiresObj = + json_api.get_object(json_obj, AS_FEATURE_JSON_EXPIRES); + if(ExpiresObj != NULL) { + expires = json_object_get_int(ExpiresObj); + } + + len = snprintf(body, AS_FEATURE_BODY_BUFFER_SIZE, AS_FEATURE_BODY,
I've added check on `from_user` and `dnd_status`
@henningw commented on this pull request.
@@ -139,4 +147,12 @@
</dialog>\ </dialog-info>"
+#define AS_FEATURE_BODY \ + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\ +<DoNotDisturbEvent xmlns="http://www.ecma-international.org/standards/ecma-323/csta/ed3%5C%22%3E%5C
Ok, if its the same link - then lets keep it in sync.
henningw left a comment (kamailio/kamailio#4195)
Thanks for the additions. Lets wait a bit for more feedback, otherwise it will be merged in a few days.
-
Henning Westerholt -
ThomasSevestre