aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDr Scofield2008-05-20 16:51:45 +0000
committerDr Scofield2008-05-20 16:51:45 +0000
commita53cea6b7e4094ea51339c80ab5fe160a19a9f6b (patch)
tree7294600ad7bbec50ff34e35b1c46a380d2d7d549 /OpenSim/Region
parentFrom: Jeremy Bongio <jbongio@us.ibm.com> (diff)
downloadopensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.zip
opensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.tar.gz
opensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.tar.bz2
opensim-SC_OLD-a53cea6b7e4094ea51339c80ab5fe160a19a9f6b.tar.xz
i'm extending the RestStreamHandler.Handler(...) signature to actually
provide OSHttpRequest and OSHttpResponse to our REST handler. also, this adds proper RestPlugin.IsGod() checking against the X-OpenSim-Godkey HTTP request header. last, i added XML doc comments to RestPlugin.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs6
3 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index abf2c1a..6ecae06 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -72,7 +72,8 @@ namespace OpenSim.Region.DataSnapshot
72 new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); 72 new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt));
73 } 73 }
74 74
75 public string OnDiscoveryAttempt(string request, string path, string param) 75 public string OnDiscoveryAttempt(string request, string path, string param,
76 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
76 { 77 {
77 //Very static for now, flexible enough to add new formats 78 //Very static for now, flexible enough to add new formats
78 LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse(); 79 LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse();
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index f8651a3..2e8a8da 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
@@ -131,14 +131,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice
131 string capsBase = "/CAPS/" + caps.CapsObjectPath; 131 string capsBase = "/CAPS/" + caps.CapsObjectPath;
132 caps.RegisterHandler("ParcelVoiceInfoRequest", 132 caps.RegisterHandler("ParcelVoiceInfoRequest",
133 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, 133 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
134 delegate(string request, string path, string param) 134 delegate(string request, string path, string param,
135 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
135 { 136 {
136 return ParcelVoiceInfoRequest(request, path, param, 137 return ParcelVoiceInfoRequest(request, path, param,
137 agentID, caps); 138 agentID, caps);
138 })); 139 }));
139 caps.RegisterHandler("ProvisionVoiceAccountRequest", 140 caps.RegisterHandler("ProvisionVoiceAccountRequest",
140 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, 141 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
141 delegate(string request, string path, string param) 142 delegate(string request, string path, string param,
143 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
142 { 144 {
143 return ProvisionVoiceAccountRequest(request, path, param, 145 return ProvisionVoiceAccountRequest(request, path, param,
144 agentID, caps); 146 agentID, caps);
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
index feb716e..77f761f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
@@ -104,14 +104,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice
104 string capsBase = "/CAPS/" + caps.CapsObjectPath; 104 string capsBase = "/CAPS/" + caps.CapsObjectPath;
105 caps.RegisterHandler("ParcelVoiceInfoRequest", 105 caps.RegisterHandler("ParcelVoiceInfoRequest",
106 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, 106 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
107 delegate(string request, string path, string param) 107 delegate(string request, string path, string param,
108 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
108 { 109 {
109 return ParcelVoiceInfoRequest(request, path, param, 110 return ParcelVoiceInfoRequest(request, path, param,
110 agentID, caps); 111 agentID, caps);
111 })); 112 }));
112 caps.RegisterHandler("ProvisionVoiceAccountRequest", 113 caps.RegisterHandler("ProvisionVoiceAccountRequest",
113 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, 114 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
114 delegate(string request, string path, string param) 115 delegate(string request, string path, string param,
116 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
115 { 117 {
116 return ProvisionVoiceAccountRequest(request, path, param, 118 return ProvisionVoiceAccountRequest(request, path, param,
117 agentID, caps); 119 agentID, caps);