[asterisk-dev] Change in testsuite[master]: python/asterisk/version: Update version handling for Git mig...
George Joseph has posted comments on this change. Change subject: python/asterisk/version: Update version handling for Git migration .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/91 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idbb0ef92fec6d4e8e39da105c9c635f9ecdd4ee4 Gerrit-PatchSet: 3 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: pjsip/options: Add tests for qualify_timeout and max_initia...
George Joseph has uploaded a new patch set (#2). Change subject: pjsip/options: Add tests for qualify_timeout and max_initial_qualify_time .. pjsip/options: Add tests for qualify_timeout and max_initial_qualify_time Renamed the original test to 'auth' since it's putpose was to make sure Asterisk didn't crash on authed OPTIONS. Added a basic test that just makes sure a qualify works. Added tests that make sure the new qualify_timeout and max_initial_qualify_time work. Change-Id: Id37260a9f6b9927fdd90bef73d43a97ce2445fa1 --- R tests/channels/pjsip/qualify/auth/configs/ast1/pjsip.conf R tests/channels/pjsip/qualify/auth/sipp/options.xml R tests/channels/pjsip/qualify/auth/test-config.yaml A tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf A tests/channels/pjsip/qualify/basic/sipp/options.xml A tests/channels/pjsip/qualify/basic/test-config.yaml A tests/channels/pjsip/qualify/max_initial_qualify_time/configs/ast1/pjsip.conf A tests/channels/pjsip/qualify/max_initial_qualify_time/sipp/options.xml A tests/channels/pjsip/qualify/max_initial_qualify_time/test-config.yaml A tests/channels/pjsip/qualify/qualify_timeout/configs/ast1/pjsip.conf A tests/channels/pjsip/qualify/qualify_timeout/sipp/options.xml A tests/channels/pjsip/qualify/qualify_timeout/test-config.yaml A tests/channels/pjsip/qualify/tests.yaml M tests/channels/pjsip/tests.yaml 14 files changed, 298 insertions(+), 1 deletion(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/92/92/2 -- To view, visit https://gerrit.asterisk.org/92 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id37260a9f6b9927fdd90bef73d43a97ce2445fa1 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: pjsip/options: Add tests for qualify_timeout and max_initia...
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/92 Change subject: pjsip/options: Add tests for qualify_timeout and max_initial_qualify_time .. pjsip/options: Add tests for qualify_timeout and max_initial_qualify_time Renamed the original test to 'auth' since it's putpose was to make sure Asterisk didn't crash on authed OPTIONS. Added a basic test that just makes sure a qualify works. Added tests that make sure the new qualify_timeout and max_initial_qualify_time work. Change-Id: Id37260a9f6b9927fdd90bef73d43a97ce2445fa1 --- R tests/channels/pjsip/qualify/auth/configs/ast1/pjsip.conf R tests/channels/pjsip/qualify/auth/sipp/options.xml R tests/channels/pjsip/qualify/auth/test-config.yaml A tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf A tests/channels/pjsip/qualify/basic/sipp/options.xml A tests/channels/pjsip/qualify/basic/test-config.yaml A tests/channels/pjsip/qualify/max_initial_qualify_time/configs/ast1/pjsip.conf A tests/channels/pjsip/qualify/max_initial_qualify_time/sipp/options.xml A tests/channels/pjsip/qualify/max_initial_qualify_time/test-config.yaml A tests/channels/pjsip/qualify/qualify_timeout/configs/ast1/pjsip.conf A tests/channels/pjsip/qualify/qualify_timeout/sipp/options.xml A tests/channels/pjsip/qualify/qualify_timeout/test-config.yaml A tests/channels/pjsip/qualify/tests.yaml M tests/channels/pjsip/tests.yaml 14 files changed, 298 insertions(+), 1 deletion(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/92/92/1 diff --git a/tests/channels/pjsip/qualify/configs/ast1/pjsip.conf b/tests/channels/pjsip/qualify/auth/configs/ast1/pjsip.conf similarity index 100% rename from tests/channels/pjsip/qualify/configs/ast1/pjsip.conf rename to tests/channels/pjsip/qualify/auth/configs/ast1/pjsip.conf diff --git a/tests/channels/pjsip/qualify/sipp/options.xml b/tests/channels/pjsip/qualify/auth/sipp/options.xml similarity index 100% rename from tests/channels/pjsip/qualify/sipp/options.xml rename to tests/channels/pjsip/qualify/auth/sipp/options.xml diff --git a/tests/channels/pjsip/qualify/test-config.yaml b/tests/channels/pjsip/qualify/auth/test-config.yaml similarity index 100% rename from tests/channels/pjsip/qualify/test-config.yaml rename to tests/channels/pjsip/qualify/auth/test-config.yaml diff --git a/tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf b/tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf new file mode 100644 index 000..f9e3f8d --- /dev/null +++ b/tests/channels/pjsip/qualify/basic/configs/ast1/pjsip.conf @@ -0,0 +1,14 @@ + +[mytransport] +type=transport +protocol=udp +bind=127.0.0.1:5060 + +[sipp] +type=endpoint +aors=sipp + +[sipp] +type=aor +contact=sip:127.0.0.1:5061 +qualify_frequency=5 diff --git a/tests/channels/pjsip/qualify/basic/sipp/options.xml b/tests/channels/pjsip/qualify/basic/sipp/options.xml new file mode 100644 index 000..4a6daaa --- /dev/null +++ b/tests/channels/pjsip/qualify/basic/sipp/options.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/tests/channels/pjsip/qualify/basic/test-config.yaml b/tests/channels/pjsip/qualify/basic/test-config.yaml new file mode 100644 index 000..b72424f --- /dev/null +++ b/tests/channels/pjsip/qualify/basic/test-config.yaml @@ -0,0 +1,61 @@ +testinfo: +summary: 'Test basic qualify' +description: | +'With qualify_frequency = 5, send a qualify to a contact and verify that +the contact is marked Available before reactor-timeout. + +test-modules: +test-object: +config-section: test-object-config +typename: 'sipp.SIPpTestCase' +modules: +- +config-section: 'ami-config' +typename: 'ami.AMIEventModule' + +test-object-config: +fail-on-any: False +reactor-timeout: 10 +test-iterations: +- +scenarios: +- { 'key-args': {'scenario': 'options.xml', '-i': '127.0.0.1', '-p': '5061'} } + +ami-config: +- +type: 'headermatch' +id: '0' +conditions: +match: +Event: 'TestEvent' +State: 'AOR_CONTACT_UPDATE' +requirements: +match: +Contact: 'sip:127.0.0.1:5061' +Status: 'Available' +count: '1' +- +type: 'headermatch' +id: '0' +conditions: +match: +Event: 'TestEvent' +State: 'AOR_CONTACT_QUALIFY_RESULT' +requirements: +match: +Contact: 'sip:127.0.0.1:5061' +Status: 'Available' +count: '1' + +properties: +minversion: '13.3.0' +dependencies: +- buildoption: 'TEST_FRAMEWORK' +- python: 'twisted' +- python: 'starpy' +- sipp: +version: 'v3.3' +- asterisk: 'res_pjsip' +tags: +- pjs
[asterisk-dev] Change in asterisk[13]: pjsip_options: Add qualify_timeout processing and eventing
George Joseph has uploaded a new patch set (#2). Change subject: pjsip_options: Add qualify_timeout processing and eventing .. pjsip_options: Add qualify_timeout processing and eventing This is the second follow-on to https://reviewboard.asterisk.org/r/4572/ and the discussion at http://lists.digium.com/pipermail/asterisk-dev/2015-March/073921.html The basic issues are that changes in contact status don't cause events to be emitted for the associated endpoint. Only dynamic contact add/delete actions update the endpoint. Also, the qualify timeout is fixed by pjsip at 32 seconds which is a long time. This patch makes use of the new transaction timeout feature in r4585 and provides the following capabilities... 1. A new aor/contact variable 'qualify_timeout' has been added that allows the user to specify the maximum time in milliseconds to wait for a response to an OPTIONS mesasge. The default is 3000ms. When the timer expires, the contact is marked unavailable. 2. Contact status changes are now propagated up to the endpoint as follows... When any contact is 'Available', the endpoint is marked as 'Reachable'. When all contacts are 'Unavailable', the endpoint is marked as 'Unreachable'. The existing endpoint events are generated appropriately. Testing Done: Existing tests are unchanged. I'm working on new testsuite tests to check the new functionality. Change-Id: Id0ce0528e58014da1324856ea537e7765466044a Tested-by: Dmitriy Serov Tested-by: George Joseph --- M CHANGES M configs/samples/pjsip.conf.sample A contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py M include/asterisk/endpoints.h M include/asterisk/res_pjsip.h M main/endpoints.c M res/res_pjsip.c M res/res_pjsip/location.c M res/res_pjsip/pjsip_configuration.c M res/res_pjsip/pjsip_options.c 10 files changed, 303 insertions(+), 35 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/44/44/2 -- To view, visit https://gerrit.asterisk.org/44 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id0ce0528e58014da1324856ea537e7765466044a Gerrit-PatchSet: 2 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: George Joseph Gerrit-Reviewer: Joshua Colp -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[12]: main/editline: Add .gitignore.
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/83 Change subject: main/editline: Add .gitignore. .. main/editline: Add .gitignore. This patch adds a .gitignore for main/editline to ignore all build results. Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d (cherry picked from commit 5d34bce635ad7f225d557fa226e6b79c6293dbe1) --- A main/editline/.gitignore 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/83/83/1 diff --git a/main/editline/.gitignore b/main/editline/.gitignore new file mode 100644 index 000..d3bb06b --- /dev/null +++ b/main/editline/.gitignore @@ -0,0 +1,13 @@ +*.o_a +Makefile +common.h +config.cache +config.h +editline.c +emacs.h +fcns.c +fcns.h +help.c +help.h +makelist +vi.h -- To view, visit https://gerrit.asterisk.org/83 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 12 Gerrit-Owner: George Joseph Gerrit-Reviewer: Corey Farrell -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[1.8]: .gitignore: Ignore tarballs (*.gz)
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/86 Change subject: .gitignore: Ignore tarballs (*.gz) .. .gitignore: Ignore tarballs (*.gz) This patch updates the root .gitignore file to ignore files with a .gz extension. This will cause git to ignore downloaded sound tarballs in the the sounds/ directory. Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/86/86/1 diff --git a/.gitignore b/.gitignore index cf46873..33dd7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *~ *.[oadi] +*.gz *.ii *.oo *.eo -- To view, visit https://gerrit.asterisk.org/86 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 1.8 Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[1.8]: Add .gitignore and .gitreview files
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/82 Change subject: Add .gitignore and .gitreview files .. Add .gitignore and .gitreview files Add the .gitignore and .gitreview files to the asterisk repo. NB: You can add local ignores to the .git/info/exclude file without having to do a commit. Common ignore patterns are in the top-level .gitignore file. Subdirectory-specific ignore patterns are in their own .gitignore files. Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Tested-by: George Joseph (cherry picked from commit b35e184d41c4e61e98b455d70321ba90118600a1) --- A .gitignore A .gitreview A addons/.gitignore A agi/.gitignore A build_tools/.gitignore A doc/.gitignore A include/asterisk/.gitignore A main/.gitignore A menuselect/.gitignore A res/ael/.gitignore A utils/.gitignore 11 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/82/82/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..cf46873 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ + +# See .gitignore in subdirectories for more ignored files + +*~ +*.[oadi] +*.ii +*.oo +*.eo +*.so +*.exports +*.moduleinfo +*.makeopts +*.makedeps +makeopts +.lastclean +config.log +config.status +defaults.h +makeopts.embed_rules +menuselect-tree diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..f9ef050 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.asterisk.org +port=29418 +project=asterisk.git diff --git a/addons/.gitignore b/addons/.gitignore new file mode 100644 index 000..663e668 --- /dev/null +++ b/addons/.gitignore @@ -0,0 +1 @@ +mp3 diff --git a/agi/.gitignore b/agi/.gitignore new file mode 100644 index 000..9b2a4e2 --- /dev/null +++ b/agi/.gitignore @@ -0,0 +1,3 @@ +eagi-sphinx-test +eagi-test +strcompat.c diff --git a/build_tools/.gitignore b/build_tools/.gitignore new file mode 100644 index 000..c60a0df --- /dev/null +++ b/build_tools/.gitignore @@ -0,0 +1 @@ +menuselect-deps diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 000..27acdb3 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +core-en_US.xml diff --git a/include/asterisk/.gitignore b/include/asterisk/.gitignore new file mode 100644 index 000..ae33b3c --- /dev/null +++ b/include/asterisk/.gitignore @@ -0,0 +1,3 @@ +autoconfig.h +build.h +buildopts.h diff --git a/main/.gitignore b/main/.gitignore new file mode 100644 index 000..23f5c58 --- /dev/null +++ b/main/.gitignore @@ -0,0 +1,3 @@ +asterisk +libasteriskssl.so.1 +version.c diff --git a/menuselect/.gitignore b/menuselect/.gitignore new file mode 100644 index 000..38ea2d3 --- /dev/null +++ b/menuselect/.gitignore @@ -0,0 +1,5 @@ +autoconfig.h +cmenuselect +config.log +config.status +menuselect diff --git a/res/ael/.gitignore b/res/ael/.gitignore new file mode 100644 index 000..f39b612 --- /dev/null +++ b/res/ael/.gitignore @@ -0,0 +1 @@ +ael.output diff --git a/utils/.gitignore b/utils/.gitignore new file mode 100644 index 000..ed37a06 --- /dev/null +++ b/utils/.gitignore @@ -0,0 +1,24 @@ +aelbison.c +aelparse +aelparse.c +ast_expr2.c +ast_expr2f.c +astman +astcanary +astdb2bdb +astdb2sqlite3 +check_expr +check_expr2 +conf2ael +db1-ast/libdb1.a +hashtab.c +lock.c +md5.c +muted +pbx_ael.c +pval.c +smsq +stereorize +strcompat.c +streamplayer +threadstorage.c -- To view, visit https://gerrit.asterisk.org/82 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 1.8 Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[12]: .gitignore: Ignore tarballs (*.gz)
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/85 Change subject: .gitignore: Ignore tarballs (*.gz) .. .gitignore: Ignore tarballs (*.gz) This patch updates the root .gitignore file to ignore files with a .gz extension. This will cause git to ignore downloaded sound tarballs in the the sounds/ directory. Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/85/85/1 diff --git a/.gitignore b/.gitignore index cf46873..33dd7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *~ *.[oadi] +*.gz *.ii *.oo *.eo -- To view, visit https://gerrit.asterisk.org/85 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 12 Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[1.8]: main/editline: Add .gitignore.
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/84 Change subject: main/editline: Add .gitignore. .. main/editline: Add .gitignore. This patch adds a .gitignore for main/editline to ignore all build results. Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d (cherry picked from commit 5d34bce635ad7f225d557fa226e6b79c6293dbe1) --- A main/editline/.gitignore 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/84/84/1 diff --git a/main/editline/.gitignore b/main/editline/.gitignore new file mode 100644 index 000..d3bb06b --- /dev/null +++ b/main/editline/.gitignore @@ -0,0 +1,13 @@ +*.o_a +Makefile +common.h +config.cache +config.h +editline.c +emacs.h +fcns.c +fcns.h +help.c +help.h +makelist +vi.h -- To view, visit https://gerrit.asterisk.org/84 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 1.8 Gerrit-Owner: George Joseph Gerrit-Reviewer: Corey Farrell -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[12]: Add .gitignore and .gitreview files
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/81 Change subject: Add .gitignore and .gitreview files .. Add .gitignore and .gitreview files Add the .gitignore and .gitreview files to the asterisk repo. NB: You can add local ignores to the .git/info/exclude file without having to do a commit. Common ignore patterns are in the top-level .gitignore file. Subdirectory-specific ignore patterns are in their own .gitignore files. Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Tested-by: George Joseph (cherry picked from commit b35e184d41c4e61e98b455d70321ba90118600a1) --- A .gitignore A .gitreview A addons/.gitignore A agi/.gitignore A build_tools/.gitignore A doc/.gitignore A include/asterisk/.gitignore A main/.gitignore A menuselect/.gitignore A res/ael/.gitignore A utils/.gitignore 11 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/81/81/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..cf46873 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ + +# See .gitignore in subdirectories for more ignored files + +*~ +*.[oadi] +*.ii +*.oo +*.eo +*.so +*.exports +*.moduleinfo +*.makeopts +*.makedeps +makeopts +.lastclean +config.log +config.status +defaults.h +makeopts.embed_rules +menuselect-tree diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..f9ef050 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.asterisk.org +port=29418 +project=asterisk.git diff --git a/addons/.gitignore b/addons/.gitignore new file mode 100644 index 000..663e668 --- /dev/null +++ b/addons/.gitignore @@ -0,0 +1 @@ +mp3 diff --git a/agi/.gitignore b/agi/.gitignore new file mode 100644 index 000..9b2a4e2 --- /dev/null +++ b/agi/.gitignore @@ -0,0 +1,3 @@ +eagi-sphinx-test +eagi-test +strcompat.c diff --git a/build_tools/.gitignore b/build_tools/.gitignore new file mode 100644 index 000..c60a0df --- /dev/null +++ b/build_tools/.gitignore @@ -0,0 +1 @@ +menuselect-deps diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 000..27acdb3 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +core-en_US.xml diff --git a/include/asterisk/.gitignore b/include/asterisk/.gitignore new file mode 100644 index 000..ae33b3c --- /dev/null +++ b/include/asterisk/.gitignore @@ -0,0 +1,3 @@ +autoconfig.h +build.h +buildopts.h diff --git a/main/.gitignore b/main/.gitignore new file mode 100644 index 000..23f5c58 --- /dev/null +++ b/main/.gitignore @@ -0,0 +1,3 @@ +asterisk +libasteriskssl.so.1 +version.c diff --git a/menuselect/.gitignore b/menuselect/.gitignore new file mode 100644 index 000..38ea2d3 --- /dev/null +++ b/menuselect/.gitignore @@ -0,0 +1,5 @@ +autoconfig.h +cmenuselect +config.log +config.status +menuselect diff --git a/res/ael/.gitignore b/res/ael/.gitignore new file mode 100644 index 000..f39b612 --- /dev/null +++ b/res/ael/.gitignore @@ -0,0 +1 @@ +ael.output diff --git a/utils/.gitignore b/utils/.gitignore new file mode 100644 index 000..ed37a06 --- /dev/null +++ b/utils/.gitignore @@ -0,0 +1,24 @@ +aelbison.c +aelparse +aelparse.c +ast_expr2.c +ast_expr2f.c +astman +astcanary +astdb2bdb +astdb2sqlite3 +check_expr +check_expr2 +conf2ael +db1-ast/libdb1.a +hashtab.c +lock.c +md5.c +muted +pbx_ael.c +pval.c +smsq +stereorize +strcompat.c +streamplayer +threadstorage.c -- To view, visit https://gerrit.asterisk.org/81 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 12 Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[1.8]: build_tools/make_version: Update version parsing for Git mig...
George Joseph has posted comments on this change. Change subject: build_tools/make_version: Update version parsing for Git migration .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/76 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 1.8 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[12]: build_tools/make_version: Update version parsing for Git mig...
George Joseph has posted comments on this change. Change subject: build_tools/make_version: Update version parsing for Git migration .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/78 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 12 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[11]: build_tools/make_version: Update version parsing for Git mig...
George Joseph has posted comments on this change. Change subject: build_tools/make_version: Update version parsing for Git migration .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/77 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 11 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[13]: build_tools/make_version: Update version parsing for Git mig...
George Joseph has posted comments on this change. Change subject: build_tools/make_version: Update version parsing for Git migration .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/79 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: build_tools/make_version: Update version parsing for Git mig...
George Joseph has posted comments on this change. Change subject: build_tools/make_version: Update version parsing for Git migration .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/80 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: PEP8 fixes
George Joseph has posted comments on this change. Change subject: PEP8 fixes .. Patch Set 2: Code-Review+1 All the pjsip tests works now. -- To view, visit https://gerrit.asterisk.org/40 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I55bcaab21c54f9040594f51c57f0efe30a219a62 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-Reviewer: Matt Jordan Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro
George Joseph has posted comments on this change. Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro .. Patch Set 4: Code-Review+1 Compile succeeded. -- To view, visit https://gerrit.asterisk.org/58 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e Gerrit-PatchSet: 4 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: Matt Jordan Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-Reviewer: Matt Jordan Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro
Hello Corey Farrell, I'd like you to reexamine a change. Please visit https://gerrit.asterisk.org/58 to look at the new patch set (#4). Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro .. git migration: Refactor the ASTERISK_FILE_VERSION macro Git does not support the ability to replace a token with a version string during check-in. While it does have support for replacing a token on clone, this is somewhat sub-optimal: the token is replaced with the object hash, which is not particularly easy for human consumption. What's more, in practice, the source file version was often not terribly useful. Generally, when triaging bugs, the overall version of Asterisk is far more useful than an individual SVN version of a file. As a result, this patch removes Asterisk's support for showing source file versions. Specifically, it does the following: * Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and remove passing the version in with the macro. Other facilities than 'core show file version' make use of the file names, such as setting a debug level only on a specific file. As such, the act of registering source files with the Asterisk core still has use. The macro rename now reflects the new macro purpose. * main/asterisk: - Refactor the file_version structure to reflect that it no longer tracks a version field. - Remove the "core show file version" CLI command. Without the file version, it is no longer useful. - Remove the ast_file_version_find function. The file version is no longer tracked. - Rename ast_register_file_version/ast_unregister_file_version to ast_register_file/ast_unregister_file, respectively. * main/manager: Remove value from the Version key of the ModuleCheck Action. The actual key itself has not been removed, as doing so would absolutely constitute a backwards incompatible change. However, since the file version is no longer tracked, there is no need to attempt to include it in the Version key. * UPGRADE: Add notes for: - Modification to the ModuleCheck AMI Action - Removal of the "core show file version" CLI command Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e --- M UPGRADE.txt M addons/cdr_mysql.c M addons/chan_mobile.c M addons/format_mp3.c M addons/ooh323c/src/ooSocket.c M addons/res_config_mysql.c M apps/app_adsiprog.c M apps/app_agent_pool.c M apps/app_alarmreceiver.c M apps/app_amd.c M apps/app_authenticate.c M apps/app_bridgewait.c M apps/app_cdr.c M apps/app_celgenuserevent.c M apps/app_chanisavail.c M apps/app_channelredirect.c M apps/app_chanspy.c M apps/app_confbridge.c M apps/app_controlplayback.c M apps/app_dahdiras.c M apps/app_db.c M apps/app_dial.c M apps/app_dictate.c M apps/app_directed_pickup.c M apps/app_directory.c M apps/app_disa.c M apps/app_dumpchan.c M apps/app_echo.c M apps/app_exec.c M apps/app_externalivr.c M apps/app_fax.c M apps/app_festival.c M apps/app_flash.c M apps/app_followme.c M apps/app_forkcdr.c M apps/app_getcpeid.c M apps/app_ices.c M apps/app_image.c M apps/app_ivrdemo.c M apps/app_jack.c M apps/app_macro.c M apps/app_meetme.c M apps/app_milliwatt.c M apps/app_minivm.c M apps/app_mixmonitor.c M apps/app_morsecode.c M apps/app_mp3.c M apps/app_nbscat.c M apps/app_originate.c M apps/app_osplookup.c M apps/app_page.c M apps/app_playback.c M apps/app_playtones.c M apps/app_privacy.c M apps/app_queue.c M apps/app_read.c M apps/app_readexten.c M apps/app_record.c M apps/app_saycounted.c M apps/app_sayunixtime.c M apps/app_senddtmf.c M apps/app_sendtext.c M apps/app_setcallerid.c M apps/app_skel.c M apps/app_sms.c M apps/app_softhangup.c M apps/app_speech_utils.c M apps/app_stack.c M apps/app_stasis.c M apps/app_system.c M apps/app_talkdetect.c M apps/app_test.c M apps/app_transfer.c M apps/app_url.c M apps/app_userevent.c M apps/app_verbose.c M apps/app_voicemail.c M apps/app_waitforring.c M apps/app_waitforsilence.c M apps/app_waituntil.c M apps/app_while.c M apps/app_zapateller.c M apps/confbridge/conf_chan_announce.c M apps/confbridge/conf_chan_record.c M apps/confbridge/conf_config_parser.c M apps/confbridge/confbridge_manager.c M bridges/bridge_builtin_features.c M bridges/bridge_builtin_interval_features.c M bridges/bridge_holding.c M bridges/bridge_native_rtp.c M bridges/bridge_simple.c M bridges/bridge_softmix.c M cdr/cdr_adaptive_odbc.c M cdr/cdr_csv.c M cdr/cdr_custom.c M cdr/cdr_manager.c M cdr/cdr_odbc.c M cdr/cdr_pgsql.c M cdr/cdr_radius.c M cdr/cdr_sqlite.c M cdr/cdr_sqlite3_custom.c M cdr/cdr_syslog.c M cdr/cdr_tds.c M cel/cel_custom.c M cel/cel_manager.c M cel/cel_odbc.c M cel/cel_pgsql.c M cel/cel_radius.c M cel/cel_sqlite3_custom.c M cel/cel_tds.c M channels/chan_alsa.c M channels/chan_bridge_media.c M channels/chan_console.c M channels/chan_dahdi.c M channels/chan_iax2.c M channels/chan_mgcp.c M channels/chan_misdn.c M channels/chan_motif.c M channels/chan_nbs.c M chann
[asterisk-dev] Change in testsuite[master]: PEP8 fixes
George Joseph has posted comments on this change. Change subject: PEP8 fixes .. Patch Set 1: Code-Review-1 Ran the first 10 pjsip tests and all failed but 1. They all pass in master. -- To view, visit https://gerrit.asterisk.org/40 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I55bcaab21c54f9040594f51c57f0efe30a219a62 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-Reviewer: Matt Jordan Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro
George Joseph has posted comments on this change. Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro .. Patch Set 1: Code-Review-1 (1 comment) Compile fails. https://gerrit.asterisk.org/#/c/58/1/cel/cel_radius.c File cel/cel_radius.c: Line 36: ASTERISK_REGISTER_FILE(__FILE__, "$Rev$") cel_radius.c:36:41: error: macro "ASTERISK_REGISTER_FILE" passed 2 arguments, but takes just 0 ASTERISK_REGISTER_FILE(__FILE__, "$Rev$") -- To view, visit https://gerrit.asterisk.org/58 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: Matt Jordan Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-HasComments: Yes -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[11]: Add .gitignore and .gitreview files
George Joseph has posted comments on this change. Change subject: Add .gitignore and .gitreview files .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/64 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2b7513fc9acf5d432cf9587c25faa9786af14abf Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 11 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[13]: .gitignore: Ignore tarballs (*.gz)
George Joseph has posted comments on this change. Change subject: .gitignore: Ignore tarballs (*.gz) .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/63 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1e42fbfa02a8884231507b683e8e49ac3e278aaa Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[11]: .gitignore: Ignore tarballs (*.gz)
George Joseph has posted comments on this change. Change subject: .gitignore: Ignore tarballs (*.gz) .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/65 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic153642236ea8aee100443b94c563d0318711af3 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 11 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[11]: main/editline: Add .gitignore.
George Joseph has posted comments on this change. Change subject: main/editline: Add .gitignore. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/67 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 11 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[13]: Add .gitignore and .gitreview files
George Joseph has posted comments on this change. Change subject: Add .gitignore and .gitreview files .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/62 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c8af3b8e3739957db545f7368ac53f38e99f696 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[13]: main/editline: Add .gitignore.
George Joseph has posted comments on this change. Change subject: main/editline: Add .gitignore. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.asterisk.org/66 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: Matt Jordan Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: main/editline: Add .gitignore.
George Joseph has posted comments on this change. Change subject: main/editline: Add .gitignore. .. Patch Set 1: > Why is it not included in the main .ignore? > > main/editline/Makefile > > etc. We decided that the ignores would be better organized if the top-level file had the common stuff and each subdirectory that needed to ignore additional stuff had their own file. -- To view, visit https://gerrit.asterisk.org/57 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-Reviewer: Tzafrir Cohen Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: main/editline: Add .gitignore.
George Joseph has posted comments on this change. Change subject: main/editline: Add .gitignore. .. Patch Set 1: Code-Review+1 Good catch. I always use the external editline so the internal one never gets built. -- To view, visit https://gerrit.asterisk.org/57 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68c7bf375ea46282689e5a706534b69fca233b5d Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-Reviewer: Tzafrir Cohen Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: Add .gitignore and .gitreview files
Hello Corey Farrell, I'd like you to reexamine a change. Please visit https://gerrit.asterisk.org/42 to look at the new patch set (#3). Change subject: Add .gitignore and .gitreview files .. Add .gitignore and .gitreview files Add the .gitignore and .gitreview files to the asterisk repo. NB: You can add local ignores to the .git/info/exclude file without having to do a commit. Common ignore patterns are in the top-level .gitignore file. Subdirectory-specific ignore patterns are in their own .gitignore files. Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Tested-by: George Joseph --- A .gitignore A .gitreview A addons/.gitignore A agi/.gitignore A build_tools/.gitignore A doc/.gitignore A include/asterisk/.gitignore A main/.gitignore A menuselect/.gitignore A res/ael/.gitignore A utils/.gitignore 11 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/42/42/3 -- To view, visit https://gerrit.asterisk.org/42 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 3 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: George Joseph Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-Reviewer: Matt Jordan Gerrit-Reviewer: Russell Bryant -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: res_pjsip: Add global option to limit the maximum time for i...
George Joseph has abandoned this change. Change subject: res_pjsip: Add global option to limit the maximum time for initial qualifies .. Abandoned -- To view, visit https://gerrit.asterisk.org/48 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ib80498aa1ea9923277bef51d6a9015c9c79740f4 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: pjsip_options: Add qualify_timeout processing and eventing
George Joseph has abandoned this change. Change subject: pjsip_options: Add qualify_timeout processing and eventing .. Abandoned -- To view, visit https://gerrit.asterisk.org/47 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Id0ce0528e58014da1324856ea537e7765466044a Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[13]: Add .gitignore and .gitreview files
George Joseph has abandoned this change. Change subject: Add .gitignore and .gitreview files .. Abandoned -- To view, visit https://gerrit.asterisk.org/49 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: res_pjsip: Refactor endpt_send_request to include transactio...
George Joseph has abandoned this change. Change subject: res_pjsip: Refactor endpt_send_request to include transaction timeout .. Abandoned -- To view, visit https://gerrit.asterisk.org/46 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I0778dc730d9689c5147a444a04aee3c1026bf747 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[13]: Add .gitignore and .gitreview files
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/49 Change subject: Add .gitignore and .gitreview files .. Add .gitignore and .gitreview files Add the .gitignore and .gitreview files to the asterisk repo. NB: You can add local ignores to the .git/info/exclude file without having to do a commit. Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Tested-by: George Joseph --- A .gitignore A .gitreview 2 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/49/49/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..b39f625 --- /dev/null +++ b/.gitignore @@ -0,0 +1,68 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ + +*~ +*.[oadi] +*.ii +*.oo +*.eo +*.so +*.exports +*.moduleinfo +*.makeopts +*.makedeps +makeopts + +.lastclean +addons/mp3 +agi/eagi-sphinx-test +agi/eagi-test +agi/strcompat.c +build_tools/menuselect-deps +config.log +config.status +defaults.h +doc/core-en_US.xml +include/asterisk/autoconfig.h +include/asterisk/build.h +include/asterisk/buildopts.h +main/asterisk +main/libasteriskssl.so.1 +main/version.c +makeopts.embed_rules +menuselect-tree +menuselect/autoconfig.h +menuselect/cmenuselect +menuselect/config.log +menuselect/config.status +menuselect/menuselect +res/ael/ael.output +utils/aelbison.c +utils/aelparse +utils/aelparse.c +utils/ast_expr2.c +utils/ast_expr2f.c +utils/astman +utils/astcanary +utils/astdb2bdb +utils/astdb2sqlite3 +utils/check_expr +utils/check_expr2 +utils/conf2ael +utils/db1-ast/libdb1.a +utils/hashtab.c +utils/lock.c +utils/md5.c +utils/muted +utils/pbx_ael.c +utils/pval.c +utils/smsq +utils/stereorize +utils/strcompat.c +utils/streamplayer +utils/threadstorage.c + diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..f9ef050 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.asterisk.org +port=29418 +project=asterisk.git -- To view, visit https://gerrit.asterisk.org/49 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: res_pjsip: Add global option to limit the maximum time for i...
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/48 Change subject: res_pjsip: Add global option to limit the maximum time for initial qualifies .. res_pjsip: Add global option to limit the maximum time for initial qualifies Currently when Asterisk starts initial qualifies of contacts are spread out randomly between 0 and qualify_timeout to prevent network and system overload. If a contact's qualify_frequency is 5 minutes however, that contact may be unavailable to accept calls for the entire 5 minutes after startup. So while staggering the initial qualifies is a good idea, basing the time on qualify_timeout could leave contacts unavailable for too long. This patch adds a new global parameter "max_initial_qualify_time" that sets the maximum time for the initial qualifies. This way you could make sure that all your contacts are initialy, ransomly qualified within say 30 seconds but still have the contact's ongoing qualifies at a 5 minute interval. If max_initial_qualify_time is > 0, the formula is initial_interval = min(max_initial_interval, qualify_timeout * random(). If not set, qualify_timeout is used. The default is "0" (disabled). Testing Done: Tested in my own pbx with 15 endpoints. If max_initial_qualify_time is > 0 and < qualify_time, it's used, otherwise qualify_timeout is used. Testsuite test forthcoming. Change-Id: Ib80498aa1ea9923277bef51d6a9015c9c79740f4 Tested-by: George Joseph --- M CHANGES A contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py M include/asterisk/res_pjsip.h M res/res_pjsip.c M res/res_pjsip/config_global.c M res/res_pjsip/pjsip_options.c 6 files changed, 66 insertions(+), 2 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/48/48/1 diff --git a/CHANGES b/CHANGES index 4237c82..0f70425 100644 --- a/CHANGES +++ b/CHANGES @@ -139,6 +139,11 @@ * A new CLI command has been added: "pjsip show settings", which shows both the global and system configuration settings. + * A new global option has been added: "max_initial_qualify_time", which + sets the The maximum amount of time from startup that qualifies should be + attempted on all contacts. + + res_ari_channels -- * Two new events, 'ChannelHold' and 'ChannelUnhold', have been added to the diff --git a/contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py b/contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py new file mode 100644 index 000..3c5f243 --- /dev/null +++ b/contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py @@ -0,0 +1,21 @@ +"""add pjsip max_initial_qualify_time + +Revision ID: 45119a33fbbe +Revises: 2256a84ca226 +Create Date: 2015-04-10 12:29:43.077598 + +""" + +# revision identifiers, used by Alembic. +revision = '45119a33fbbe' +down_revision = '2256a84ca226' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): +op.add_column('ps_globals', sa.Column('max_initial_qualify_time', sa.Integer)) + +def downgrade(): +op.drop_column('ps_globals', 'max_initial_qualify_time') diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 2358a72..df18238 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -1956,4 +1956,12 @@ */ unsigned int ast_sip_get_keep_alive_interval(void); +/*! + * \brief Retrieve the system max initial qualify time. + * + * \retval the maximum initial qualify time. + */ +unsigned int ast_sip_get_max_initial_qualify_time(void); + + #endif /* _RES_PJSIP_H */ diff --git a/res/res_pjsip.c b/res/res_pjsip.c index fcd8516..1a9afb2 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -1211,6 +1211,9 @@ The interval (in seconds) to send keepalives to active connection-oriented transports. + + The maximum amount of time from startup that qualifies should be attempted on all contacts. + Must be of type 'global'. diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c index 2aa1583..42ba234 100644 --- a/res/res_pjsip/config_global.c +++ b/res/res_pjsip/config_global.c @@ -33,6 +33,7 @@ #define DEFAULT_OUTBOUND_ENDPOINT "default_outbound_endpoint" #define DEFAULT_DEBUG "no" #define DEFAULT_ENDPOINT_IDENTIFIER_ORDER "ip,username,anonymous" +#define DEFAULT_MAX_INITIAL_QUALIFY_TIME 0 static char default_useragent[256]; @@ -50,6 +51,8 @@ unsigned int max_forwards; /* The interval at which to send keep alive messages to active connection-oriented transports */
[asterisk-dev] Change in asterisk[master]: pjsip_options: Add qualify_timeout processing and eventing
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/47 Change subject: pjsip_options: Add qualify_timeout processing and eventing .. pjsip_options: Add qualify_timeout processing and eventing This is the second follow-on to https://reviewboard.asterisk.org/r/4572/ and the discussion at http://lists.digium.com/pipermail/asterisk-dev/2015-March/073921.html The basic issues are that changes in contact status don't cause events to be emitted for the associated endpoint. Only dynamic contact add/delete actions update the endpoint. Also, the qualify timeout is fixed by pjsip at 32 seconds which is a long time. This patch makes use of the new transaction timeout feature in r4585 and provides the following capabilities... 1. A new aor/contact variable 'qualify_timeout' has been added that allows the user to specify the maximum time in milliseconds to wait for a response to an OPTIONS mesasge. The default is 3000ms. When the timer expires, the contact is marked unavailable. 2. Contact status changes are now propagated up to the endpoint as follows... When any contact is 'Available', the endpoint is marked as 'Reachable'. When all contacts are 'Unavailable', the endpoint is marked as 'Unreachable'. The existing endpoint events are generated appropriately. Testing Done: Existing tests are unchanged. I'm working on new testsuite tests to check the new functionality. Change-Id: Id0ce0528e58014da1324856ea537e7765466044a Tested-by: Dmitriy Serov Tested-by: George Joseph --- M CHANGES M configs/samples/pjsip.conf.sample A contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py M include/asterisk/endpoints.h M include/asterisk/res_pjsip.h M main/endpoints.c M res/res_pjsip.c M res/res_pjsip/location.c M res/res_pjsip/pjsip_configuration.c M res/res_pjsip/pjsip_options.c 10 files changed, 285 insertions(+), 35 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/47/47/1 diff --git a/CHANGES b/CHANGES index 4237c82..76af05a 100644 --- a/CHANGES +++ b/CHANGES @@ -139,6 +139,14 @@ * A new CLI command has been added: "pjsip show settings", which shows both the global and system configuration settings. + * A new aor option has been added: "qualify_timeout", which sets the timeout + in seconds for a qualify. The default is 3 seconds. This was previously + hard coded to 32 seconds in pjproject. + + * Endpoint status will now change to "Unreachable" when all contacts are + unavailable. When any contact becomes available, the endpoint will status + will change back to "Reachable". + res_ari_channels -- * Two new events, 'ChannelHold' and 'ChannelUnhold', have been added to the diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample index d3bb518..0dd628c 100644 --- a/configs/samples/pjsip.conf.sample +++ b/configs/samples/pjsip.conf.sample @@ -812,6 +812,7 @@ ; (default: "no") ;type= ; Must be of type aor (default: "") ;qualify_frequency=0; Interval at which to qualify an AoR (default: "0") +;qualify_timeout=3 ; Qualify timeout in seconds (default: "3") ;authenticate_qualify=no; Authenticates a qualify request if needed ; (default: "no") ;outbound_proxy=; Outbound proxy used when sending OPTIONS request diff --git a/contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py b/contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py new file mode 100644 index 000..41f1b3d --- /dev/null +++ b/contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py @@ -0,0 +1,44 @@ +# +# Asterisk -- An open source telephony toolkit. +# +# Copyright (C) 2015, Fairview 5 Engineering, LLC +# +# George Joseph +# +# See http://www.asterisk.org for more information about +# the Asterisk project. Please do not directly contact +# any of the maintainers of this project for assistance; +# the project provides a web site, mailing lists and IRC +# channels for your use. +# +# This program is free software, distributed under the terms of +# the GNU General Public License Version 2. See the LICENSE file +# at the top of the source tree. +# + +"""add_pjsip_qualify_timeout + +Revision ID: 2256a84ca226 +Revises: 23530d604b96 +Create Date: 2015-04-03 13:18:18.023787 + +""" + +# revision identifiers, used by Alembic. +revision = '2256a84ca226' +down_revision = '23530d604b96' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): +op.add_column('ps_aors', sa.Column('qualify_timeout', sa.Integer)) +op.add_column('ps_contacts', sa.Column('qualify_timeout', sa.Integer)) +pass + + +def downgrade(): +op.drop_column('ps_aors', 'qualify_timeout') +op.drop_column('ps_contacts', 'qualify_timeout') +pass diff --git a/include/asterisk/endpoints.h
[asterisk-dev] Change in asterisk[master]: res_pjsip: Refactor endpt_send_request to include transactio...
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/46 Change subject: res_pjsip: Refactor endpt_send_request to include transaction timeout .. res_pjsip: Refactor endpt_send_request to include transaction timeout This is the first follow-on to https://reviewboard.asterisk.org/r/4572/ and the discussion at http://lists.digium.com/pipermail/asterisk-dev/2015-March/073921.html Since we currently have no control over pjproject transaction timeout, this patch pulls the pjsip_endpt_send_request function out of pjproject and into res_pjsip/endpt_send_transaction in order to implement that capability. Now when the transaction is initiated, we also schedule our own pj_timer with our own desired timeout. If the transaction completes before either timeout, pjproject cancels its timer, and calls our tsx callback where we cancel our timer and run the app callback. If the pjproject timer times out first, pjproject calls our tsx callback where we cancel our timer and run the app callback. If our timer times out first, we terminate the transaction which causes pjproject to cancel its timer and call our tsx callback where we run the app callback. Regardless of the scenario, pjproject is calling the tsx callback inside the group_lock and there are checks in the callback to make sure it doesn't run twice. As part of this patch ast_sip_send_out_of_dialog_request was created to replace its similarly named private function. It takes 2 new arguments... A timeout in milliseconds (<= 0 to disable the timeout) and a ** to a pjsip_transaction structure in case the caller wants to do something else with the transaction. Tested that both of the pjsip timeout and asterisk timeout scenarios work and clean up properly. All pjsip testsuite tests that worked before the change still work after the change. A new testsuite test will be written when the companion pjsip_options work is done. Change-Id: I0778dc730d9689c5147a444a04aee3c1026bf747 Tested-by: George Joseph --- M include/asterisk/res_pjsip.h M res/res_pjsip.c 2 files changed, 195 insertions(+), 8 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/46/46/1 diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 2358a72..f3bf7b0 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -1260,6 +1260,31 @@ void (*callback)(void *token, pjsip_event *e)); /*! + * \brief General purpose method for sending an Out-Of-Dialog SIP request + * + * This is a companion function for \ref ast_sip_create_request. The request + * created there can be passed to this function, though any request may be + * passed in. + * + * This will automatically set up handling outbound authentication challenges if + * they arrive. + * + * \param tdata The request to send + * \param endpoint Optional. If specified, the out-of-dialog request is sent to the endpoint. + * \param timeout. If non-zero, after the timeout the transaction will be terminated + * and the callback will be called with the PJSIP_EVENT_TIMER type. + * \param token Data to be passed to the callback upon receipt of out-of-dialog response. + * \param callback Callback to be called upon receipt of out-of-dialog response. + * \param p_tsx If non-NULL, the address of the pjsip_transaction will be copied here. + * + * \retval 0 Success + * \retval -1 Failure (out-of-dialog callback will not be called.) + */ +int ast_sip_send_out_of_dialog_request(pjsip_tx_data *tdata, + struct ast_sip_endpoint *endpoint, int timeout, void *token, + void (*callback)(void *token, pjsip_event *e), pjsip_transaction **p_tsx); + +/*! * \brief General purpose method for creating a SIP response * * Its typical use would be to create responses for out of dialog diff --git a/res/res_pjsip.c b/res/res_pjsip.c index fcd8516..a8ec3bd 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -21,6 +21,8 @@ #include /* Needed for SUBSCRIBE, NOTIFY, and PUBLISH method definitions */ #include +#include +#include #include #include "asterisk/res_pjsip.h" @@ -2815,6 +2817,142 @@ /*! Maximum number of challenges before assuming that we are in a loop */ #define MAX_RX_CHALLENGES 10 +#define TIMER_INACTIVE 0 +#define TIMEOUT_TIMER 2 +#define TIMEOUT_TIMER2 5 + +struct tsx_data { +void *token; +void (*cb)(void*, pjsip_event*); + pjsip_transaction *tsx; + pj_timer_entry *timeout_timer; +}; + +static void send_tsx_on_tsx_state(pjsip_transaction *tsx, pjsip_event *event); + +pjsip_module send_tsx_module = { +.name = { "send_tsx_module", 23 }, +.id = -1, +.priority = PJSIP_MOD_PRIORITY_APPLICATION, +.on_tsx_state = &send_tsx_on_tsx_state, +}; + +/*! \brief This is the pjsip_tsx_send_msg callback */ +static void send_tsx_on_tsx_state(pjsip_transaction *tsx, pjsip_event *event) +{ + struct tsx
[asterisk-dev] Change in asterisk[13]: res_pjsip: Add global option to limit the maximum time for i...
George Joseph has uploaded a new patch set (#2). Change subject: res_pjsip: Add global option to limit the maximum time for initial qualifies .. res_pjsip: Add global option to limit the maximum time for initial qualifies Currently when Asterisk starts initial qualifies of contacts are spread out randomly between 0 and qualify_timeout to prevent network and system overload. If a contact's qualify_frequency is 5 minutes however, that contact may be unavailable to accept calls for the entire 5 minutes after startup. So while staggering the initial qualifies is a good idea, basing the time on qualify_timeout could leave contacts unavailable for too long. This patch adds a new global parameter "max_initial_qualify_time" that sets the maximum time for the initial qualifies. This way you could make sure that all your contacts are initialy, ransomly qualified within say 30 seconds but still have the contact's ongoing qualifies at a 5 minute interval. If max_initial_qualify_time is > 0, the formula is initial_interval = min(max_initial_interval, qualify_timeout * random(). If not set, qualify_timeout is used. The default is "0" (disabled). Testing Done: Tested in my own pbx with 15 endpoints. If max_initial_qualify_time is > 0 and < qualify_time, it's used, otherwise qualify_timeout is used. Testsuite test forthcoming. Change-Id: Ib80498aa1ea9923277bef51d6a9015c9c79740f4 Tested-by: George Joseph --- M CHANGES A contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py M include/asterisk/res_pjsip.h M res/res_pjsip.c M res/res_pjsip/config_global.c M res/res_pjsip/pjsip_options.c 6 files changed, 66 insertions(+), 2 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/45/45/2 -- To view, visit https://gerrit.asterisk.org/45 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib80498aa1ea9923277bef51d6a9015c9c79740f4 Gerrit-PatchSet: 2 Gerrit-Project: asterisk Gerrit-Branch: 13 Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[13]: res_pjsip: Add global option to limit the maximum time for i...
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/45 Change subject: res_pjsip: Add global option to limit the maximum time for initial qualifies .. res_pjsip: Add global option to limit the maximum time for initial qualifies Currently when Asterisk starts initial qualifies of contacts are spread out randomly between 0 and qualify_timeout to prevent network and system overload. If a contact's qualify_frequency is 5 minutes however, that contact may be unavailable to accept calls for the entire 5 minutes after startup. So while staggering the initial qualifies is a good idea, basing the time on qualify_timeout could leave contacts unavailable for too long. This patch adds a new global parameter "max_initial_qualify_time" that sets the maximum time for the initial qualifies. This way you could make sure that all your contacts are initialy, ransomly qualified within say 30 seconds but still have the contact's ongoing qualifies at a 5 minute interval. If max_initial_qualify_time is > 0, the formula is initial_interval = min(max_initial_interval, qualify_timeout * random(). If not set, qualify_timeout is used. The default is "0" (disabled). Testing Done: Tested in my own pbx with 15 endpoints. If max_initial_qualify_time is > 0 and < qualify_time, it's used, otherwise qualify_timeout is used. Testsuite test forthcoming. Change-Id: Ib80498aa1ea9923277bef51d6a9015c9c79740f4 Tested-by: George Joseph --- M CHANGES A contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py M include/asterisk/res_pjsip.h M res/res_pjsip.c M res/res_pjsip/config_global.c M res/res_pjsip/pjsip_options.c 6 files changed, 65 insertions(+), 2 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/45/45/1 diff --git a/CHANGES b/CHANGES index 0355d3d..fd7ceb9 100644 --- a/CHANGES +++ b/CHANGES @@ -28,6 +28,10 @@ * A new CLI command has been added: "pjsip show settings", which shows both the global and system configuration settings. + * A new global option has been added: "max_initial_qualify_time", which + sets the The maximum amount of time from startup that qualifies should be + attempted on all contacts. + res_ari_channels -- * Two new events, 'ChannelHold' and 'ChannelUnhold', have been added to the diff --git a/contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py b/contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py new file mode 100644 index 000..3c5f243 --- /dev/null +++ b/contrib/ast-db-manage/config/versions/45119a33fbbe_add_pjsip_max_initial_qualify_time.py @@ -0,0 +1,21 @@ +"""add pjsip max_initial_qualify_time + +Revision ID: 45119a33fbbe +Revises: 2256a84ca226 +Create Date: 2015-04-10 12:29:43.077598 + +""" + +# revision identifiers, used by Alembic. +revision = '45119a33fbbe' +down_revision = '2256a84ca226' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): +op.add_column('ps_globals', sa.Column('max_initial_qualify_time', sa.Integer)) + +def downgrade(): +op.drop_column('ps_globals', 'max_initial_qualify_time') diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 06607cf..c612207 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -1954,4 +1954,12 @@ */ unsigned int ast_sip_get_keep_alive_interval(void); +/*! + * \brief Retrieve the system max initial qualify time. + * + * \retval the maximum initial qualify time. + */ +unsigned int ast_sip_get_max_initial_qualify_time(void); + + #endif /* _RES_PJSIP_H */ diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 93905d6..17280de 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -1208,6 +1208,9 @@ The interval (in seconds) to send keepalives to active connection-oriented transports. + + The maximum amount of time from startup that qualifies should be attempted on all contacts. + Must be of type 'global'. diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c index 2aa1583..42ba234 100644 --- a/res/res_pjsip/config_global.c +++ b/res/res_pjsip/config_global.c @@ -33,6 +33,7 @@ #define DEFAULT_OUTBOUND_ENDPOINT "default_outbound_endpoint" #define DEFAULT_DEBUG "no" #define DEFAULT_ENDPOINT_IDENTIFIER_ORDER "ip,username,anonymous" +#define DEFAULT_MAX_INITIAL_QUALIFY_TIME 0 static char default_useragent[256]; @@ -50,6 +51,8 @@ unsigned int max_forwards; /* The interval at which to send keep alive messages to active connection-oriented transports */ un
[asterisk-dev] Change in asterisk[13]: pjsip_options: Add qualify_timeout processing and eventing
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/44 Change subject: pjsip_options: Add qualify_timeout processing and eventing .. pjsip_options: Add qualify_timeout processing and eventing This is the second follow-on to https://reviewboard.asterisk.org/r/4572/ and the discussion at http://lists.digium.com/pipermail/asterisk-dev/2015-March/073921.html The basic issues are that changes in contact status don't cause events to be emitted for the associated endpoint. Only dynamic contact add/delete actions update the endpoint. Also, the qualify timeout is fixed by pjsip at 32 seconds which is a long time. This patch makes use of the new transaction timeout feature in r4585 and provides the following capabilities... 1. A new aor/contact variable 'qualify_timeout' has been added that allows the user to specify the maximum time in milliseconds to wait for a response to an OPTIONS mesasge. The default is 3000ms. When the timer expires, the contact is marked unavailable. 2. Contact status changes are now propagated up to the endpoint as follows... When any contact is 'Available', the endpoint is marked as 'Reachable'. When all contacts are 'Unavailable', the endpoint is marked as 'Unreachable'. The existing endpoint events are generated appropriately. Testing Done: Existing tests are unchanged. I'm working on new testsuite tests to check the new functionality. Change-Id: Id0ce0528e58014da1324856ea537e7765466044a Tested-by: Dmitriy Serov Tested-by: George Joseph --- M CHANGES M configs/samples/pjsip.conf.sample A contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py M include/asterisk/endpoints.h M include/asterisk/res_pjsip.h M main/endpoints.c M res/res_pjsip.c M res/res_pjsip/location.c M res/res_pjsip/pjsip_configuration.c M res/res_pjsip/pjsip_options.c 10 files changed, 285 insertions(+), 35 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/44/44/1 diff --git a/CHANGES b/CHANGES index 0355d3d..1b2c9c9 100644 --- a/CHANGES +++ b/CHANGES @@ -28,6 +28,14 @@ * A new CLI command has been added: "pjsip show settings", which shows both the global and system configuration settings. + * A new aor option has been added: "qualify_timeout", which sets the timeout + in seconds for a qualify. The default is 3 seconds. This was previously + hard coded to 32 seconds in pjproject. + + * Endpoint status will now change to "Unreachable" when all contacts are + unavailable. When any contact becomes available, the endpoint will status + will change back to "Reachable". + res_ari_channels -- * Two new events, 'ChannelHold' and 'ChannelUnhold', have been added to the diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample index 3def593..6d79691 100644 --- a/configs/samples/pjsip.conf.sample +++ b/configs/samples/pjsip.conf.sample @@ -803,6 +803,7 @@ ; (default: "no") ;type= ; Must be of type aor (default: "") ;qualify_frequency=0; Interval at which to qualify an AoR (default: "0") +;qualify_timeout=3 ; Qualify timeout in seconds (default: "3") ;authenticate_qualify=no; Authenticates a qualify request if needed ; (default: "no") ;outbound_proxy=; Outbound proxy used when sending OPTIONS request diff --git a/contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py b/contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py new file mode 100644 index 000..41f1b3d --- /dev/null +++ b/contrib/ast-db-manage/config/versions/2256a84ca226_add_pjsip_qualify_timeout.py @@ -0,0 +1,44 @@ +# +# Asterisk -- An open source telephony toolkit. +# +# Copyright (C) 2015, Fairview 5 Engineering, LLC +# +# George Joseph +# +# See http://www.asterisk.org for more information about +# the Asterisk project. Please do not directly contact +# any of the maintainers of this project for assistance; +# the project provides a web site, mailing lists and IRC +# channels for your use. +# +# This program is free software, distributed under the terms of +# the GNU General Public License Version 2. See the LICENSE file +# at the top of the source tree. +# + +"""add_pjsip_qualify_timeout + +Revision ID: 2256a84ca226 +Revises: 23530d604b96 +Create Date: 2015-04-03 13:18:18.023787 + +""" + +# revision identifiers, used by Alembic. +revision = '2256a84ca226' +down_revision = '23530d604b96' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): +op.add_column('ps_aors', sa.Column('qualify_timeout', sa.Integer)) +op.add_column('ps_contacts', sa.Column('qualify_timeout', sa.Integer)) +pass + + +def downgrade(): +op.drop_column('ps_aors', 'qualify_timeout') +op.drop_column('ps_contacts', 'qualify_timeout') +pass diff --git a/include/asterisk/endpoints.h b/
[asterisk-dev] Change in asterisk[13]: res_pjsip: Refactor endpt_send_request to include transactio...
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/43 Change subject: res_pjsip: Refactor endpt_send_request to include transaction timeout .. res_pjsip: Refactor endpt_send_request to include transaction timeout This is the first follow-on to https://reviewboard.asterisk.org/r/4572/ and the discussion at http://lists.digium.com/pipermail/asterisk-dev/2015-March/073921.html Since we currently have no control over pjproject transaction timeout, this patch pulls the pjsip_endpt_send_request function out of pjproject and into res_pjsip/endpt_send_transaction in order to implement that capability. Now when the transaction is initiated, we also schedule our own pj_timer with our own desired timeout. If the transaction completes before either timeout, pjproject cancels its timer, and calls our tsx callback where we cancel our timer and run the app callback. If the pjproject timer times out first, pjproject calls our tsx callback where we cancel our timer and run the app callback. If our timer times out first, we terminate the transaction which causes pjproject to cancel its timer and call our tsx callback where we run the app callback. Regardless of the scenario, pjproject is calling the tsx callback inside the group_lock and there are checks in the callback to make sure it doesn't run twice. As part of this patch ast_sip_send_out_of_dialog_request was created to replace its similarly named private function. It takes 2 new arguments... A timeout in milliseconds (<= 0 to disable the timeout) and a ** to a pjsip_transaction structure in case the caller wants to do something else with the transaction. Tested that both of the pjsip timeout and asterisk timeout scenarios work and clean up properly. All pjsip testsuite tests that worked before the change still work after the change. A new testsuite test will be written when the companion pjsip_options work is done. Change-Id: I0778dc730d9689c5147a444a04aee3c1026bf747 Tested-by: George Joseph --- M include/asterisk/res_pjsip.h M res/res_pjsip.c 2 files changed, 195 insertions(+), 8 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/43/43/1 diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 06607cf..1e01735 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -1258,6 +1258,31 @@ void (*callback)(void *token, pjsip_event *e)); /*! + * \brief General purpose method for sending an Out-Of-Dialog SIP request + * + * This is a companion function for \ref ast_sip_create_request. The request + * created there can be passed to this function, though any request may be + * passed in. + * + * This will automatically set up handling outbound authentication challenges if + * they arrive. + * + * \param tdata The request to send + * \param endpoint Optional. If specified, the out-of-dialog request is sent to the endpoint. + * \param timeout. If non-zero, after the timeout the transaction will be terminated + * and the callback will be called with the PJSIP_EVENT_TIMER type. + * \param token Data to be passed to the callback upon receipt of out-of-dialog response. + * \param callback Callback to be called upon receipt of out-of-dialog response. + * \param p_tsx If non-NULL, the address of the pjsip_transaction will be copied here. + * + * \retval 0 Success + * \retval -1 Failure (out-of-dialog callback will not be called.) + */ +int ast_sip_send_out_of_dialog_request(pjsip_tx_data *tdata, + struct ast_sip_endpoint *endpoint, int timeout, void *token, + void (*callback)(void *token, pjsip_event *e), pjsip_transaction **p_tsx); + +/*! * \brief General purpose method for creating a SIP response * * Its typical use would be to create responses for out of dialog diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 93905d6..fb0e66e 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -21,6 +21,8 @@ #include /* Needed for SUBSCRIBE, NOTIFY, and PUBLISH method definitions */ #include +#include +#include #include #include "asterisk/res_pjsip.h" @@ -2809,6 +2811,142 @@ /*! Maximum number of challenges before assuming that we are in a loop */ #define MAX_RX_CHALLENGES 10 +#define TIMER_INACTIVE 0 +#define TIMEOUT_TIMER 2 +#define TIMEOUT_TIMER2 5 + +struct tsx_data { +void *token; +void (*cb)(void*, pjsip_event*); + pjsip_transaction *tsx; + pj_timer_entry *timeout_timer; +}; + +static void send_tsx_on_tsx_state(pjsip_transaction *tsx, pjsip_event *event); + +pjsip_module send_tsx_module = { +.name = { "send_tsx_module", 23 }, +.id = -1, +.priority = PJSIP_MOD_PRIORITY_APPLICATION, +.on_tsx_state = &send_tsx_on_tsx_state, +}; + +/*! \brief This is the pjsip_tsx_send_msg callback */ +static void send_tsx_on_tsx_state(pjsip_transaction *tsx, pjsip_event *event) +{ + struct tsx
[asterisk-dev] Change in asterisk[master]: Add .gitignore and .gitreview files
George Joseph has posted comments on this change. Change subject: Add .gitignore and .gitreview files .. Patch Set 2: > (1 comment) My only issue with this is that it makes it harder to troubleshoot or get an overview of ignores especially if you have a cascading situation. I'm ok with it though so if Matt's ok with it, i'll separate them. -- To view, visit https://gerrit.asterisk.org/42 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 2 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: George Joseph Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-Reviewer: Matt Jordan Gerrit-Reviewer: Russell Bryant Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: Add .gitignore and .gitreview files
George Joseph has uploaded a new patch set (#2). Change subject: Add .gitignore and .gitreview files .. Add .gitignore and .gitreview files Add the .gitignore and .gitreview files to the asterisk repo. NB: You can add local ignores to the .git/info/exclude file without having to do a commit. Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Tested-by: George Joseph --- A .gitignore A .gitreview 2 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/42/42/2 -- To view, visit https://gerrit.asterisk.org/42 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 2 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: George Joseph Gerrit-Reviewer: Corey Farrell Gerrit-Reviewer: Matt Jordan -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in asterisk[master]: Add .gitignore and .gitreview files
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/42 Change subject: Add .gitignore and .gitreview files .. Add .gitignore and .gitreview files Add the .gitignore and .gitreview files to the asterisk repo. NB: You can add local ignores to the .git/info/exclude file without having to do a commit. Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Tested-by: George Joseph --- A .gitignore A .gitreview 2 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/42/42/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..db9aaed --- /dev/null +++ b/.gitignore @@ -0,0 +1,67 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ + +**.[oadi] +**.exports +**.so +**.moduleinfo +**.makeopts +**.makedeps +**/makeopts + +.lastclean +addons/mp3 +agi/eagi-sphinx-test +agi/eagi-test +agi/strcompat.c +build_tools/menuselect-deps +config.log +config.status +defaults.h +doc/core-en_US.xml +include/asterisk/autoconfig.h +include/asterisk/build.h +include/asterisk/buildopts.h +main/ast_expr2.h +main/asterisk +main/libasteriskssl.so.1 +main/version.c +makeopts.embed_rules +menuselect-tree +menuselect/autoconfig.h +menuselect/cmenuselect +menuselect/config.log +menuselect/config.status +menuselect/menuselect +res/ael/ael.output +res/ael/ael.tab.c +res/ael/ael.tab.h +utils/aelbison.c +utils/aelparse +utils/aelparse.c +utils/ast_expr2.c +utils/ast_expr2f.c +utils/astman +utils/astcanary +utils/astdb2bdb +utils/astdb2sqlite3 +utils/check_expr +utils/check_expr2 +utils/conf2ael +utils/db1-ast/libdb1.a +utils/hashtab.c +utils/lock.c +utils/md5.c +utils/muted +utils/pbx_ael.c +utils/pval.c +utils/smsq +utils/stereorize +utils/strcompat.c +utils/streamplayer +utils/threadstorage.c + diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..f9ef050 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.asterisk.org +port=29418 +project=asterisk.git -- To view, visit https://gerrit.asterisk.org/42 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69 Gerrit-PatchSet: 1 Gerrit-Project: asterisk Gerrit-Branch: master Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: tests/channels/pjsip/config_wizard/hints: Add 'has_hint' var...
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/41 Change subject: tests/channels/pjsip/config_wizard/hints: Add 'has_hint' variable .. tests/channels/pjsip/config_wizard/hints: Add 'has_hint' variable The pjsip_wizard.conf file was missing the 'has_hint' variable that actually turns on the hint processing. This was resulting in test failure. Change-Id: I778143aac1666010cb247f6f76d3be6fb64bb901 --- M tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/41/41/1 diff --git a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf index 96b72d8..f9d25e6 100644 --- a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf +++ b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf @@ -8,6 +8,7 @@ inbound_auth/username = testuser inbound_auth/password = testpass endpoint/direct_media = no +has_hint = yes hint_context = default_hints hint_exten = 9090 hint_application = Dial(${HINT}/) -- To view, visit https://gerrit.asterisk.org/41 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I778143aac1666010cb247f6f76d3be6fb64bb901 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Testsuite: Test for res_pjsip_config_wizard auto-create hints
George Joseph has uploaded a new patch set (#2). Change subject: Testsuite: Test for res_pjsip_config_wizard auto-create hints .. Testsuite: Test for res_pjsip_config_wizard auto-create hints This test uses ListDialPlan to check that if the hint_ parameters are added to a config wizard, the hints are properly created. Change-Id: I65edbb67fd2ae7008832db87365229bb2ab55eb6 --- A tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf A tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf A tests/channels/pjsip/config_wizard/hints/test-config.yaml M tests/channels/pjsip/config_wizard/tests.yaml 4 files changed, 83 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/10/10/2 -- To view, visit https://gerrit.asterisk.org/10 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I65edbb67fd2ae7008832db87365229bb2ab55eb6 Gerrit-PatchSet: 2 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: George Joseph Gerrit-Reviewer: Matt Jordan -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Fixes related to testsuite GIT migration.
George Joseph has posted comments on this change. Change subject: Fixes related to testsuite GIT migration. .. Patch Set 1: Code-Review+1 Looks good to me although I really just wanted to test the Reply function. :) -- To view, visit https://gerrit.asterisk.org/11 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic67a6b4e3c55fd297a70fdbdf7c0aa7737c7aeb6 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: Corey Farrell Gerrit-Reviewer: George Joseph Gerrit-HasComments: No -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
[asterisk-dev] Change in testsuite[master]: Testsuite: Test for res_pjsip_config_wizard auto-create hints
George Joseph has uploaded a new change for review. https://gerrit.asterisk.org/10 Change subject: Testsuite: Test for res_pjsip_config_wizard auto-create hints .. Testsuite: Test for res_pjsip_config_wizard auto-create hints Change-Id: I65edbb67fd2ae7008832db87365229bb2ab55eb6 --- A tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf A tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf A tests/channels/pjsip/config_wizard/hints/test-config.yaml M tests/channels/pjsip/config_wizard/tests.yaml 4 files changed, 83 insertions(+), 0 deletions(-) git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/10/10/1 diff --git a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf new file mode 100644 index 000..3ab72e2 --- /dev/null +++ b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip.conf @@ -0,0 +1,5 @@ +[ipv4] +type=transport +protocol=udp +bind=0.0.0.0 + diff --git a/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf new file mode 100644 index 000..96b72d8 --- /dev/null +++ b/tests/channels/pjsip/config_wizard/hints/configs/ast1/pjsip_wizard.conf @@ -0,0 +1,14 @@ +[phone1] +type = wizard +accepts_auth = yes +accepts_registrations = yes +transport = ipv4 +endpoint/from_domain = test_domain +aor/max_contacts = 7 +inbound_auth/username = testuser +inbound_auth/password = testpass +endpoint/direct_media = no +hint_context = default_hints +hint_exten = 9090 +hint_application = Dial(${HINT}/) + diff --git a/tests/channels/pjsip/config_wizard/hints/test-config.yaml b/tests/channels/pjsip/config_wizard/hints/test-config.yaml new file mode 100644 index 000..7c76cba --- /dev/null +++ b/tests/channels/pjsip/config_wizard/hints/test-config.yaml @@ -0,0 +1,63 @@ +testinfo: +summary: 'Test PJSIP Config Wizard Phone Hints' +description: | +Tests the PJSIP Config Wizard to make sure the +hints are properly created. + +properties: +minversion: '13.3.0' +dependencies: +- asterisk : 'res_pjsip' +- asterisk : 'res_pjsip_config_wizard' + +tags: +- pjsip + +test-modules: +# allow test_runner to find and run the local test +add-test-to-search-path: 'True' +add-relative-to-search-path: ['../'] +test-object: +config-section: object-config +typename: 'AMISendTest.AMISendTest' +modules: +- +config-section: 'ami-config' +typename: 'ami.AMIEventModule' + +object-config: +reactor-timeout: 15 +ACTION: { "Action": "ShowDialPlan", "ActionID": "12345", "Context": "default_hints", "Extension": "9090" } + +ami-config: +- +type: 'headermatch' +conditions: +match: +Event: 'ListDialplan' +Priority: 'hint' +requirements: +match: +ActionID: '12345' +Context: 'default_hints' +Extension: '9090' +Priority: 'hint' +Application: 'PJSIP/phone1' +Registrar: 'res_pjsip_config_wizard' +count: 1 +- +type: 'headermatch' +conditions: +match: +Event: 'ListDialplan' +Priority: '1' +requirements: +match: +ActionID: '12345' +Context: 'default_hints' +Extension: '9090' +Priority: '1' +Application: 'Dial' +AppData: '\${HINT}/' +Registrar: 'res_pjsip_config_wizard' +count: 1 diff --git a/tests/channels/pjsip/config_wizard/tests.yaml b/tests/channels/pjsip/config_wizard/tests.yaml index 8677e64..188afd5 100644 --- a/tests/channels/pjsip/config_wizard/tests.yaml +++ b/tests/channels/pjsip/config_wizard/tests.yaml @@ -1,5 +1,6 @@ # Enter tests here in the order they should be considered for execution: tests: - test: 'phone' +- test: 'hints' - test: 'trunk' - test: 'registration' -- To view, visit https://gerrit.asterisk.org/10 To unsubscribe, visit https://gerrit.asterisk.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65edbb67fd2ae7008832db87365229bb2ab55eb6 Gerrit-PatchSet: 1 Gerrit-Project: testsuite Gerrit-Branch: master Gerrit-Owner: George Joseph -- _ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev