aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-11 21:39:37 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-11 21:39:37 +0000
commit59f0ada67ef1d82903474682b7289fd8aa2bdac5 (patch)
tree2a503775a6717a9c1b9270c38ee5bce7afcac39b /configs
parent3a2d627768e3e67e7cbf4a786d2ccb7ee3574421 (diff)
Merged revisions 291192 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r291192 | dvossel | 2010-10-11 16:38:39 -0500 (Mon, 11 Oct 2010) | 19 lines Gtalk enhancements and general code cleanup. This patch includes several chan_gtalk enhancements. Two new gtalk.conf options have been added, externip and stunadd. Setting externip allows us to manually specify what the external IP address is outside of a NAT environment. Setting the stunaddr option to a valid stun server allows for that external ip to be retrieved via a STUN server automatically. This external IP is then advertised during call setup as a possible candidate. I have also attempted to clean up chan_gtalk's code so it meets our coding guidelines. During this cleanup I noticed several things that need to be done in the code and made a TODO section at the top of the file. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@291193 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/gtalk.conf.sample23
1 files changed, 14 insertions, 9 deletions
diff --git a/configs/gtalk.conf.sample b/configs/gtalk.conf.sample
index 8873d0678..6b91c8f04 100644
--- a/configs/gtalk.conf.sample
+++ b/configs/gtalk.conf.sample
@@ -1,20 +1,25 @@
;[general]
-;context=default ;;Context to dump call into
-;bindaddr=0.0.0.0 ;;Address to bind to
-;allowguest=yes ;;Allow calls from people not in
- ;;list of peers
+;context=default ;Context to dump call into
+;bindaddr=0.0.0.0 ;Address to bind to
+;externip=127.0.0.1 ;Set your external ip if you are behind a NAT.
+
+;stunaddr=mystunserver.com ; Get your external ip from a STUN server.
+ ; Note, if the STUN query is successful, this will
+ ; replace any value placed in externip;
+;allowguest=yes ;Allow calls from people not in
+ ;list of peers
;
-;[guest] ;;special account for options on guest account
+;[guest] ;special account for options on guest account
;disallow=all
;allow=ulaw
;context=guest
;
;[ogorman]
-;username=ogorman@gmail.com ;;username of the peer your
- ;;calling or accepting calls from
+;username=ogorman@gmail.com ;username of the peer your
+ ;calling or accepting calls from
;disallow=all
;allow=ulaw
;context=default
-;connection=asterisk ;;client or component in jabber.conf
- ;;for the call to leave on.
+;connection=asterisk ;client or component in jabber.conf
+ ;for the call to leave on.
;