Merge pull request #2 from Agalar-Development/dev

Push dev to main for release

Author: CrawLeyYou

.gitignore

@@ -3,4 +3,5 @@
 .idea
 build/
 node_modules/
-scan.json
+scan.json
+logs/

copenJSParser/src/main/kotlin/io/crawleyyou/Main.kt

@@ -20,20 +20,20 @@ var hashMaps = mutableListOf(protocolVersionHashMap, maxPlayerHashMap, protocolH
 
 fun main(args: Array<String>) {
         try {
-            println("Trying mode ${args[1]} with file ${args[0]}")
-            copenJSParser(args[0], args[1].toInt())
+            println("Starting mode ${args[1]} with file ${args[0]}")
+            copenJSParser(args[0], args[1].toInt(), args[2])
         } catch (e: Exception) {
             println("No input file/mode specified using sample file and starting scanner mode: copenJS")
             copenJSParser(Paths.get("").toAbsolutePath().parent.toString() + "/scan.json", 0)
         }
 }
 
 @Suppress("ClassName")
-class copenJSParser (fileLocation: String, mode: Int) {
+class copenJSParser (fileLocation: String, mode: Int, extra: String? = "null") {
     init {
         when (mode) {
             0 -> {
-                ServerReader(fileLocation)
+                ServerReader(fileLocation, extra)
             }
             1 -> {
                 GraphReader(fileLocation)
@@ -44,8 +44,9 @@ class copenJSParser (fileLocation: String, mode: Int) {
         }
     }
     @Suppress("FunctionName")
-    private fun ServerReader(args: String) {
+    private fun ServerReader(args: String, startFrom: String?) {
         var count = 0
+        var startStatus = false
         try {
             val client = Socket("localhost", 9532)
             println("Reading file: $args " + LocalDateTime.now().toString())
@@ -55,9 +56,14 @@ class copenJSParser (fileLocation: String, mode: Int) {
                 json.forEach { data ->
                     count++
                     val ip = data.split('"')[0]
-                    println("Current IP: $ip")
-                    client.outputStream.write(ip.toByteArray())
-                    TimeUnit.MILLISECONDS.sleep(50)
+                    if (startFrom == ip) {
+                        startStatus = true
+                    }
+                    else if (startStatus) {
+                        println("Current IP: $ip")
+                        client.outputStream.write(ip.toByteArray())
+                        TimeUnit.MILLISECONDS.sleep(5)
+                    }
                 }
                 println("$count IP's processed. " + LocalDateTime.now().toString())
             }

exclude.conf

@@ -39,7 +39,6 @@
 # Limited Broadcast
 255.255.255.255/32
 
-
 #Received: from elbmasnwh002.us-ct-eb01.gdeb.com ([153.11.13.41]
 # helo=ebsmtp.gdeb.com)	by mx1.gd-ms.com with esmtp (Exim 4.76)	(envelope-from
 # <bmandes@gdeb.com>)	id 1VS55c-0004qL-0F	for support@erratasec.com; Fri, 04
@@ -68,9 +67,6 @@
 
 153.11.0.0/16
 
-
-
-
 #Date: Mon, 7 Oct 2013 17:25:41 -0700
 #Subject: Re: please stop the attack to our router
 #From: Di Li <di@egihosting.com>