Merge pull request #4 from karaeren/http-bridge

Http bridge
shalzuth · May 23, 2022 · 45c4db7 · 45c4db7
2 parents a596231 + 56cab25
commit 45c4db7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/LostArkLogger/HttpBridge.cs b/LostArkLogger/HttpBridge.cs
@@ -64,6 +64,10 @@ public void Start()
                 {
                     EnqueueMessage("message", "Failed to initialize Npcap, using raw sockets instead. You can try to restart the app.");
                 }
+                else
+                {
+                    EnqueueMessage("message", "Using Npcap!");
+                }
 
             }
 

diff --git a/LostArkLogger/Parser.cs b/LostArkLogger/Parser.cs
@@ -432,13 +432,12 @@ void Device_OnPacketArrival_machina(Machina.Infrastructure.TCPConnection connect
                 var srcAddr = connection.RemoteIP;
                 if (srcAddr != currentIpAddr)
                 {
-                    //onDebug?.Invoke((bytes.Length > 4).ToString() + ", "  + BitConverter.ToUInt16(bytes, 2).ToString() + ", " + OpCodes.PKTAuthTokenResult + ", " + (bytes[0] == 0x1e).ToString());
-                    //Console.WriteLine((OpCodes)BitConverter.ToUInt16(bytes, 2));
-                    //Console.WriteLine(BitConverter.ToString(bytes));
                     if (currentIpAddr == 0xdeadbeef || (bytes.Length > 4 && GetOpCode(bytes) == OpCodes.PKTAuthTokenResult && bytes[0] == 0x1e))
                     {
                         onNewZone?.Invoke();
                         currentIpAddr = srcAddr;
+                        fileName = logsPath + "\\LostArk_" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + ".log";
+                        loggedPacketCount = 0;
                     }
                     else return;
                 }
@@ -465,7 +464,6 @@ void Device_OnPacketArrival_pcap(object sender, PacketCapture evt)
 #pragma warning restore CS0618 // Type or member is obsolete
                     if (srcAddr != currentIpAddr)
                     {
-                        var opcode = GetOpCode(bytes);
                         if (currentIpAddr == 0xdeadbeef || (bytes.Length > 4 && GetOpCode(bytes) == OpCodes.PKTAuthTokenResult && bytes[0] == 0x1e))
                         {
                             onNewZone?.Invoke();