Reported by oej GH #580. Includes whitespace cleanup and normalizing. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/762
-- Commit Summary --
* Merge remote-tracking branch 'refs/remotes/kamailio/master' * sca: terminate all error and debug messages with a new line
-- File Changes --
M modules/sca/sca.c (554) M modules/sca/sca.h (36) M modules/sca/sca_appearance.c (2239) M modules/sca/sca_appearance.h (188) M modules/sca/sca_call_info.c (3557) M modules/sca/sca_call_info.h (42) M modules/sca/sca_common.h (13) M modules/sca/sca_db.c (251) M modules/sca/sca_db.h (71) M modules/sca/sca_dialog.c (151) M modules/sca/sca_dialog.h (22) M modules/sca/sca_event.c (73) M modules/sca/sca_event.h (16) M modules/sca/sca_hash.c (451) M modules/sca/sca_hash.h (78) M modules/sca/sca_notify.c (597) M modules/sca/sca_notify.h (6) M modules/sca/sca_reply.c (54) M modules/sca/sca_reply.h (2) M modules/sca/sca_rpc.c (820) M modules/sca/sca_rpc.h (44) M modules/sca/sca_subscribe.c (2668) M modules/sca/sca_subscribe.h (71) M modules/sca/sca_util.c (718) M modules/sca/sca_util.h (32) M utils/kamctl/mysql/ims_dialog-create.sql (104)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/762.patch https://github.com/kamailio/kamailio/pull/762.diff
I see the file utils/kamctl/mysql/ims_dialog-create.sql being also changed. Was is automatically generated?
Must of been. I did not even touch that.
I did a simple pull request to make sure I was conforming to the the standards. Thank you for showing me that doc.
@TheGrandWazoo pushed 1 commit.
4a50b81 sca: removed non-documented modparam 'outbound_proxy'
Committing changes that you are not aware of it's not a good thing, because it can break exiting code. Somehow you changed ims_dialog-create.sql and if we don't know why you did it, then it cannot be merged. You can use "git status" before any commit to see what files are affected by the commit.
Regarding the removal of outbound_proxy, I see that it was set in a structure. Have you checked that the structure is not passed to the dependency modules like tm, sl where the field might be used?
@TheGrandWazoo pushed 2 commits.
e3c572d Revert "sca: removed non-documented modparam 'outbound_proxy'" 672ea9b Revert "sca: terminate all error and debug messages with a new line"
@TheGrandWazoo pushed 1 commit.
a8fae37 sca: terminate all error and debug messages with a new line
Thanks! I pushed the pull request manually on your behalf to get the end result of it (commit), avoiding changing and reverting other files.
You can push the other patches you have for sca module as new pull requests.
Closed #762.
-
Daniel-Constantin Mierla -
Kevin Scott Adams