Network System Laboratory - Backup diff of OpenSim/NAT vs current(No. 7)

View the diff.
View the source.
Go to OpenSim/NAT.

--- 7: 2015-03-02 (Mon) 17:04:55 iseki
+++ Cur: 2015-04-02 (Thu) 00:36:34 iseki
@@ Line 8: / Line 8: @@
 #br
 ** サーバの NAT 越え [#n297f426]
+- UDP でのアドレス通知は無くなった（プロトコルとしては残っているが，使われなくなった）
+- InternalAddress の使い方が簡単になった．（というか殆ど使用されていない）
+#br
 *** ServerIPAddress [#w8cc96d3]
-- 新規で追加
+- OpenSim/Framework/RegionInfo.cs
--- OpenSim/Framework/RegionInfo.cs
+- OpenSim/Services/Interfaces/IGridService.cs
--- OpenSim/Services/Interfaces/IGridService.cs
+-- ''DB の regions の Token を間借り (InternalIPAddess を入れる)''
+#br
+**** IGridService.cs [#cdda68b5]
+- OpenSim.exe
+-- public GridRegion(Dictionary<string, object> kvp)
+--- 他のリージョンの情報を得る
+-- public Dictionary<string, object> ToKeyValuePairs()
+--- 自分のリージョンの情報を書き込む
-- DB の regions の serverIP に格納される値．
+- Robust.exe
--- NAT内でない場合
+-- public GridRegion(Dictionary<string, object> kvp)
---- ExternalHostName のIPと同じグローバルIP
+--- 他のリージョンの情報を得る
--- NAT内の場合
+-- public Dictionary<string, object> ToKeyValuePairs()
---- InternalIPAddress の値
+--- ???
 #br
 ***  NetworkUtil.cs [#g5a13aae]
 - OpenSim/Framework/NetworkUtil.cs
@@ Line 30: / Line 42: @@
 -- CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint externalIPEndPoint, string capsURL)
 --- OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
---- OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+--- %%OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs%%
 -- SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags, string capsURL)
+--- OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+- OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+-- CrossRegion() : newRegionExternalEndPoint
+-- TeleportFinishEvent() : regionExternalEndPoint
 #br
 *** IP [#o8cf94ba]
+- OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
+-- EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
+--- OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+#br
+*** Caps [#i7b35e3d]
+- %%OpenSim/Capabilities/Caps.cs%%
+-- %%HostName を書き換え可能にする%%
+- %%OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs%%
+-- %%接続してきた Viewer のアドレスを直接知ることができない．%%
+-- %%aCircuit (AgentCircuitData) の Channel から Region のプライベートアドレス情報を取り出す%%
+- %%OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs%%
+- %%OpenSim/Services/LLLoginService/LLLoginService.cs%%
+-- %%''aCircuit (AgentCircuitData) の Channel に Region のプライベートアドレス情報を載せる ''%%
+#br
+*** Uploader [#zaa53f1d]
+- %%OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs%%
+-- %%接続してきた Viewer のアドレスを直接知ることができない．%%
+-- %%aCircuit (AgentCircuitData) の Channel から Region のプライベートアドレス情報を取り出す%%
+#br
+*** Private IP 情報 [#sbda997c]
+- hash[]
+-- OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+-- OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+-- OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+-- OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+#br
+*** Teleport [#w826f36a]
+- OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+- OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+- OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+- OpenSim/Region/Framework/Scenes/Scene.cs
+- OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+#br
+**** 通常のTeleport [#y72e49f1]
+- Scene.cs: RequestTeleportLocation()
+- Teleport()
+- TeleportAgentToDifferentRegion()
+- DoTeleportInternal()
+#br
+**** Telepot to Home [#y99bf8b4]
+- OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+- TeleportHome()
+- DoTeleport()
+- DoTeleportInternal()
 #br
-** サーバの NAT 越え OLD [#gc815299]
+** -- OLD -- サーバの NAT 越え -- OLD -- [#gc815299]
 *** ExternalHostName [#xad48784]