From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 11 Jan 2009 04:23:43 +0000 (+0000)
Subject: applications/luci-asterisk:
X-Git-Tag: 0.9.0~812
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=20988a0f187eccda0edfb498cd04eb97e2349fd6

applications/luci-asterisk:
	- make nat handling configurable for sip trunks
	- display actual reason when trunk is offline
---

diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
index ca29471384..1337602e42 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunk_sip.lua
@@ -34,6 +34,10 @@ if arg[1] then
 	sipport   = peer:option(Value, "port", "SIP Port")
 	sipport.default = 5060
 
+	sipnat    = peer:option(Flag, "nat", "NAT between this device and provider")
+	sipnat.enabled  = "yes"
+	sipnat.disabled = "no"
+
 	username  = peer:option(Value, "username", "Authorization ID")
 	password  = peer:option(Value, "secret", "Authorization Password")
 	password.password = true
@@ -96,7 +100,8 @@ else
 		if sip_peers[s].info.online == nil then
 			return "n/a"
 		else
-			return sip_peers[s].info.online and "yes" or "no"
+			return sip_peers[s].info.online
+				and "yes" or "no (%s)" % sip_peers[s].info.Status:lower()
 		end
 	end
 
diff --git a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua b/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
index b9dd1dfd8d..af992989c4 100644
--- a/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
+++ b/applications/luci-asterisk/luasrc/model/cbi/asterisk/trunks.lua
@@ -57,7 +57,8 @@ function online.cfgvalue(self, s)
 	if sip_peers[s].info.online == nil then
 		return "n/a"
 	else
-		return sip_peers[s].info.online and "yes" or "no"
+		return sip_peers[s].info.online
+			and "yes" or "no (%s)" % sip_peers[s].info.Status:lower()
 	end
 end