<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [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: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> Expands the rpc 'add' command allowing to specify the "attrs" body. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2336
-- Commit Summary --
* dispatcher: add attrs param to rpc 'add' call
-- File Changes --
M src/modules/dispatcher/dispatch.c (11) M src/modules/dispatcher/dispatch.h (2) M src/modules/dispatcher/dispatcher.c (5) M src/modules/dispatcher/doc/dispatcher_admin.xml (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2336.patch https://github.com/kamailio/kamailio/pull/2336.diff
Thanks, it looks good to me. I think it can be merged.
Thanks Henning.
Merged #2336 into master.
@miconda commented on this pull request.
flags = 0;
- if(rpc->scan(ctx, "dS*d", &group, &dest, &flags) < 2) { + if(rpc->scan(ctx, "dS*d", &group, &dest, &flags, &attrs) < 3) {
I think here is missing and extra `S` in scan's 2nd parameter.
@miconda commented on this pull request.
@@ -1800,15 +1800,16 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx)
{ int group, flags; str dest; + str attrs;
Fix also the indentation here, since the `S` needs to be added below.
@miconda commented on this pull request.
flags = 0;
- if(rpc->scan(ctx, "dS*d", &group, &dest, &flags) < 2) { + if(rpc->scan(ctx, "dS*d", &group, &dest, &flags, &attrs) < 3) {
The above condition needs some update. Because attrs is optional, then it is still fine to go on with return code 2 (which represents the number of items/params scanned).
Probably return code has to be stored in a variable, e.g., then if ret<2 is error, if ret==2 then attrs.s=NULL and attrs.len=0 (or attrs=STR_NULL when declared).
@grumvalski commented on this pull request.
flags = 0;
- if(rpc->scan(ctx, "dS*d", &group, &dest, &flags) < 2) { + if(rpc->scan(ctx, "dS*d", &group, &dest, &flags, &attrs) < 3) {
Right, I'm going to fix.
-
Daniel-Constantin Mierla -
Federico Cabiddu
-
Henning Westerholt