[kamailio/kamailio] cdp: improved routing and removed useless warning/errors in authstatemachine (PR #3914)
<!-- 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 - [x] 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 -->
Diameter requests could contain Application-Ids in multiple AVPs. This fix iterates through them, instead of giving up if the first one does not match. This solves some issues when peers don't always declare support for vendor-specific/non-specific application ids, so routing should be easier.
Also fixed: - auth state machine being too verbose on regular messages being received or sent while in the Open state - add Destination-Host from auth state to requests (next-hop immediate routing)
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3914
-- Commit Summary --
* cdp: improved routing and removed useless warning/errors in authstatemachine
-- File Changes --
M src/modules/cdp/authstatemachine.c (42) M src/modules/cdp/routing.c (176)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3914.patch https://github.com/kamailio/kamailio/pull/3914.diff
@herlesupreeth requested changes on this pull request.
case AUTH_EV_RECV_ANS_SUCCESS:
x->state = AUTH_ST_OPEN; update_auth_session_timers(x, msg); - //LM_INFO("state machine: i was in open and i am going to open\n"); + //LM_INFO("state machine: I was in open and I am going to open\n");
I thin we can remove this commented code
break;
case AUTH_EV_RECV_ANS_UNSUCCESS: x->state = AUTH_ST_DISCON; - //LM_INFO("state machine: i was in open and i am going to discon\n"); + //LM_INFO("state machine: I was in open and I am going to discon\n");
same as above. remove the commented code
break;
case AUTH_EV_SESSION_TIMEOUT: case AUTH_EV_SERVICE_TERMINATED: case AUTH_EV_SESSION_GRACE_TIMEOUT: x->state = AUTH_ST_DISCON; - //LM_INFO("state machine: i was in open and i am going to discon\n"); + //LM_INFO("state machine: I was in open and I am going to discon\n");
same as above
Send_STR(s, msg); break;
case AUTH_EV_SEND_ASA_SUCCESS: x->state = AUTH_ST_DISCON; - //LM_INFO("state machine: i was in open and i am going to discon\n"); + //LM_INFO("state machine: I was in open and I am going to discon\n");
same as above
Send_STR(s, msg);
break;
case AUTH_EV_SEND_ASA_UNSUCCESS: x->state = AUTH_ST_OPEN; update_auth_session_timers(x, msg); - //LM_INFO("state machine: i was in open and i am going to open\n"); + //LM_INFO("state machine: I was in open and I am going to open\n");
remove commented code
@herlesupreeth commented on this pull request.
- avp = AAAFindMatchingAVP(m, 0, AVP_Destination_Host, 0, AAA_FORWARD_SEARCH);
+ if(avp) + destination_host = avp->data; + + if(destination_host.len) { + /* There is a destination host present in the message try and route directly there */ + p = get_peer_by_fqdn(&destination_host); + if(p && (p->state == I_Open || p->state == R_Open) + && peer_handles_application(p, app_id, vendor_id)) { + p->last_selected = time(NULL); + return p; + } + /* the destination host peer is not connected at the moment, try a normal route then */ + } + + if(!config->r_table) {
cant we remove this check here as its already done in `get_peer_by_fqdn` ??
@herlesupreeth commented on this pull request.
int app_id = 0, vendor_id = 0;
+ // 1. Destination-Host routing to adjacent peer + avp = AAAFindMatchingAVP(m, 0, AVP_Destination_Host, 0, AAA_FORWARD_SEARCH); + if(avp) + destination_host = avp->data; + + if(destination_host.len) {
cant we remove this check here as its already done in `get_peer_by_fqdn` ??
Thanks @vingarzan. Looks good to me.
@vingarzan pushed 1 commit.
373b6edf1f7aaac3be70f0bf6b4e775585b6504c cdp: improved routing and removed useless warning/errors in authstatemachine
Thanks @vingarzan. Looks good to me.
Thank you also for the review! I have removed the commented out logs.
@herlesupreeth approved this pull request.
Merged #3914 into master.
-
Dragos Vingarzan -
Supreeth Herle