Fixed the BindRequest logic.. working all good now..

Author: raistlinthewiz

docs/services 2.url

@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=http://pastie.org/2538697

source/D3Sharp/D3Sharp.csproj

@@ -71,6 +71,7 @@
     <Compile Include="Net\Packets\PacketOut.cs" />
     <Compile Include="Net\Packets\Protocol\Followers\Followers.cs" />
     <Compile Include="Net\Packets\Protocol\Friends\Friends.cs" />
+    <Compile Include="Net\Packets\Protocol\Toon\Toon.cs" />
     <Compile Include="Net\Packets\Protocol\UserManager\UserManager.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Net\Client.cs" />

source/D3Sharp/Net/Client.cs

@@ -50,12 +50,11 @@ public Client(Server server, Socket socket)
 
             this._server = server;
             this._socket = socket;
-            this.Services = new Dictionary<uint, uint>
-                                {
-                                    {0x0, 0x0} // base service.
-                                };
+            this.Services = new Dictionary<uint, uint>();
         }
 
+        private static uint _importedServiceCounter = 99;
+
         public void Process(PacketIn packet)
         {
             Console.WriteLine(packet);
@@ -67,32 +66,25 @@ public void Process(PacketIn packet)
                 Console.WriteLine(response);
             }
             else if (packet is BindRequest)
-            {              
-                var importedServicesIDs = new List<uint>();
-                foreach (var service in packet.Request.ExportedServiceList) // add list of imported services supplied by client.
+            {
+                var requestedServiceIDs = new List<uint>();
+
+                foreach (var serviceHash in packet.Request.ImportedServiceHashList) // supply service id's requested by client using service-hashes.
                 {
-                    importedServicesIDs.Add(service.Id);
-                    if (!this.Services.ContainsKey(service.Id)) this.Services.Add(service.Id, service.Hash);
+                    requestedServiceIDs.Add(Server.Services.ContainsValue(serviceHash) ?  Server.Services.Where(pair => pair.Value == serviceHash).FirstOrDefault().Key : _importedServiceCounter++);
                 }
 
-                if (importedServicesIDs.Count > 0)
+                if (requestedServiceIDs.Count > 0)
                 {
-                    var response = new BindResponse(packet.Header.RequestID, importedServicesIDs);
+                    var response = new BindResponse(packet.Header.RequestID, requestedServiceIDs);
                     this.Send(response.GetRawPacketData());
                     Console.WriteLine(response);
                 }
-
-                var requestedServices = new Dictionary<uint,uint>();
-                if (requestedServices.Count > 0)
+                
+                foreach (var service in packet.Request.ExportedServiceList) // add list of imported services supplied by client.
                 {
-                    foreach (var serviceHash in packet.Request.ImportedServiceHashList) // supply service id's requested by client using service-hashes.
-                    {
-                        requestedServices.Add(Server.Services.ContainsKey(serviceHash) ? Server.Services[serviceHash] : (uint) 255, serviceHash);
-                        // probably we should reply with a BoundService.
-                    }
+                    if (!this.Services.ContainsKey(service.Id)) this.Services.Add(service.Id, service.Hash);
                 }
-
-
             }
 
             else if (packet is LogonRequest)

source/D3Sharp/Net/Packets/Header.cs

@@ -10,7 +10,7 @@ public class Header
     {
         public byte[] Data { get; private set; }
 
-        public byte Service { get; set; }
+        public byte ServiceID { get; set; }
         public uint Method { get; set; }
         public int RequestID { get; set; }
         public ulong Unknown { get; set; }
@@ -27,10 +27,10 @@ public Header(byte[] data)
             this.Data = data;
 
             var stream = CodedInputStream.CreateInstance(data);
-            this.Service = stream.ReadRawByte();
+            this.ServiceID = stream.ReadRawByte();
             this.Method = stream.ReadRawVarint32();
-            this.RequestID = stream.ReadRawByte() | (stream.ReadRawByte() << 8);
-            if (Service != 0xfe) this.Unknown = stream.ReadRawVarint64();
+            this.RequestID =  stream.ReadRawByte() | (stream.ReadRawByte() << 8);
+            if (ServiceID != 0xfe) this.Unknown = stream.ReadRawVarint64();
             this.PayloadLength = stream.ReadRawVarint32();
         }
 
@@ -51,7 +51,7 @@ public void Build()
 
         public override string ToString()
         {
-            return string.Format("[S]: 0x{0}, [M]: 0x{1}, [R]: 0x{2}, [L]: 0x{3}", this.Service.ToString("X2"), this.Method.ToString("X2"), this.RequestID.ToString("X2"), this.PayloadLength.ToString("X2"));
+            return string.Format("[S]: 0x{0}, [M]: 0x{1}, [R]: 0x{2}, [L]: 0x{3}", this.ServiceID.ToString("X2"), this.Method.ToString("X2"), this.RequestID.ToString("X2"), this.PayloadLength.ToString("X2"));
         }
     }
 }

source/D3Sharp/Net/Packets/Parser.cs

@@ -49,14 +49,18 @@ public static int Identify(IClient client, byte[] buffer)
             var payload = new byte[header.PayloadLength];
             if (header.PayloadLength > 0) Array.Copy(buffer, 6, payload, 0, header.PayloadLength); // if our packet contains a payload, get it.
 
