aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-10 12:48:50 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-10 12:48:50 +0000
commit5262d4ab16e0eec7e84d2ec9eb673294e564fc11 (patch)
tree6628d8e6cf74abb51f1267effcf152b32c7401ba /doc
parent497b8c298c1e4cf660802aa4c4644c44bc1e024f (diff)
Merge another change from team/russell/events ...
DUNDi uses a concept called the Entity ID for unique server identifiers. I have pulled out the handling of EIDs and made it something available to all of Asterisk. There is now a global Entity ID that can be used for other purposes as well, such as code providing distributed device state, which is why I did this. The global Entity ID is set automatically, just like it was done in DUNDi, but it can also be set in asterisk.conf. DUNDi will now use this global EID unless one is specified in dundi.conf. The current EID for the system can be seen in the "core show settings" CLI command. It is also available in the dialplan via the ENTITYID variable. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121439 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'doc')
-rw-r--r--doc/tex/asterisk-conf.tex5
-rw-r--r--doc/tex/channelvariables.tex1
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/tex/asterisk-conf.tex b/doc/tex/asterisk-conf.tex
index e25bc996f..f39d4dc05 100644
--- a/doc/tex/asterisk-conf.tex
+++ b/doc/tex/asterisk-conf.tex
@@ -124,6 +124,11 @@ languageprefix = yes | no
; eh. on SMB/CIFS mounts
lockmode = lockfile | flock
+; Entity ID. This is in the form of a MAC address. It should be universally
+; unique. It must be unique between servers communicating with a protocol
+; that uses this value. The only thing that uses this currently is DUNDi,
+; but other things will use it in the future.
+; entityid=00:11:22:33:44:55
[files]
; Changing the following lines may compromise your security
diff --git a/doc/tex/channelvariables.tex b/doc/tex/channelvariables.tex
index 1c3220159..ae5b1974b 100644
--- a/doc/tex/channelvariables.tex
+++ b/doc/tex/channelvariables.tex
@@ -795,6 +795,7 @@ ${TRANSFER_CONTEXT} Context for transferred calls
${FORWARD_CONTEXT} Context for forwarded calls
${UNIQUEID} * Current call unique identifier
${SYSTEMNAME} * value of the systemname option of asterisk.conf
+${ENTITYID} * Global Entity ID set automatically, or from asterisk.conf
\end{verbatim}
\subsection{Application return values}