aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs23
-rw-r--r--OpenSim/Services/UserAccountService/GridUserService.cs3
-rw-r--r--OpenSim/Tools/pCampBot/Bot.cs19
4 files changed, 44 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 00fa5db..4671ed0 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1435,6 +1435,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1435 1435
1436 mapReply.AgentData.AgentID = AgentId; 1436 mapReply.AgentData.AgentID = AgentId;
1437 mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length]; 1437 mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks2.Length];
1438 mapReply.Size = new MapBlockReplyPacket.SizeBlock[mapBlocks2.Length];
1438 mapReply.AgentData.Flags = flag; 1439 mapReply.AgentData.Flags = flag;
1439 1440
1440 for (int i = 0; i < mapBlocks2.Length; i++) 1441 for (int i = 0; i < mapBlocks2.Length; i++)
@@ -1449,6 +1450,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1449 mapReply.Data[i].RegionFlags = mapBlocks2[i].RegionFlags; 1450 mapReply.Data[i].RegionFlags = mapBlocks2[i].RegionFlags;
1450 mapReply.Data[i].Access = mapBlocks2[i].Access; 1451 mapReply.Data[i].Access = mapBlocks2[i].Access;
1451 mapReply.Data[i].Agents = mapBlocks2[i].Agents; 1452 mapReply.Data[i].Agents = mapBlocks2[i].Agents;
1453
1454 // TODO: hookup varregion sim size here
1455 mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock();
1456 mapReply.Size[i].SizeX = 256;
1457 mapReply.Size[i].SizeY = 256;
1452 } 1458 }
1453 OutPacket(mapReply, ThrottleOutPacketType.Land); 1459 OutPacket(mapReply, ThrottleOutPacketType.Land);
1454 } 1460 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 3bd1ef1..c0a4e56 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -134,6 +134,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
134 134
135 StatsManager.RegisterStat( 135 StatsManager.RegisterStat(
136 new Stat( 136 new Stat(
137 "IncomingPacketsResentCount",
138 "Number of inbound packets that clients indicate are resends.",
139 "",
140 "",
141 "clientstack",
142 scene.Name,
143 StatType.Pull,
144 MeasuresOfInterest.AverageChangeOverTime,
145 stat => stat.Value = m_udpServer.IncomingPacketsResentCount,
146 StatVerbosity.Debug));
147
148 StatsManager.RegisterStat(
149 new Stat(
137 "OutgoingUDPSendsCount", 150 "OutgoingUDPSendsCount",
138 "Number of UDP sends performed", 151 "Number of UDP sends performed",
139 "", 152 "",
@@ -318,6 +331,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
318 internal int PacketsSentCount { get; set; } 331 internal int PacketsSentCount { get; set; }
319 332
320 /// <summary> 333 /// <summary>
334 /// Record how many incoming packets are indicated as resends by clients.
335 /// </summary>
336 internal int IncomingPacketsResentCount { get; set; }
337
338 /// <summary>
321 /// Record how many inbound packets could not be recognized as LLUDP packets. 339 /// Record how many inbound packets could not be recognized as LLUDP packets.
322 /// </summary> 340 /// </summary>
323 public int IncomingMalformedPacketCount { get; private set; } 341 public int IncomingMalformedPacketCount { get; private set; }
@@ -1467,6 +1485,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1467 1485
1468 #region Incoming Packet Accounting 1486 #region Incoming Packet Accounting
1469 1487
1488 // We're not going to worry about interlock yet since its not currently critical that this total count
1489 // is 100% correct
1490 if (packet.Header.Resent)
1491 IncomingPacketsResentCount++;
1492
1470 // Check the archive of received reliable packet IDs to see whether we already received this packet 1493 // Check the archive of received reliable packet IDs to see whether we already received this packet
1471 if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence)) 1494 if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence))
1472 { 1495 {
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 944411f..bef1691 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -194,7 +194,8 @@ namespace OpenSim.Services.UserAccountService
194 194
195 public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt) 195 public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
196 { 196 {
197 m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID); 197// m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID);
198
198 GridUserData d = m_Database.Get(userID); 199 GridUserData d = m_Database.Get(userID);
199 if (d == null) 200 if (d == null)
200 { 201 {
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index ccc24fa..de464ab 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -264,9 +264,10 @@ namespace pCampBot
264 newClient.Throttle.Total = 400000; 264 newClient.Throttle.Total = 400000;
265 } 265 }
266 266
267 newClient.Network.LoginProgress += this.Network_LoginProgress; 267 newClient.Network.LoginProgress += Network_LoginProgress;
268 newClient.Network.SimConnected += this.Network_SimConnected; 268 newClient.Network.SimConnected += Network_SimConnected;
269 newClient.Network.Disconnected += this.Network_OnDisconnected; 269 newClient.Network.SimDisconnected += Network_SimDisconnected;
270 newClient.Network.Disconnected += Network_OnDisconnected;
270 newClient.Objects.ObjectUpdate += Objects_NewPrim; 271 newClient.Objects.ObjectUpdate += Objects_NewPrim;
271 272
272 Client = newClient; 273 Client = newClient;
@@ -276,7 +277,7 @@ namespace pCampBot
276 //add additional steps and/or things the bot should do 277 //add additional steps and/or things the bot should do
277 private void Action() 278 private void Action()
278 { 279 {
279 while (ConnectionState != ConnectionState.Disconnecting) 280 while (ConnectionState == ConnectionState.Connected)
280 { 281 {
281 lock (Behaviours) 282 lock (Behaviours)
282 { 283 {
@@ -583,7 +584,13 @@ namespace pCampBot
583 public void Network_SimConnected(object sender, SimConnectedEventArgs args) 584 public void Network_SimConnected(object sender, SimConnectedEventArgs args)
584 { 585 {
585 m_log.DebugFormat( 586 m_log.DebugFormat(
586 "[BOT]: Bot {0} connected to {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint); 587 "[BOT]: Bot {0} connected to region {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
588 }
589
590 public void Network_SimDisconnected(object sender, SimDisconnectedEventArgs args)
591 {
592 m_log.DebugFormat(
593 "[BOT]: Bot {0} disconnected from region {1} at {2}", Name, args.Simulator.Name, args.Simulator.IPEndPoint);
587 } 594 }
588 595
589 public void Network_OnDisconnected(object sender, DisconnectedEventArgs args) 596 public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
@@ -591,7 +598,7 @@ namespace pCampBot
591 ConnectionState = ConnectionState.Disconnected; 598 ConnectionState = ConnectionState.Disconnected;
592 599
593 m_log.DebugFormat( 600 m_log.DebugFormat(
594 "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message); 601 "[BOT]: Bot {0} disconnected from grid, reason {1}, message {2}", Name, args.Reason, args.Message);
595 602
596// m_log.ErrorFormat("Fired Network_OnDisconnected"); 603// m_log.ErrorFormat("Fired Network_OnDisconnected");
597 604