-            if (client.Services.ContainsKey(header.Service)) // if matching service exists for the request.
+
+            if(Server.Services.ContainsKey(header.ServiceID))
             {
-                foreach (var packet in from pair in Packets
-                                       where client.Services[header.Service] == pair.Value.ServiceHash && header.Method == pair.Value.Method
-                                       select Activator.CreateInstance(pair.Key, new object[] { header, payload })) // try to match requested service against know packet classes.
+                var serviceHash = Server.Services[header.ServiceID];
+                foreach(var pair in Packets)
                 {
-                    client.Process((PacketIn) packet);
-                    return header.Data.Length + payload.Length;
+                    if(pair.Value.ServiceHash==serviceHash && pair.Value.Method == header.Method)
+                    {
+                        var packet = Activator.CreateInstance(pair.Key, new object[] {header, payload});
+                        client.Process((PacketIn)packet);
+                        return header.Data.Length + payload.Length;
+                    }
                 }
             }
 

source/D3Sharp/Net/Packets/Protocol/Authentication/Authentication.cs

@@ -4,7 +4,7 @@
 
 namespace D3Sharp.Net.Packets.Protocol.Authentication
 {
-    [Service(serviceID: -1, serviceHash: 0x71240e35, method: 0x1)]
+    [Service(serviceID: -1, serviceHash: 0xDECFC01, method: 0x1)]
     public class LogonRequest : PacketIn
     {
         public LogonRequest(Header header, IEnumerable<byte> payload)

source/D3Sharp/Net/Packets/Protocol/Connection/Connections.cs

@@ -39,11 +39,11 @@ public BindRequest(Header header, IEnumerable<byte> payload)
 
     public class BindResponse : PacketOut
     {
-        public BindResponse(int requestID, IEnumerable<uint> importedServices)
+        public BindResponse(int requestID, IEnumerable<uint> requestedServiceIDs)
             : base(requestID)
         {
-            var builder = bnet.protocol.connection.BindResponse.CreateBuilder();
-            foreach (var serviceId in importedServices) { builder.AddImportedServiceId(serviceId); }
+            var builder = bnet.protocol.connection.BindResponse.CreateBuilder();           
+            foreach (var serviceId in requestedServiceIDs) { builder.AddImportedServiceId(serviceId); }
             this.Response = builder.Build();
 
             this.Header = new Header(new byte[] { 0xfe, 0x0, (byte)requestID, 0x0, (byte)this.Response.SerializedSize });

source/D3Sharp/Net/Packets/Protocol/Toon/Toon.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace D3Sharp.Net.Packets.Protocol.Toon
+{
+    [Service(serviceID: -1, serviceHash: 0x83040608, method: 0x1)]
+    public class ToonListRequest : PacketIn
+    {
+        public ToonListRequest(Header header, IEnumerable<byte> payload)
+            : base(header, payload)
+        {
+            this.Request = bnet.protocol.toon.external.ToonListRequest.CreateBuilder().MergeFrom(this.Payload.ToArray()).Build();
+        }
+    }
+}

source/D3Sharp/Net/Server.cs

@@ -25,6 +25,15 @@ public class Server : IDisposable
         public event ConnectionDataEventHandler DataReceived;
         public event ConnectionDataEventHandler DataSent;
 
+
+        public static Dictionary<uint, uint> Services = new Dictionary<uint, uint>
+                                                            {
+                                                                {0x0, 0x0}, // base service
+                                                                {0x1, 0xB732DB32}, // connection service 
+                                                                {0x2, 0xDECFC01}, // authentication service
+                                                                {0x3, 0x83040608 } // toon service
+                                                            };
+
         private static readonly Logger Logger = LogManager.CreateLogger();
         private bool _disposed;
 

tools/d3watchproto/DefProf.ini

@@ -26,16 +26,16 @@ Win0RTop=162
 Win0RRight=1229
 Win0RBottom=767
 Win0Max=0
-Win0Dock0RLeft=1132
-Win0Dock0RTop=751
-Win0Dock0RRight=1332
-Win0Dock0RBottom=1351
+Win0Dock0RLeft=1597
+Win0Dock0RTop=963
+Win0Dock0RRight=1797
+Win0Dock0RBottom=1563
 Win0Dock0Val=52494338
 Win0Dock0Docked=1
-Win0Dock1RLeft=1080
-Win0Dock1RTop=574
-Win0Dock1RRight=1280
-Win0Dock1RBottom=1174
+Win0Dock1RLeft=1545
+Win0Dock1RTop=786
+Win0Dock1RRight=1745
+Win0Dock1RBottom=1386
 Win0Dock1Val=52494337
 Win0Dock1Docked=1
 [CusFuncs]
@@ -53,8 +53,8 @@ Font_Under=0
 Font_CharSet=0
 Font_PF=2
 FontColor=0
-MiscPath=C:\Users\shalafi\Desktop\d3watchproto\
-UddPath=C:\Users\shalafi\Desktop\d3watchproto\
+MiscPath=C:\Users\shalafi\Desktop\d3sharp\tools\d3watchproto\
+UddPath=C:\Users\shalafi\Desktop\d3sharp\tools\d3watchproto\
 ColBack=16777215
 ColFront=0
 ColSel=12937777