UbitUmarov
a7db505caf
stupid mono5 doesn't know about Subject Alternative Name IPAddress
2017-05-27 12:38:31 +01:00
UbitUmarov
117e6ec266
fix wrong cert ip compare
2017-05-27 08:30:12 +01:00
UbitUmarov
582dc75381
remove a accent from a method name
2017-05-27 06:30:23 +01:00
UbitUmarov
2777995331
Merge branch 'master' into httptests
2017-05-25 10:23:52 +01:00
UbitUmarov
772c5b7db0
move assetsconnector threads to whatchdog; Abort all alive threads known to watchdog before exit
2017-05-25 06:05:02 +01:00
UbitUmarov
b6c23fe911
make a few more threads background ones
2017-05-25 02:01:36 +01:00
UbitUmarov
dca3a45803
add a bit more pre exit cleanup
2017-05-24 22:17:04 +01:00
UbitUmarov
c0bfaac0ac
merge master
2017-05-23 07:35:02 +01:00
UbitUmarov
f3eb73926e
stop a few more threads on exit
2017-05-23 04:05:31 +01:00
UbitUmarov
928733efc9
please DIE! PLEASE??
2017-05-23 03:26:32 +01:00
UbitUmarov
fcb435deb4
make sure we drop requests if DoHTTPGruntWork fails
2017-05-22 05:53:59 +01:00
UbitUmarov
0320225ca8
reenqueue poll events while conn is open, and not expired
2017-05-21 07:02:35 +01:00
UbitUmarov
e520dba717
Merge branch 'master' into httptests
2017-05-21 02:20:40 +01:00
UbitUmarov
a2c2456076
remove LongPoll type and queues. Events should now have reduced latency also. About previus commit, it maybe a modified ingen-e3s-v1.33 script that is broken, and not the original version, can't tell
2017-05-21 02:11:53 +01:00
UbitUmarov
6c79cc652b
some conditional dispose on http requests inputstream
2017-05-08 00:54:17 +01:00
UbitUmarov
604b966d84
some conditional dispose on http requests inputstream
2017-05-08 00:40:15 +01:00
UbitUmarov
11f6d28a06
fix merge
2017-05-07 04:21:33 +01:00
UbitUmarov
d0912b6151
let StreamReader be in using statements
2017-05-07 00:47:45 +01:00
UbitUmarov
832ca518d7
fix merge
2017-05-03 03:52:55 +01:00
UbitUmarov
1b8c71c965
give more information on Fatal Error during region startup
2017-04-26 16:15:33 +01:00
UbitUmarov
a680d8b8d7
fix merge
2017-04-25 17:59:53 +01:00
Melanie Thielker
adcb1d8798
Allow setting the stats log file location in OpenSim.ini rather than app.exe.config
2017-03-31 14:38:41 +01:00
UbitUmarov
254b26a7d5
fix merge
2017-01-05 19:32:57 +00:00
Melanie Thielker
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
UbitUmarov
5fc3605955
some cleanup, use more using(), more checks so http request mem stream is closed
2016-12-30 07:15:28 +00:00
UbitUmarov
8114ff9d06
Merge branch 'master' into httptests
2016-12-09 04:50:07 +00:00
UbitUmarov
30dccd57cd
provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can be detected/parsed. This is used by some external modules like DTLNSLMoneyServer. But this module does need to change on this ( and it cannot override default validation rules, it needs to do it on its httplistener with method provided in previus commits
2016-12-09 04:32:59 +00:00
UbitUmarov
6627da693e
suport client certificate validation per listenner, with a supplied static callback
2016-12-09 04:07:06 +00:00
UbitUmarov
18ff3eb227
JsonRpc: don't try to connect to a empty uri
2016-12-08 23:56:14 +00:00
UbitUmarov
806e75eefb
remove not needed sslport parameter
2016-12-08 23:39:55 +00:00
UbitUmarov
3a81642d97
add SSL certs validation options for regions to allow simple encriptation without any peer autentification using simple homemade (or even shared) certs.
2016-12-07 13:30:07 +00:00
UbitUmarov
80d4f76d18
keep a unsecure http port up for external services (datasnapshot search). Only fire poolservices on main http listener
2016-10-09 20:18:20 +01:00
UbitUmarov
5b946405a0
changes to regions ssl suport: verify if hostnames are validate by the selected cert, make clear that for now all regions need to have the same ExternalHostName if using sll (due to other code that needs to be changed later)
2016-10-09 01:01:52 +01:00
UbitUmarov
b51739e23e
recover regions main http server ssl suport. Using a PKCS12 cert file, and not certs store for now. Option http_listener_cn, cert CN need to the same as external IP. Self sign certs do seem to work, but the viewers option NoVerifySLLCert needs to be set true. CA check is not done but they do check the IP
2016-10-06 21:35:11 +01:00
UbitUmarov
4f9378bf97
remove reuse context code, they had notthing worth using and on original code when reusing contexts still in use, etc. Change DLL information to make clear it is a opensim fork, so our responsability not original author
2016-09-03 08:50:22 +01:00
UbitUmarov
9aec227767
Merge branch 'master' into httptests
2016-09-03 07:51:53 +01:00
UbitUmarov
35cc0420c8
fix a use of string Trim()
2016-08-24 00:20:45 +01:00
UbitUmarov
0f4d54b8b2
put back the dangerous resp.ReuseContext = true option, that for some odd reason OSgrid nginx configuration seems to need
2016-08-21 20:52:31 +01:00
UbitUmarov
376084a2e5
Merge branch 'master' into httptests
2016-07-27 23:39:50 +01:00
UbitUmarov
01289b9c2d
first step removing MegaRegions: refuse to run. Thanks to all that made MegaRegions possible, they where a important OpenSim feature, but can no longer be mantained
2016-07-27 23:13:24 +01:00
UbitUmarov
442b272228
add a Drop method to PollService Event handlers, Drop requests on connections known to be lost or delay event check if they are sending a response
2016-07-17 13:20:56 +01:00
UbitUmarov
6a02ac634b
identify contexts by ID now avaiable ( pipeline serialization)
2016-07-17 11:39:38 +01:00
UbitUmarov
f636ef037a
http send is blocking, so we need we need to do it async in all cases. - this will need revision after server changes
2016-07-16 20:23:30 +01:00
UbitUmarov
c9bd6ff94b
disable OSHttpTests that will collide with testing new http server changes
2016-07-15 15:54:54 +01:00
Diva Canto
e0a82a82de
"reverting" the keep alive changes brought in from avination, to check if that's what's making osgrid fail. This is not really reverting, it's more manually resetting some places (not all) where keep alive is set.
2016-06-14 08:58:37 -07:00
Diva Canto
ab12a14279
Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.
2016-02-21 11:14:02 -08:00
UbitUmarov
4ad7160e05
minor cleanup
2015-12-09 17:20:51 +00:00
UbitUmarov
72684592ba
Merge branch 'master' into avinationmerge
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
Melanie Thielker
dc6d9eadf3
Testing stage of the new versioning system. Use at own risk. May not
...
work. Will eat your babies. Yada. Yada.
2015-10-31 00:01:35 +01:00
Diva Canto
59b63b6406
On to 0.8.3!
...
Conflicts:
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
Diva Canto
06d2508b96
On to 0.8.3!
2015-10-18 21:47:10 -07:00
Diva Canto
7ab633461e
Fixed merge conflicts
...
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2015-10-18 16:24:33 -07:00
Diva Canto
70a46fe090
Clean up of simulation version, the number that rules the compatibility of teleports:
...
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
2015-10-18 16:06:31 -07:00
UbitUmarov
e441c9cac1
dont let http keepalive and context reuse be true
2015-09-23 23:59:50 +01:00
UbitUmarov
c7b1d52e29
remove duplicated and breaking code
2015-09-21 17:59:44 +01:00
Melanie Thielker
f24414c063
Remove the last proprietary copyright headers, insert BSD ones.
2015-09-13 21:03:38 +02:00
UbitUmarov
cdaed11387
at last we can login and see objects ( friends is dead and disable in
...
scenepresence)
2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
UbitUmarov
48ef22f62e
change pollService stop() to send 503 error and no keepalive. ( untested )
2015-08-18 23:59:55 +01:00
UbitUmarov
05d72f77ff
do keepalive on mesh and texture GET. Dont use reusecontext any where.
...
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
2015-08-18 21:32:03 +01:00
UbitUmarov
2cac56340a
try to serialize http requests from same connection, so they are processed
...
in order. ( next commits will be about necessary keepAlive changes needed)
2015-08-18 21:03:34 +01:00
Justin Clark-Casey (justincc)
d52f58a733
Disable the "show threadpool calls active" console command for now.
...
Whilst this can be very useful to identify threads held too long by incoming packet processing,
it can also be very misleading as the count updates are not atomic (race conditions lead to growth in numbers over time).
This could be solved by making the counts volatile but I don't currently have time to assess the performance impact, though it's almost certainly negligible.
If anybody else wants to do that and re-enable this command then please feel free.
2015-05-12 19:54:25 +01:00
Diva Canto
da32512ea4
Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*")
2015-04-29 18:47:17 -07:00
Justin Clark-Casey (justincc)
3255335c42
Make private services forbid llHTTPRequest() calls by rejecting those that have the X-SecondLife-Shard header.
...
If you need to enable this, set AllowHttpRequestIn = true in [Network] for all private services or individual [*Service] sections.
2015-03-04 18:27:51 +00:00
Freaky Tech
f68a1a2218
XML should not contain any BOM. Disabled BOM generation in BaseHttpServer
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 15:35:09 -05:00
Justin Clark-Casey (justincc)
24ef043395
Make failures in PollServiceHttpRequest.DoHTTPGruntWork() actually log the exception on error
2015-01-19 23:52:34 +00:00
Diva Canto
7466ef0525
This cleans up versioning. Specifically:
...
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
2014-12-30 12:53:31 -08:00
Justin Clark-Casey (justincc)
86367d7219
refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class.
...
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
2014-11-25 23:56:32 +00:00
Justin Clark-Casey (justincc)
f54c70741b
Add "show threadpool calls active" console debug command.
...
This shows named threadpool calls (excluding timer and network calls) that are currently queued or running.
Also shows total of labelled and any anonymous calls.
2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
ec8d21c434
Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis.
...
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
72cb1cc7d6
Add "show threadpool calls" command to show count of all labelled smartthreadpool calls
2014-11-25 23:23:10 +00:00
UbitUmarov
fd79f75ba6
TEST**** wingridproxy detection at grid login. Untested possible not
...
very reliable. Adds some load even on region servers because of code at
BaseHttpServer.
2014-10-24 02:12:30 +01:00
UbitUmarov
cd87c4bec5
change/fix previus commits
2014-10-13 12:00:31 +01:00
UbitUmarov
8558e97a44
tune poll smartThreadpool use and give it a name
2014-10-13 11:38:51 +01:00
BlueWall
96a2449122
Undo "Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.""
...
Fix for break in next commit
This reverts commit 376fab1402
.
2014-09-17 20:03:54 -04:00
BlueWall
376fab1402
Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects."
...
This reverts commit af286d5fcb
.
Issue with Jenkins builds
2014-09-17 18:11:41 -04:00
BlueWall
af286d5fcb
Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.
2014-09-17 17:56:10 -04:00
Melanie Thielker
ddfb05e57a
Comment out stupid XEngine-bound message about script vs non-script startup, it's annoyed me for a long time. Comment out periodic stats as well, they've never been useful to us and just cause console spew.
2014-08-09 05:31:09 +02:00
Justin Clark-Casey (justincc)
1e3027afb1
Temporary stop CAPS service points from being added to stats as this can be a huge number.
...
A stop gap solution - a better one may be to improve stats display on simulator-side.
Caps information is still accessible via the "show caps stats by user" and "show caps stats by cap" commands
2014-07-26 01:41:03 +01:00
Justin Clark-Casey (justincc)
8c5c9806d7
Add stats for service endpoints using existing data.
...
For each service endpoint (e.g. posts to the xinventory service), a stat is available which shows the number of requests received and moving average per second
The full name is "service.<http-method>:<path>.requests (e.g. service.POST:/xinventory.requests)
2014-07-25 23:00:41 +01:00
UbitUmarov
86a9710e77
change previus code, send a NoEvents response back to http server, even
...
if we know there is no one there, so that the server finishes handling
it.
2014-07-24 23:32:39 +01:00
UbitUmarov
f236b2e5d3
request.DoHTTPGruntWork(..) is now identical to our version, so use
...
those again, getting code closer to os
again
2014-07-23 02:14:15 +01:00
Oren Hurvitz
99ac770abb
Close streams immediately when we finish using them
2014-07-21 08:30:03 +01:00
Justin Clark-Casey (justincc)
889194db63
Actually call Close() for shared region modules when the simulator is being shutdown.
...
Adds regression test for this case.
2014-07-02 23:49:25 +01:00
Justin Clark-Casey (justincc)
5450b1b024
Change assembly versions to 0.8.1
2014-06-17 18:37:15 +01:00
Justin Clark-Casey (justincc)
602587b8d5
Update dev version to 0.8.1
2014-06-17 18:32:26 +01:00
Robert Adams
7f0adfd203
Add [Startup]LogShowStatsSeconds=n parameter which controls the interval
...
that simulator statistics is output to the console. Setting to zero turns
stats logging off.
2014-06-13 21:27:07 -07:00
Justin Clark-Casey (justincc)
31096fb1fe
Add rc3 flavour option
2014-06-10 20:19:19 +01:00
Diva Canto
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
Oren Hurvitz
882af7195c
Better error-handling and logging in case User Profile requests fail
2014-05-19 11:11:06 +01:00
Oren Hurvitz
88f7a833dc
Improved HTTP logging
2014-04-29 07:59:17 +01:00
Oren Hurvitz
bc06db3df4
- Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity.
...
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
2014-04-24 15:58:43 +01:00
Oren Hurvitz
d15a3b10a3
When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6".
2014-04-24 15:58:41 +01:00
Oren Hurvitz
2051535ce1
String matching in REST handlers: must allow '-' as a separator, because the "/map" handler uses it
2014-04-02 15:11:54 +01:00
Oren Hurvitz
aa217cf90f
Better string matching when searching for REST handlers: must match an entire path component (ending with '/' or a similar character).
...
For example, these should match: "/assets" and "/assets/12345", but these shouldn't match: "/assets" and "/assets_exist".
2014-04-02 08:52:44 +03:00
Oren Hurvitz
bbfda8e19e
Fixed last-resort sending of error response (HTTP 500) when an error occurs while handling a request.
...
The previous code didn't actually send the response, so the caller was stuck until the timeout (100 seconds).
2014-04-02 06:32:41 +01:00
BlueWall
a15282f023
Merge branch 'master' into m_test
2014-03-27 12:21:38 -04:00
Oren Hurvitz
6d1d58b654
Use the "X-Content-Encoding" header to indicate gzipped data, because old OpenSims fail if they get an unknown "Content-Encoding"
2014-03-25 18:09:23 +01:00
BlueWall
9aec36156e
Sync code that has moved in development branch with changes in master
2014-03-25 11:09:27 -04:00
BlueWall
dba33fee39
Move from UserProfileModule for general availability
2014-03-25 11:08:11 -04:00
Oren Hurvitz
b1d8aa0b64
Use the "Content-Encoding" header to indicate gzipped streams
2014-03-25 15:36:59 +01:00
Oren Hurvitz
f90aee696a
Always throw an exception if MakeRequest (used for HTTP POST) fails. (Previously many exceptions were ignored)
...
Resolves http://opensimulator.org/mantis/view.php?id=6949
2014-03-25 09:37:10 +01:00
Oren Hurvitz
f901a38204
Improved logging of HTTP requests
...
- MemoryBuffer isn't seekable, so we can't log it. Log the string instead.
- Handle compressed streams
- Don't attempt to dump binary data. Either don't log it at all (if we know it's binary), or at least convert non-ASCII characters to ASCII.
- Log responses to HTTP requests
- Use the same log prefix for all of these log messages ("[LOGHTTP]"), to make them easy to see at a glance
- Increased the snippet length to 200 (80 doesn't show enough), and add "..." only if the message was actually truncated
Resolves http://opensimulator.org/mantis/view.php?id=6949
2014-03-25 09:36:53 +01:00
Oren Hurvitz
84d7227dfd
Changed LogThreadPool to have 4 logging levels. Added console command "debug threadpool level" to set the logging level.
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:50 +01:00
Justin Clark-Casey (justincc)
fad1d70180
Add httpserver.<port>.QueuedPollResponses and httpserver.<port>.ProcessedPollResponses statistics
2014-03-18 23:47:33 +00:00
Justin Clark-Casey (justincc)
9e0d419239
minor: Correction to description of QueuedPollResponses since this covers long poll and other 'poll' types
2014-03-18 23:24:22 +00:00
Justin Clark-Casey (justincc)
eed343ed8a
Add httpserver.<port-number>,QueuedPollResponses stat
...
This shows the number pf poll responses queued for processing.
2014-03-18 23:21:07 +00:00
Justin Clark-Casey (justincc)
f3e177814a
Add regression test for http inventory fetch.
...
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
2014-03-17 20:51:35 +00:00
Melanie
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
Justin Clark-Casey (justincc)
996a6c2eea
After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning
...
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
2013-12-14 01:34:28 +00:00
Melanie
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
Melanie
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
teravus
75f63ecfcd
* Add a session concurrency option per key. Allows developer/config to specify number of concurrent requests on a service.
2013-10-09 22:21:25 -05:00
teravus
1df58d04b1
* Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes belong there.....)
...
* Add an IsBlocked(string Key) method so it can be used more generically. (think.. if we want to rate limit login failures, we could have a call in the Login Service to IsBlocked(uuid.ToString()) and ignore the connection if it returns true, if IsBlocked returns false, we could run the login information and if the login fails we could run the Process method to count the login failures.
2013-10-07 23:48:24 -05:00
teravus
75fdd6054d
* Refactor
...
* Break out common BasicDOSProtector code into separate class.
2013-10-07 23:19:50 -05:00
teravus
f76cc6036e
* Added a Basic DOS protection container/base object for the most common HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler
...
* Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice.
* Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers
* Added CircularBuffer, used for CPU and Memory friendly rate monitoring.
* DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
2013-10-07 21:35:55 -05:00
Melanie
9800c6fa6c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-10-06 18:33:49 +01:00
Melanie
69054ad134
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-10-06 18:32:20 +01:00
teravus
ece2d24077
* Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't
...
* Fixes cases where Last Attachment Point doesn't get written when it should.
* Fixes Null Reference in BaseHttpServer when shutting down, null path provided.
* Drop then Wear retains Last Attachment Point
2013-10-05 17:36:58 -05:00
teravus
85593d8d25
* Add an initial complete frame timeout to the WebSocket processor to make it easier to write WebSocket service code that is resistant to Denial of Service attacks.
2013-10-04 20:37:59 -05:00
Justin Clark-Casey (justincc)
42bdf44658
Bump OPenSimulator version and assembly versions up to 0.8.0 Dev
2013-10-04 23:33:47 +01:00
Melanie
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
Aleric Inglewood
7889e7757a
Don't use 'Indented' formatting for RpcXml responses.
...
(cherry picked from commit 93abcde69043b175071e0bb752538d9730433f1d)
2013-09-22 21:10:01 -05:00
Justin Clark-Casey (justincc)
77d418a36d
remove mono compiler warnings from PollServiceRequestManager
2013-08-17 00:56:19 +01:00
Melanie
005c69511d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
Justin Clark-Casey (justincc)
ac198068ab
Add "debug threadpool status" console command to show min/max/current worker/iocp threadpool numbers
2013-08-06 00:00:12 +01:00
Justin Clark-Casey (justincc)
4581bdd929
Add "debug comms status" command to show current debug comms settings
2013-08-05 23:49:33 +01:00
Justin Clark-Casey (justincc)
9bcf072795
Make it possible to switch whether we serialize osd requests per endpoint or not, either via config (SerializeOSDRequests in [Network]) or via the "debug comms set" console command.
...
For debug purposes to assess what impact this has on network response in a heavy test environment.
2013-08-05 23:44:48 +01:00
Justin Clark-Casey (justincc)
139dcf1246
minor: move "threads abort" and "force gc" console commands into debug category - these are not things one needs to do in normal operation
2013-08-05 23:06:17 +01:00
Justin Clark-Casey (justincc)
160659f683
Make it possible to set worker/iocp min/max threadpool limits on the fly with the console command "debug threadpool set"
2013-08-05 23:04:36 +01:00
Justin Clark-Casey (justincc)
76bd3de2fd
Add checks monitoring framework to provide alerts if certain conditions do not hold.
...
Not yet in use.
2013-08-05 19:22:47 +01:00
Melanie
bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
Diva Canto
3dac92f345
Increased the rate of the PollServiceRequestManager to 0.5 secs (it was 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.
2013-07-26 21:40:04 -07:00
Justin Clark-Casey (justincc)
056a6ee765
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
2013-07-26 19:22:30 +01:00
Melanie
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
Diva Canto
18d5d8f5dd
Removed verbose debug from previous commit
2013-07-21 09:00:08 -07:00
Diva Canto
edafea6ae6
PollServiceRequestManager: changed the long poll from a Queue to a List. No need to dequeue and enqueue items every 1sec.
2013-07-21 08:59:48 -07:00
Diva Canto
98d47ea428
Delay the enqueueing of non-longpoll requests for 100ms. No need to have these requests actively on the processing queue if it seems they're not ready.
2013-07-21 08:57:16 -07:00
Diva Canto
b5062ae7ee
Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post requests timeout in 60 secs.
...
There's plenty of room for improvement in handling the EQs. Some other time...
2013-07-18 13:30:04 -07:00
Diva Canto
552b85d33d
Revert "Revert "Putting the requests back in the queue while testing for count >0 is not the smartest move...""
...
This reverts commit 7127891957
.
2013-07-18 12:25:04 -07:00
Diva Canto
9e35b069a4
Reverting the reverts I did yesterday. cpu-branch has now been
...
successfully tested, and I'm merging back those changes, which proved to
be good.
Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:""
This reverts commit fa2370b32e
.
2013-07-18 12:23:27 -07:00
Melanie
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
Diva Canto
fa2370b32e
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
...
This reverts commit e46459ef21
.
2013-07-17 15:05:36 -07:00
Diva Canto
7127891957
Revert "Putting the requests back in the queue while testing for count >0 is not the smartest move..."
...
This reverts commit f4317dc26d
.
2013-07-17 15:04:27 -07:00
Diva Canto
519dba9a69
Revert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager."
...
This reverts commit 5f95f4d78e
.
2013-07-17 15:03:16 -07:00
Diva Canto
5c54eb30ed
Revert "This is a completely unreasonable thing to do, effectively defying the purpose of BlockingQueues. Trying this, to see the effect on CPU."
...
This reverts commit 5232ab0496
.
2013-07-17 15:02:54 -07:00
Diva Canto
5232ab0496
This is a completely unreasonable thing to do, effectively defying the purpose of BlockingQueues. Trying this, to see the effect on CPU.
2013-07-17 14:36:55 -07:00
Diva Canto
5f95f4d78e
Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager.
2013-07-17 14:09:04 -07:00