From 29bc2962adc2b0a297bb2c2eb70b5261d7cafc70 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 30 May 2009 03:53:04 +0000 Subject: * More IRCClientView fiddling. Now implements IClientAPI & IClientCore. --- .../InternetRelayClientView/IRCStackModule.cs | 25 +- .../Server/IRCClientView.cs | 384 ++++++++++++--------- .../InternetRelayClientView/Server/IRCServer.cs | 18 +- 3 files changed, 245 insertions(+), 182 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs index c182445..1c23c66 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/IRCStackModule.cs @@ -1,39 +1,48 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Net; using Nini.Config; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server; namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView { class IRCStackModule : IRegionModule { + private IRCServer m_server; + private Scene m_scene; + #region Implementation of IRegionModule public void Initialise(Scene scene, IConfigSource source) { - throw new System.NotImplementedException(); + m_scene = scene; + m_server = new IRCServer(IPAddress.Parse("0.0.0.0"),6666, scene); + m_server.OnNewIRCClient += m_server_OnNewIRCClient; + } + + void m_server_OnNewIRCClient(IRCClientView user) + { + m_scene.AddNewClient(user); } public void PostInitialise() { - throw new System.NotImplementedException(); + } public void Close() { - throw new System.NotImplementedException(); + } public string Name { - get { throw new System.NotImplementedException(); } + get { return "IRCClientStackModule"; } } public bool IsSharedModule { - get { throw new System.NotImplementedException(); } + get { return false; } } #endregion diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 97731ee..c3bc5ad 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -2,8 +2,10 @@ using System.Collections.Generic; using System.Net; using System.Net.Sockets; +using System.Reflection; using System.Text; using System.Threading; +using log4net; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; @@ -12,16 +14,22 @@ using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server { - class IRCClientView : IClientAPI, IClientCore, IClientIPEndpoint + public class IRCClientView : IClientAPI, IClientCore, IClientIPEndpoint { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private readonly TcpClient m_client; private readonly Scene m_scene; + private UUID m_agentID = UUID.Random(); + private string m_username; private bool m_hasNick = false; private bool m_hasUser = false; + private bool m_connected = true; + public IRCClientView(TcpClient client, Scene scene) { m_client = client; @@ -35,6 +43,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server { lock(m_client) { + m_log.Info("[IRCd] Sending >>> " + command); + byte[] buf = Encoding.UTF8.GetBytes(command + "\r\n"); m_client.GetStream().Write(buf, 0, buf.Length); @@ -52,7 +62,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server { string strbuf = ""; - while(true) + while(m_connected) { string line; byte[] buf = new byte[520]; // RFC1459 defines max message size as 512. @@ -68,6 +78,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server string message = ExtractMessage(strbuf); if(message != null) { + m_log.Info("[IRCd] Recieving <<< " + message); + // Remove from buffer strbuf = strbuf.Remove(0, message.Length); @@ -124,6 +136,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server break; // Ignore for now. I want to implement authentication later however. case "JOIN": + IRC_SendReplyJoin(); break; case "USER": @@ -271,6 +284,13 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server List users = m_scene.Entities.GetAllByType(); SendCommand("392 RPL_USERSSTART \":UserID Terminal Host\""); + + if (users.Count == 0) + { + SendCommand("395 RPL_NOUSERS \":Nobody logged in\""); + return; + } + foreach (EntityBase user in users) { char[] nom = new char[8]; @@ -358,109 +378,122 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server public Vector3 StartPos { - get { throw new System.NotImplementedException(); } - set { throw new System.NotImplementedException(); } + get { return Vector3.Zero; } + set { } } public bool TryGet(out T iface) { - throw new System.NotImplementedException(); + iface = default(T); + return false; } public T Get() { - throw new System.NotImplementedException(); + return default(T); } public UUID AgentId { - get { return UUID.Zero; } + get { return m_agentID; } } public void Disconnect(string reason) { - throw new System.NotImplementedException(); + m_connected = false; + m_client.Close(); } public void Disconnect() { - throw new System.NotImplementedException(); + m_connected = false; + m_client.Close(); } public UUID SessionId { - get { throw new System.NotImplementedException(); } + get { return m_agentID; } } public UUID SecureSessionId { - get { throw new System.NotImplementedException(); } + get { return m_agentID; } } public UUID ActiveGroupId { - get { throw new System.NotImplementedException(); } + get { return UUID.Zero; } } public string ActiveGroupName { - get { throw new System.NotImplementedException(); } + get { return "IRCd User"; } } public ulong ActiveGroupPowers { - get { throw new System.NotImplementedException(); } + get { return 0; } } public ulong GetGroupPowers(UUID groupID) { - throw new System.NotImplementedException(); + return 0; } public bool IsGroupMember(UUID GroupID) { - throw new System.NotImplementedException(); + return false; } public string FirstName { - get { throw new System.NotImplementedException(); } + get + { + string[] names = m_username.Split(' '); + return names[0]; + } } public string LastName { - get { throw new System.NotImplementedException(); } + get + { + string[] names = m_username.Split(' '); + if (names.Length > 1) + return names[1]; + return names[0]; + } } public IScene Scene { - get { throw new System.NotImplementedException(); } + get { return m_scene; } } public int NextAnimationSequenceNumber { - get { throw new System.NotImplementedException(); } + get { return 0; } } public string Name { - get { throw new System.NotImplementedException(); } + get { return m_username; } } public bool IsActive { - get { throw new System.NotImplementedException(); } - set { throw new System.NotImplementedException(); } + get { return true; } + set { if (!value) Disconnect("IsActive Disconnected?"); } } public bool SendLogoutPacketWhenClosing { - set { throw new System.NotImplementedException(); } + set { } } public uint CircuitCode { - get { throw new System.NotImplementedException(); } + get { return 0; } } public event GenericMessage OnGenericMessage; @@ -652,737 +685,744 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server public event AvatarNotesUpdate OnAvatarNotesUpdate; public event MuteListRequest OnMuteListRequest; public event PlacesQuery OnPlacesQuery; + public void SetDebugPacketLevel(int newDebug) { - throw new System.NotImplementedException(); + } public void InPacket(object NewPack) { - throw new System.NotImplementedException(); + } public void ProcessInPacket(Packet NewPack) { - throw new System.NotImplementedException(); + } public void Close(bool ShutdownCircuit) { - throw new System.NotImplementedException(); + Disconnect(); } public void Kick(string message) { - throw new System.NotImplementedException(); + Disconnect(message); } public void Start() { - throw new System.NotImplementedException(); + } public void Stop() { - throw new System.NotImplementedException(); + Disconnect(); } public void SendWearables(AvatarWearable[] wearables, int serial) { - throw new System.NotImplementedException(); + } public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) { - throw new System.NotImplementedException(); + } public void SendStartPingCheck(byte seq) { - throw new System.NotImplementedException(); + } public void SendKillObject(ulong regionHandle, uint localID) { - throw new System.NotImplementedException(); + } public void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) { - throw new System.NotImplementedException(); + } public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) { - throw new System.NotImplementedException(); + } public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible) { - throw new System.NotImplementedException(); + IRC_SendChannelPrivmsg(fromName, message); + } + + private void IRC_SendChannelPrivmsg(string fromName, string message) + { + SendCommand(":" + fromName.Replace(" ", "") + " PRIVMSG " + IrcRegionName + " :" + message); } public void SendInstantMessage(GridInstantMessage im) { - throw new System.NotImplementedException(); + // TODO } public void SendGenericMessage(string method, List message) { - throw new System.NotImplementedException(); + } public void SendLayerData(float[] map) { - throw new System.NotImplementedException(); + } public void SendLayerData(int px, int py, float[] map) { - throw new System.NotImplementedException(); + } public void SendWindData(Vector2[] windSpeeds) { - throw new System.NotImplementedException(); + } public void SendCloudData(float[] cloudCover) { - throw new System.NotImplementedException(); + } public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) { - throw new System.NotImplementedException(); + } public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint) { - throw new System.NotImplementedException(); + } public AgentCircuitData RequestClientInfo() { - throw new System.NotImplementedException(); + return new AgentCircuitData(); } public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL) { - throw new System.NotImplementedException(); + } public void SendMapBlock(List mapBlocks, uint flag) { - throw new System.NotImplementedException(); + } public void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags) { - throw new System.NotImplementedException(); + } public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL) { - throw new System.NotImplementedException(); + } public void SendTeleportFailed(string reason) { - throw new System.NotImplementedException(); + } public void SendTeleportLocationStart() { - throw new System.NotImplementedException(); + } public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) { - throw new System.NotImplementedException(); + } public void SendPayPrice(UUID objectID, int[] payPrice) { - throw new System.NotImplementedException(); + } public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) { - throw new System.NotImplementedException(); + } public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentid) { - throw new System.NotImplementedException(); + } public void SendCoarseLocationUpdate(List users, List CoarseLocations) { - throw new System.NotImplementedException(); + } public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) { - throw new System.NotImplementedException(); + } public void SetChildAgentThrottle(byte[] throttle) { - throw new System.NotImplementedException(); + } public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) { - throw new System.NotImplementedException(); + } public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material) { - throw new System.NotImplementedException(); + } public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint) { - throw new System.NotImplementedException(); + } public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List items, List folders, bool fetchFolders, bool fetchItems) { - throw new System.NotImplementedException(); + } public void FlushPrimUpdates() { - throw new System.NotImplementedException(); + } public void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item) { - throw new System.NotImplementedException(); + } public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) { - throw new System.NotImplementedException(); + } public void SendRemoveInventoryItem(UUID itemID) { - throw new System.NotImplementedException(); + } public void SendTakeControls(int controls, bool passToAgent, bool TakeControls) { - throw new System.NotImplementedException(); + } public void SendTaskInventory(UUID taskID, short serial, byte[] fileName) { - throw new System.NotImplementedException(); + } public void SendBulkUpdateInventory(InventoryNodeBase node) { - throw new System.NotImplementedException(); + } public void SendXferPacket(ulong xferID, uint packet, byte[] data) { - throw new System.NotImplementedException(); + } public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent) { - throw new System.NotImplementedException(); + } public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List Data) { - throw new System.NotImplementedException(); + } public void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) { - throw new System.NotImplementedException(); + } public void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID) { - throw new System.NotImplementedException(); + } public void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags) { - throw new System.NotImplementedException(); + } public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) { - throw new System.NotImplementedException(); + } public void SendAttachedSoundGainChange(UUID objectID, float gain) { - throw new System.NotImplementedException(); + } public void SendNameReply(UUID profileId, string firstname, string lastname) { - throw new System.NotImplementedException(); + } public void SendAlertMessage(string message) { - throw new System.NotImplementedException(); + IRC_SendChannelPrivmsg("Alert",message); } public void SendAgentAlertMessage(string message, bool modal) { - throw new System.NotImplementedException(); + } public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) { - throw new System.NotImplementedException(); + IRC_SendChannelPrivmsg(objectname,url); } public void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) { - throw new System.NotImplementedException(); + } public bool AddMoney(int debit) { - throw new System.NotImplementedException(); + return true; } public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition) { - throw new System.NotImplementedException(); + } public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks) { - throw new System.NotImplementedException(); + } public void SendViewerTime(int phase) { - throw new System.NotImplementedException(); + } public UUID GetDefaultAnimation(string name) { - throw new System.NotImplementedException(); + return UUID.Zero; } public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] charterMember, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID) { - throw new System.NotImplementedException(); + } public void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question) { - throw new System.NotImplementedException(); + } public void SendHealth(float health) { - throw new System.NotImplementedException(); + } public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID) { - throw new System.NotImplementedException(); + } public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID) { - throw new System.NotImplementedException(); + } public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) { - throw new System.NotImplementedException(); + } public void SendEstateCovenantInformation(UUID covenant) { - throw new System.NotImplementedException(); + } public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) { - throw new System.NotImplementedException(); + } public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) { - throw new System.NotImplementedException(); + } public void SendLandAccessListData(List avatars, uint accessFlag, int localLandID) { - throw new System.NotImplementedException(); + } public void SendForceClientSelectObjects(List objectIDs) { - throw new System.NotImplementedException(); + } public void SendLandObjectOwners(LandData land, List groups, Dictionary ownersAndCount) { - throw new System.NotImplementedException(); + } public void SendLandParcelOverlay(byte[] data, int sequence_id) { - throw new System.NotImplementedException(); + } public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) { - throw new System.NotImplementedException(); + } public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop) { - throw new System.NotImplementedException(); + } public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) { - throw new System.NotImplementedException(); + } public void SendConfirmXfer(ulong xferID, uint PacketID) { - throw new System.NotImplementedException(); + } public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName) { - throw new System.NotImplementedException(); + } public void SendInitiateDownload(string simFileName, string clientFileName) { - throw new System.NotImplementedException(); + } public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) { - throw new System.NotImplementedException(); + } public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData) { - throw new System.NotImplementedException(); + } public void SendImageNotFound(UUID imageid) { - throw new System.NotImplementedException(); + } public void SendShutdownConnectionNotice() { - throw new System.NotImplementedException(); + // TODO } public void SendSimStats(SimStats stats) { - throw new System.NotImplementedException(); + } public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category, UUID LastOwnerID, string ObjectName, string Description) { - throw new System.NotImplementedException(); + } public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID, UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID, UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, uint BaseMask, byte saleType, int salePrice) { - throw new System.NotImplementedException(); + } public void SendAgentOffline(UUID[] agentIDs) { - throw new System.NotImplementedException(); + } public void SendAgentOnline(UUID[] agentIDs) { - throw new System.NotImplementedException(); + } public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) { - throw new System.NotImplementedException(); + } public void SendAdminResponse(UUID Token, uint AdminLevel) { - throw new System.NotImplementedException(); + } public void SendGroupMembership(GroupMembershipData[] GroupMembership) { - throw new System.NotImplementedException(); + } public void SendGroupNameReply(UUID groupLLUID, string GroupName) { - throw new System.NotImplementedException(); + } public void SendJoinGroupReply(UUID groupID, bool success) { - throw new System.NotImplementedException(); + } public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success) { - throw new System.NotImplementedException(); + } public void SendLeaveGroupReply(UUID groupID, bool success) { - throw new System.NotImplementedException(); + } public void SendCreateGroupReply(UUID groupID, bool success, string message) { - throw new System.NotImplementedException(); + } public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia) { - throw new System.NotImplementedException(); + } public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running) { - throw new System.NotImplementedException(); + } public void SendAsset(AssetRequestToClient req) { - throw new System.NotImplementedException(); + } public void SendTexture(AssetBase TextureAsset) { - throw new System.NotImplementedException(); + } public byte[] GetThrottlesPacked(float multiplier) { - throw new System.NotImplementedException(); + return new byte[0]; } public event ViewerEffectEventHandler OnViewerEffect; public event Action OnLogout; public event Action OnConnectionClosed; + public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) { - throw new System.NotImplementedException(); + IRC_SendChannelPrivmsg(FromAvatarName, Message); } public void SendLogoutPacket() { - throw new System.NotImplementedException(); + Disconnect(); } public ClientInfo GetClientInfo() { - throw new System.NotImplementedException(); + return new ClientInfo(); } public void SetClientInfo(ClientInfo info) { - throw new System.NotImplementedException(); + } public void SetClientOption(string option, string value) { - throw new System.NotImplementedException(); + } public string GetClientOption(string option) { - throw new System.NotImplementedException(); + return String.Empty; } public void Terminate() { - throw new System.NotImplementedException(); + Disconnect(); } public void SendSetFollowCamProperties(UUID objectID, SortedDictionary parameters) { - throw new System.NotImplementedException(); + } public void SendClearFollowCamProperties(UUID objectID) { - throw new System.NotImplementedException(); + } public void SendRegionHandle(UUID regoinID, ulong handle) { - throw new System.NotImplementedException(); + } public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) { - throw new System.NotImplementedException(); + } public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt) { - throw new System.NotImplementedException(); + } public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data) { - throw new System.NotImplementedException(); + } public void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data) { - throw new System.NotImplementedException(); + } public void SendDirEventsReply(UUID queryID, DirEventsReplyData[] data) { - throw new System.NotImplementedException(); + } public void SendDirGroupsReply(UUID queryID, DirGroupsReplyData[] data) { - throw new System.NotImplementedException(); + } public void SendDirClassifiedReply(UUID queryID, DirClassifiedReplyData[] data) { - throw new System.NotImplementedException(); + } public void SendDirLandReply(UUID queryID, DirLandReplyData[] data) { - throw new System.NotImplementedException(); + } public void SendDirPopularReply(UUID queryID, DirPopularReplyData[] data) { - throw new System.NotImplementedException(); + } public void SendEventInfoReply(EventData info) { - throw new System.NotImplementedException(); + } public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags) { - throw new System.NotImplementedException(); + } public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data) { - throw new System.NotImplementedException(); + } public void SendOfferCallingCard(UUID srcID, UUID transactionID) { - throw new System.NotImplementedException(); + } public void SendAcceptCallingCard(UUID transactionID) { - throw new System.NotImplementedException(); + } public void SendDeclineCallingCard(UUID transactionID) { - throw new System.NotImplementedException(); + } public void SendTerminateFriend(UUID exFriendID) { - throw new System.NotImplementedException(); + } public void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name) { - throw new System.NotImplementedException(); + } public void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price) { - throw new System.NotImplementedException(); + } public void SendAgentDropGroup(UUID groupID) { - throw new System.NotImplementedException(); + } public void RefreshGroupMembership() { - throw new System.NotImplementedException(); + } public void SendAvatarNotesReply(UUID targetID, string text) { - throw new System.NotImplementedException(); + } public void SendAvatarPicksReply(UUID targetID, Dictionary picks) { - throw new System.NotImplementedException(); + } public void SendPickInfoReply(UUID pickID, UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) { - throw new System.NotImplementedException(); + } public void SendAvatarClassifiedReply(UUID targetID, Dictionary classifieds) { - throw new System.NotImplementedException(); + } public void SendParcelDwellReply(int localID, UUID parcelID, float dwell) { - throw new System.NotImplementedException(); + } public void SendUserInfoReply(bool imViaEmail, bool visible, string email) { - throw new System.NotImplementedException(); + } public void SendUseCachedMuteList() { - throw new System.NotImplementedException(); + } public void SendMuteListUpdate(string filename) { - throw new System.NotImplementedException(); + } public void KillEndDone() { - throw new System.NotImplementedException(); + } public bool AddGenericPacketHandler(string MethodName, GenericMessage handler) { - throw new System.NotImplementedException(); + return true; } #endregion @@ -1391,7 +1431,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server public IPAddress EndPoint { - get { throw new System.NotImplementedException(); } + get { return ((IPEndPoint) m_client.Client.RemoteEndPoint).Address; } } #endregion diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs index 4b39b92..23c213f 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs @@ -2,20 +2,30 @@ using System.Collections.Generic; using System.Net; using System.Net.Sockets; +using System.Reflection; using System.Text; using System.Threading; +using log4net; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server { + public delegate void OnNewIRCUserDelegate(IRCClientView user); + /// /// Adam's completely hacked up not-probably-compliant RFC1459 server class. /// class IRCServer { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + public event OnNewIRCUserDelegate OnNewIRCClient; + private TcpListener m_listener; + private Scene m_baseScene; private bool m_running = true; - public IRCServer(IPAddress listener, int port) + public IRCServer(IPAddress listener, int port, Scene baseScene) { m_listener = new TcpListener(listener, port); @@ -23,6 +33,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server Thread thread = new Thread(ListenLoop); thread.Start(); + m_baseScene = baseScene; } public void Stop() @@ -41,7 +52,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server private void AcceptClient(TcpClient client) { - + IRCClientView cv = new IRCClientView(client, m_baseScene); + + if (OnNewIRCClient != null) + OnNewIRCClient(cv); } } } -- cgit v1.1