Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asterisk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Voice
asterisk
Commits
07189ee2
Commit
07189ee2
authored
9 years ago
by
Joshua Colp
Committed by
Gerrit Code Review
9 years ago
Browse files
Options
Downloads
Plain Diff
Merge "func_callerid: Document that CALLERID(pres) is available." into 13
parents
84103366
6d1bdb9d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGES
+10
-0
10 additions, 0 deletions
CHANGES
funcs/func_callerid.c
+23
-16
23 additions, 16 deletions
funcs/func_callerid.c
with
33 additions
and
16 deletions
CHANGES
+
10
−
0
View file @
07189ee2
...
@@ -39,6 +39,16 @@ res_pjsip
...
@@ -39,6 +39,16 @@ res_pjsip
* The ability to use "like" has been added to the pjsip list and show
* The ability to use "like" has been added to the pjsip list and show
CLI commands. For instance: CLI> pjsip list endpoints like abc
CLI commands. For instance: CLI> pjsip list endpoints like abc
func_callerid
-------------------
* CALLERID(pres) is now documented as a valid alternative to setting both
CALLERID(name-pres) and CALLERID(num-pres) at once. Some channel drivers,
like chan_sip, don't make a distinction between the two: they take the
least public value from name-pres and num-pres. By using CALLERID(pres)
for reading and writing, you touch the same combined value in the dialplan.
The same applies to CONNECTEDLINE(pres), REDIRECTING(orig-pres),
REDIRECTING(to-pres) and REDIRECTING(from-pres).
------------------------------------------------------------------------------
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 13.5.0 to Asterisk 13.6.0 ------------
--- Functionality changes from Asterisk 13.5.0 to Asterisk 13.6.0 ------------
------------------------------------------------------------------------------
------------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
funcs/func_callerid.c
+
23
−
16
View file @
07189ee2
...
@@ -40,10 +40,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -40,10 +40,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include
"asterisk/callerid.h"
#include
"asterisk/callerid.h"
/*
/*
* Do not document the CALLERID(pres) datatype.
* The CALLERID(pres) datatype is shorthand for getting/setting the
* The name and number now have their own presentation value. The pres
* combined value of name-pres and num-pres. Some channel drivers
* option will simply live on as a historical relic with as best
* don't make a distinction, so it makes sense to only use one property
* as can be managed backward compatible meaning.
* to get/set it. The same applies to CONNECTEDLINE(pres),
* REDIRECTING(orig-pres), REDIRECTING(from-pres) and REDIRECTING(to-pres).
*
*
* Do not document the CALLERID(ton) datatype.
* Do not document the CALLERID(ton) datatype.
* It is an alias for num-plan.
* It is an alias for num-plan.
...
@@ -55,11 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -55,11 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* It has turned out to not be needed. The source value is really
* It has turned out to not be needed. The source value is really
* only useful as a possible tracing aid.
* only useful as a possible tracing aid.
*
*
* Do not document the CONNECTEDLINE(pres) datatype.
* The name and number now have their own presentation value. The pres
* option will simply live on as a historical relic with as best
* as can be managed backward compatible meaning.
*
* Do not document the CONNECTEDLINE(ton) datatype.
* Do not document the CONNECTEDLINE(ton) datatype.
* It is an alias for num-plan.
* It is an alias for num-plan.
*
*
...
@@ -69,12 +65,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -69,12 +65,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* they are active at the same time. The plain pres option will simply
* they are active at the same time. The plain pres option will simply
* live on as a historical relic.
* live on as a historical relic.
*
*
* Do not document the REDIRECTING(orig-pres), REDIRECTING(from-pres),
* or REDIRECTING(to-pres) datatypes.
* The name and number now have their own presentation value. The orig-pres,
* from-pres, and to-pres options will simply live on as a historical relic
* with as best as can be managed backward compatible meaning.
*
* Do not document the REDIRECTING(orig-ton), REDIRECTING(from-ton),
* Do not document the REDIRECTING(orig-ton), REDIRECTING(from-ton),
* or REDIRECTING(to-ton) datatypes.
* or REDIRECTING(to-ton) datatypes.
* They are aliases for orig-num-plan, from-num-plan, and to-num-plan
* They are aliases for orig-num-plan, from-num-plan, and to-num-plan
...
@@ -98,6 +88,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -98,6 +88,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<enum name = "num-valid" />
<enum name = "num-valid" />
<enum name = "num-plan" />
<enum name = "num-plan" />
<enum name = "num-pres" />
<enum name = "num-pres" />
<enum name = "pres" />
<enum name = "subaddr" />
<enum name = "subaddr" />
<enum name = "subaddr-valid" />
<enum name = "subaddr-valid" />
<enum name = "subaddr-type" />
<enum name = "subaddr-type" />
...
@@ -144,6 +135,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -144,6 +135,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<description>
<description>
<para>Gets or sets Caller*ID data on the channel. Uses channel callerid by
<para>Gets or sets Caller*ID data on the channel. Uses channel callerid by
default or optional callerid, if specified.</para>
default or optional callerid, if specified.</para>
<para>The <replaceable>pres</replaceable> field gets/sets a combined value
for <replaceable>name-pres</replaceable> and
<replaceable>num-pres</replaceable>.</para>
<para>The allowable values for the <replaceable>name-charset</replaceable>
<para>The allowable values for the <replaceable>name-charset</replaceable>
field are the following:</para>
field are the following:</para>
<enumlist>
<enumlist>
...
@@ -168,7 +162,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -168,7 +162,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<description>
<description>
<para>Gets or sets Caller*ID presentation on the channel.
<para>Gets or sets Caller*ID presentation on the channel.
This function is deprecated in favor of CALLERID(num-pres)
This function is deprecated in favor of CALLERID(num-pres)
and CALLERID(name-pres).
and CALLERID(name-pres) or CALLERID(pres) to get/set both
at once.
The following values are valid:</para>
The following values are valid:</para>
<enumlist>
<enumlist>
<enum name="allowed_not_screened">
<enum name="allowed_not_screened">
...
@@ -218,6 +213,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -218,6 +213,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<enum name = "num-valid" />
<enum name = "num-valid" />
<enum name = "num-plan" />
<enum name = "num-plan" />
<enum name = "num-pres" />
<enum name = "num-pres" />
<enum name = "pres" />
<enum name = "subaddr" />
<enum name = "subaddr" />
<enum name = "subaddr-valid" />
<enum name = "subaddr-valid" />
<enum name = "subaddr-type" />
<enum name = "subaddr-type" />
...
@@ -246,6 +242,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -246,6 +242,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</syntax>
</syntax>
<description>
<description>
<para>Gets or sets Connected Line data on the channel.</para>
<para>Gets or sets Connected Line data on the channel.</para>
<para>The <replaceable>pres</replaceable> field gets/sets a combined value
for <replaceable>name-pres</replaceable> and
<replaceable>num-pres</replaceable>.</para>
<para>The allowable values for the <replaceable>name-charset</replaceable>
<para>The allowable values for the <replaceable>name-charset</replaceable>
field are the following:</para>
field are the following:</para>
<enumlist>
<enumlist>
...
@@ -279,6 +278,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -279,6 +278,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<enum name = "orig-num-valid" />
<enum name = "orig-num-valid" />
<enum name = "orig-num-plan" />
<enum name = "orig-num-plan" />
<enum name = "orig-num-pres" />
<enum name = "orig-num-pres" />
<enum name = "orig-pres" />
<enum name = "orig-subaddr" />
<enum name = "orig-subaddr" />
<enum name = "orig-subaddr-valid" />
<enum name = "orig-subaddr-valid" />
<enum name = "orig-subaddr-type" />
<enum name = "orig-subaddr-type" />
...
@@ -294,6 +294,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -294,6 +294,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<enum name = "from-num-valid" />
<enum name = "from-num-valid" />
<enum name = "from-num-plan" />
<enum name = "from-num-plan" />
<enum name = "from-num-pres" />
<enum name = "from-num-pres" />
<enum name = "from-pres" />
<enum name = "from-subaddr" />
<enum name = "from-subaddr" />
<enum name = "from-subaddr-valid" />
<enum name = "from-subaddr-valid" />
<enum name = "from-subaddr-type" />
<enum name = "from-subaddr-type" />
...
@@ -308,6 +309,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -308,6 +309,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<enum name = "to-num-valid" />
<enum name = "to-num-valid" />
<enum name = "to-num-plan" />
<enum name = "to-num-plan" />
<enum name = "to-num-pres" />
<enum name = "to-num-pres" />
<enum name = "to-pres" />
<enum name = "to-subaddr" />
<enum name = "to-subaddr" />
<enum name = "to-subaddr-valid" />
<enum name = "to-subaddr-valid" />
<enum name = "to-subaddr-type" />
<enum name = "to-subaddr-type" />
...
@@ -366,6 +368,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
...
@@ -366,6 +368,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</syntax>
</syntax>
<description>
<description>
<para>Gets or sets Redirecting data on the channel.</para>
<para>Gets or sets Redirecting data on the channel.</para>
<para>The <replaceable>orig-pres</replaceable>,
<replaceable>from-pres</replaceable> and <replaceable>to-pres</replaceable>
fields get/set a combined value for the corresponding
<replaceable>...-name-pres</replaceable> and <replaceable>...-num-pres</replaceable>
fields.</para>
<para>The allowable values for the <replaceable>reason</replaceable>
<para>The allowable values for the <replaceable>reason</replaceable>
and <replaceable>orig-reason</replaceable> fields are the following:</para>
and <replaceable>orig-reason</replaceable> fields are the following:</para>
<enumlist>
<enumlist>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment