Re: [sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-27 Thread Federico Cabiddu
@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.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336#discussion_r431609608___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-27 Thread Daniel-Constantin Mierla
@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).

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336#discussion_r431608432___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-27 Thread Daniel-Constantin Mierla
@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.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336#pullrequestreview-419808428___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-27 Thread Daniel-Constantin Mierla
@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.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336#pullrequestreview-419807901___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-27 Thread Federico Cabiddu
Merged #2336 into master.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336#event-3381099203___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-27 Thread Federico Cabiddu
Thanks Henning.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336#issuecomment-635106745___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-27 Thread Henning Westerholt
Thanks, it looks good to me. I think it can be merged.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336#issuecomment-634900801___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] [kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)

2020-05-26 Thread Federico Cabiddu




 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 # (replace  with an open issue number)

 Description

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

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2336
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev